TransportController refactoring

webrtc/base/fakenetwork.h

Index: webrtc/base/fakenetwork.h
diff --git a/webrtc/base/fakenetwork.h b/webrtc/base/fakenetwork.h
index 4b6bb68a96d9450bc82330534ae05cea0861d081..896be99b1de3a2598889328424e3ac88c53f955b 100644
--- a/webrtc/base/fakenetwork.h
+++ b/webrtc/base/fakenetwork.h
@@ -29,12 +29,7 @@ const int kFakeIPv6NetworkPrefixLength = 64;
 class FakeNetworkManager : public NetworkManagerBase,
                            public MessageHandler {
  public:
-  FakeNetworkManager()
-      : thread_(Thread::Current()),
-        next_index_(0),
-        started_(false),
-        sent_first_update_(false) {
-  }
+  FakeNetworkManager() : thread_(Thread::Current()) {}
 
   typedef std::vector<SocketAddress> IfaceList;
 
@@ -58,20 +53,16 @@ class FakeNetworkManager : public NetworkManagerBase,
   }
 
   virtual void StartUpdating() {
-    if (started_) {
+    if (start_count_++ == 0) {

[pthatcher1, 2015/08/31 22:01:35]

That's a bit too subtle for me.  How about this?

start_count++;
if (start_count == 1) {
  sent_first_update_ = false;
  thread_->Post(this);
} else if (send_first_update_) {
  SignalNetworksChanged();
}

[Taylor Brandstetter, 2015/09/01 23:53:30]

Done.

+      sent_first_update_ = false;
+      thread_->Post(this);
+    } else {
       if (sent_first_update_)
         SignalNetworksChanged();
-      return;
     }
-
-    started_ = true;
-    sent_first_update_ = false;
-    thread_->Post(this);
   }
 
-  virtual void StopUpdating() {
-    started_ = false;
-  }
+  virtual void StopUpdating() { --start_count_; }
 
   // MessageHandler interface.
   virtual void OnMessage(Message* msg) {
@@ -82,7 +73,7 @@ class FakeNetworkManager : public NetworkManagerBase,
 
  private:
   void DoUpdateNetworks() {
-    if (!started_)
+    if (start_count_ == 0)
       return;
     std::vector<Network*> networks;
     for (IfaceList::iterator it = ifaces_.begin();
@@ -111,9 +102,9 @@ class FakeNetworkManager : public NetworkManagerBase,
 
   Thread* thread_;
   IfaceList ifaces_;
-  int next_index_;
-  bool started_;
-  bool sent_first_update_;
+  int next_index_ = 0;
+  int start_count_ = 0;
+  bool sent_first_update_ = false;
 };
 
 }  // namespace rtc