Restore the behavior where an ICE restart redetermines the ICE role.

webrtc/p2p/base/transport.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 272 matching lines @@
   bool RemoveRemoteCandidates(const std::vector<Candidate>& candidates,
                               std::string* error);
 
   virtual bool GetSslRole(rtc::SSLRole* ssl_role) const { return false; }
 
   // Must be called before channel is starting to connect.
   virtual bool SetSslMaxProtocolVersion(rtc::SSLProtocolVersion version) {
     return false;
   }
 
+  // The current local transport description, for use by derived classes
+  // when performing transport description negotiation, and possibly used
+  // by the transport controller.
+  const TransportDescription* local_description() const {
+    return local_description_.get();
+  }
+
+  // The current remote transport description, for use by derived classes
+  // when performing transport description negotiation, and possibly used
+  // by the transport controller.
+  const TransportDescription* remote_description() const {
+    return remote_description_.get();
+  }
+
  protected:
   // These are called by Create/DestroyChannel above in order to create or
   // destroy the appropriate type of channel.
   virtual TransportChannelImpl* CreateTransportChannel(int component) = 0;
   virtual void DestroyTransportChannel(TransportChannelImpl* channel) = 0;
 
-  // The current local transport description, for use by derived classes
-  // when performing transport description negotiation.
-  const TransportDescription* local_description() const {
-    return local_description_.get();
-  }
-
-  // The current remote transport description, for use by derived classes
-  // when performing transport description negotiation.
-  const TransportDescription* remote_description() const {
-    return remote_description_.get();
-  }
-
   // Pushes down the transport parameters from the local description, such
   // as the ICE ufrag and pwd.
   // Derived classes can override, but must call the base as well.
   virtual bool ApplyLocalTransportDescription(TransportChannelImpl* channel,
                                               std::string* error_desc);
 
   // Pushes down remote ice credentials from the remote description to the
   // transport channel.
   virtual bool ApplyRemoteTransportDescription(TransportChannelImpl* ch,
                                                std::string* error_desc);
@@ skipping 55 matching lines @@
 
   ChannelMap channels_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(Transport);
 };
 
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORT_H_