First step of passive aggressive nomination.

webrtc/p2p/base/port.h

Index: webrtc/p2p/base/port.h
diff --git a/webrtc/p2p/base/port.h b/webrtc/p2p/base/port.h
index b95d985b21e8a997536a386a5b7364d66ce791a3..6e43a3cf46b8d8522bfda1ebef45fc986eecdeae 100644
--- a/webrtc/p2p/base/port.h
+++ b/webrtc/p2p/base/port.h
@@ -505,6 +505,11 @@ class Connection : public rtc::MessageHandler,
   bool use_candidate_attr() const { return use_candidate_attr_; }
   void set_use_candidate_attr(bool enable);
 
+  bool received_use_candidate() const { return received_use_candidate_; }
+  void set_received_use_candidate(bool received) {
+    received_use_candidate_ = received;

[pthatcher1, 2015/08/06 01:41:42]

I think nominated_ would be better.

[honghaiz3, 2015/08/06 18:22:57]

Done.

+  }
+
   void set_remote_ice_mode(IceMode mode) {
     remote_ice_mode_ = mode;
   }
@@ -598,10 +603,14 @@ class Connection : public rtc::MessageHandler,
   bool connected_;
   bool pruned_;
   // By default |use_candidate_attr_| flag will be true,
-  // as we will be using agrressive nomination.
+  // as we are still using aggressive nomination on the controlling side
+  // although we are moving toward passive-aggressive nomination.

[pthatcher1, 2015/08/06 01:41:42]

I don't think this comment change is necessary.

[honghaiz3, 2015/08/06 18:22:57]

Done.

   // But when peer is ice-lite, this flag "must" be initialized to false and
   // turn on when connection becomes "best connection".
   bool use_candidate_attr_;
+  // Whether this connection has received a stun request with use_candidate
+  // attribute.
+  bool received_use_candidate_;
   IceMode remote_ice_mode_;
   StunRequestManager requests_;
   uint32 rtt_;