commit 8171211f971dbeea7377e9d3a5c6237966042147
author Steve Anton <steveanton@webrtc.org> Fri Jan 05 11:27:54 2018 -0800
committer Commit Bot <commit-bot@chromium.org> Fri Jan 05 21:12:09 2018 +0000
tree df7bf740e2d878655e4a22cc6f92a86fda8f0b03
parent 276763201d0fe590f19429497df2b33b07c87040

Fix shadowed variable in ContentInfo

Bug: webrtc:8714
Change-Id: I107b7d5908cf6efe7f114522959da4503450d7fc
Reviewed-on: https://webrtc-review.googlesource.com/37724
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Taylor Brandstetter <deadbeef@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21506}

pc/sessiondescription.h

diff --git a/pc/sessiondescription.h b/pc/sessiondescription.h
index fdbfcc6..b2cdee9 100644
--- a/pc/sessiondescription.h
+++ b/pc/sessiondescription.h
@@ -313,15 +313,17 @@
   const MediaContentDescription* media_description() const {
     return description;
   }
-  void set_media_description(MediaContentDescription* description) {
-    this->description = description;
+  void set_media_description(MediaContentDescription* desc) {
+    description = desc;
   }
 
-  // TODO(bugs.webrtc.org/8520): Rename this to mid.
+  // TODO(bugs.webrtc.org/8620): Rename this to mid.
   std::string name;
   MediaProtocolType type;
   bool rejected = false;
   bool bundle_only = false;
+  // TODO(bugs.webrtc.org/8620): Switch to the getter and setter, and make this
+  // private.
   MediaContentDescription* description = nullptr;
 };