17 files changed, 42 insertions, 117 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 4e0ed4b..5fcdb3d 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -133,10 +133,9 @@ void IOThread::Init() {
   DCHECK(!globals_);
   globals_ = new Globals;
 
-  ChromeNetLog* net_log = new ChromeNetLog();
-  globals_->net_log.reset(net_log);
+  globals_->net_log.reset(new ChromeNetLog());
   globals_->network_change_notifier.reset(
-      net::NetworkChangeNotifier::CreateDefaultNetworkChangeNotifier(net_log));
+      net::NetworkChangeNotifier::CreateDefaultNetworkChangeNotifier());
   globals_->host_resolver =
       CreateGlobalHostResolver(globals_->network_change_notifier.get());
   globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory());
diff --git a/chrome/browser/net/passive_log_collector.cc b/chrome/browser/net/passive_log_collector.cc
index 1e73abb..165cabf 100644
--- a/chrome/browser/net/passive_log_collector.cc
+++ b/chrome/browser/net/passive_log_collector.cc
@@ -56,8 +56,6 @@ PassiveLogCollector::PassiveLogCollector()
   trackers_[net::NetLog::SOURCE_INIT_PROXY_RESOLVER] =
       &init_proxy_resolver_tracker_;
   trackers_[net::NetLog::SOURCE_SPDY_SESSION] = &spdy_session_tracker_;
-  trackers_[net::NetLog::SOURCE_NETWORK_CHANGE_NOTIFIER] =
-      &network_change_notifier_tracker_;
 
   // Make sure our mapping is up-to-date.
   for (size_t i = 0; i < arraysize(trackers_); ++i)
@@ -461,26 +459,3 @@ PassiveLogCollector::SpdySessionTracker::DoAddEntry(const Entry& entry,
     return ACTION_NONE;
   }
 }
-
-//----------------------------------------------------------------------------
-// NetworkChangeNotifierTracker
-//----------------------------------------------------------------------------
-
-typedef PassiveLogCollector::NetworkChangeNotifierTracker
-    NetworkChangeNotifierTracker;
-
-const size_t
-NetworkChangeNotifierTracker::kMaxNumSources = 50;
-const size_t
-NetworkChangeNotifierTracker::kMaxGraveyardSize = 10;
-
-NetworkChangeNotifierTracker::NetworkChangeNotifierTracker()
-    : SourceTracker(kMaxNumSources, kMaxGraveyardSize, NULL) {
-}
-
-PassiveLogCollector::SourceTracker::Action
-NetworkChangeNotifierTracker::DoAddEntry(
-    const Entry& entry, SourceInfo* out_info) {
-  AddEntryToSourceInfo(entry, out_info);
-  return ACTION_MOVE_TO_GRAVEYARD;
-}
diff --git a/chrome/browser/net/passive_log_collector.h b/chrome/browser/net/passive_log_collector.h
index 61d8415..b927c0c 100644
--- a/chrome/browser/net/passive_log_collector.h
+++ b/chrome/browser/net/passive_log_collector.h
@@ -186,9 +186,9 @@ class PassiveLogCollector : public ChromeNetLog::Observer {
 
     explicit ConnectJobTracker(PassiveLogCollector* parent);
 
-   private:
+   protected:
     virtual Action DoAddEntry(const Entry& entry, SourceInfo* out_info);
-
+   private:
     DISALLOW_COPY_AND_ASSIGN(ConnectJobTracker);
   };
 
@@ -200,9 +200,10 @@ class PassiveLogCollector : public ChromeNetLog::Observer {
 
     SocketTracker();
 
-   private:
+   protected:
     virtual Action DoAddEntry(const Entry& entry, SourceInfo* out_info);
 
+   private:
     DISALLOW_COPY_AND_ASSIGN(SocketTracker);
   };
 
@@ -214,9 +215,10 @@ class PassiveLogCollector : public ChromeNetLog::Observer {
 
     explicit RequestTracker(PassiveLogCollector* parent);
 
-   private:
+   protected:
     virtual Action DoAddEntry(const Entry& entry, SourceInfo* out_info);
 
+   private:
     DISALLOW_COPY_AND_ASSIGN(RequestTracker);
   };
 
@@ -229,9 +231,10 @@ class PassiveLogCollector : public ChromeNetLog::Observer {
 
     InitProxyResolverTracker();
 
-   private:
+   protected:
     virtual Action DoAddEntry(const Entry& entry, SourceInfo* out_info);
 
+   private:
     DISALLOW_COPY_AND_ASSIGN(InitProxyResolverTracker);
   };
 
@@ -243,23 +246,11 @@ class PassiveLogCollector : public ChromeNetLog::Observer {
 
     SpdySessionTracker();
 
-   private:
+   protected:
     virtual Action DoAddEntry(const Entry& entry, SourceInfo* out_info);
 
-    DISALLOW_COPY_AND_ASSIGN(SpdySessionTracker);
-  };
-
-  class NetworkChangeNotifierTracker : public SourceTracker {
-   public:
-    static const size_t kMaxNumSources;
-    static const size_t kMaxGraveyardSize;
-
-    NetworkChangeNotifierTracker();
-
    private:
-    virtual Action DoAddEntry(const Entry& entry, SourceInfo* out_info);
-
-    DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierTracker);
+    DISALLOW_COPY_AND_ASSIGN(SpdySessionTracker);
   };
 
   PassiveLogCollector();
@@ -295,7 +286,6 @@ class PassiveLogCollector : public ChromeNetLog::Observer {
   RequestTracker socket_stream_tracker_;
   InitProxyResolverTracker init_proxy_resolver_tracker_;
   SpdySessionTracker spdy_session_tracker_;
-  NetworkChangeNotifierTracker network_change_notifier_tracker_;
 
   // This array maps each NetLog::SourceType to one of the tracker instances
   // defined above. Use of this array avoid duplicating the list of trackers
diff --git a/chrome/service/net/service_network_change_notifier_thread.cc b/chrome/service/net/service_network_change_notifier_thread.cc
index 227b2ca..3ccd146 100644
--- a/chrome/service/net/service_network_change_notifier_thread.cc
+++ b/chrome/service/net/service_network_change_notifier_thread.cc
@@ -9,10 +9,8 @@
 #include "net/base/network_change_notifier.h"
 
 ServiceNetworkChangeNotifierThread::ServiceNetworkChangeNotifierThread(
-    MessageLoop* io_thread_message_loop,
-    net::NetLog* net_log)
-        : io_thread_message_loop_(io_thread_message_loop),
-          net_log_(net_log) {
+    MessageLoop* io_thread_message_loop)
+        : io_thread_message_loop_(io_thread_message_loop) {
   DCHECK(io_thread_message_loop_);
 }
 
@@ -36,12 +34,13 @@ MessageLoop* ServiceNetworkChangeNotifierThread::GetMessageLoop() const {
 
 net::NetworkChangeNotifier*
 ServiceNetworkChangeNotifierThread::GetNetworkChangeNotifier() const {
-  DCHECK_EQ(MessageLoop::current(), io_thread_message_loop_);
+  DCHECK(MessageLoop::current() == io_thread_message_loop_);
   return network_change_notifier_.get();
 }
 
 void ServiceNetworkChangeNotifierThread::CreateNetworkChangeNotifier() {
-  DCHECK_EQ(MessageLoop::current(), io_thread_message_loop_);
+  DCHECK(MessageLoop::current() == io_thread_message_loop_);
   network_change_notifier_.reset(
-      net::NetworkChangeNotifier::CreateDefaultNetworkChangeNotifier(net_log_));
+      net::NetworkChangeNotifier::CreateDefaultNetworkChangeNotifier());
 }
+
diff --git a/chrome/service/net/service_network_change_notifier_thread.h b/chrome/service/net/service_network_change_notifier_thread.h
index cb73f31..14975a6 100644
--- a/chrome/service/net/service_network_change_notifier_thread.h
+++ b/chrome/service/net/service_network_change_notifier_thread.h
@@ -13,7 +13,6 @@
 class MessageLoop;
 
 namespace net {
-class NetLog;
 class NetworkChangeNotifier;
 }  // namespace net
 
@@ -26,9 +25,8 @@ class ServiceNetworkChangeNotifierThread
   // Does not take ownership of |io_thread_message_loop|. This instance must
   // live no longer than |io_thread_message_loop|.
   // TODO(sanjeevr): Change NetworkChangeNotifierThread to use MessageLoopProxy
-  ServiceNetworkChangeNotifierThread(
-      MessageLoop* io_thread_message_loop,
-      net::NetLog* net_log);
+  explicit ServiceNetworkChangeNotifierThread(
+      MessageLoop* io_thread_message_loop);
   virtual ~ServiceNetworkChangeNotifierThread();
 
   // Initialize MUST be called before this class can be used.
@@ -41,13 +39,12 @@ class ServiceNetworkChangeNotifierThread
   virtual net::NetworkChangeNotifier* GetNetworkChangeNotifier() const;
 
  private:
-  void CreateNetworkChangeNotifier();
-
   MessageLoop* const io_thread_message_loop_;
-  net::NetLog* const net_log_;
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
 
+  void CreateNetworkChangeNotifier();
   DISALLOW_COPY_AND_ASSIGN(ServiceNetworkChangeNotifierThread);
 };
 
 #endif  // CHROME_SERVICE_NET_SERVICE_NETWORK_CHANGE_NOTIFIER_THREAD_H_
+
diff --git a/chrome/service/net/service_network_change_notifier_thread_unittest.cc b/chrome/service/net/service_network_change_notifier_thread_unittest.cc
index 9cf544a..917d51a 100644
--- a/chrome/service/net/service_network_change_notifier_thread_unittest.cc
+++ b/chrome/service/net/service_network_change_notifier_thread_unittest.cc
@@ -65,7 +65,7 @@ void CheckNullNetworkChangeNotifier(
 
 TEST_F(ServiceNetworkChangeNotifierThreadTest, Basic) {
   scoped_refptr<ServiceNetworkChangeNotifierThread> change_notifier_thread =
-      new ServiceNetworkChangeNotifierThread(io_thread_.message_loop(), NULL);
+      new ServiceNetworkChangeNotifierThread(io_thread_.message_loop());
   EXPECT_EQ(io_thread_.message_loop(),
             change_notifier_thread->GetMessageLoop());
   change_notifier_thread->Initialize();
@@ -81,7 +81,7 @@ TEST_F(ServiceNetworkChangeNotifierThreadTest, Basic) {
 
 TEST_F(ServiceNetworkChangeNotifierThreadTest, Uninitialized) {
   scoped_refptr<ServiceNetworkChangeNotifierThread> change_notifier_thread =
-      new ServiceNetworkChangeNotifierThread(io_thread_.message_loop(), NULL);
+      new ServiceNetworkChangeNotifierThread(io_thread_.message_loop());
   EXPECT_EQ(io_thread_.message_loop(),
             change_notifier_thread->GetMessageLoop());
   // We have not called Initialize. Expect the GetNetworkChangeNotifier() call
@@ -97,3 +97,4 @@ TEST_F(ServiceNetworkChangeNotifierThreadTest, Uninitialized) {
 }
 
 }  // namespace
+
diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc
index a74af52..6e9baf2 100644
--- a/chrome/service/service_process.cc
+++ b/chrome/service/service_process.cc
@@ -27,7 +27,7 @@ bool ServiceProcess::Initialize() {
     return false;
   }
   network_change_notifier_thread_ =
-      new ServiceNetworkChangeNotifierThread(io_thread_->message_loop(), NULL);
+      new ServiceNetworkChangeNotifierThread(io_thread_->message_loop());
   network_change_notifier_thread_->Initialize();
   return true;
 }
@@ -53,3 +53,4 @@ ServiceProcess::~ServiceProcess() {
   DCHECK(cloud_print_proxy_list_.size() == 0);
   g_service_process = NULL;
 }
+
diff --git a/net/base/net_log_event_type_list.h b/net/base/net_log_event_type_list.h
index db449d3..d129024 100644
--- a/net/base/net_log_event_type_list.h
+++ b/net/base/net_log_event_type_list.h
@@ -567,11 +567,6 @@ EVENT_TYPE(SOCKS5_HANDSHAKE_WRITE)
 // The time spent waiting for the response to the CONNECT request.
 EVENT_TYPE(SOCKS5_HANDSHAKE_READ)
 
-// --------------------------------------------------------------------------
-// NetworkChangeNotifier
-// --------------------------------------------------------------------------
-EVENT_TYPE(NETWORK_IP_ADDRESS_CHANGED)
-
 // ------------------------------------------------------------------------
 // HTTP Authentication
 // ------------------------------------------------------------------------
diff --git a/net/base/net_log_source_type_list.h b/net/base/net_log_source_type_list.h
index df60083..6664c2d 100644
--- a/net/base/net_log_source_type_list.h
+++ b/net/base/net_log_source_type_list.h
@@ -13,6 +13,5 @@ SOURCE_TYPE(INIT_PROXY_RESOLVER, 2)
 SOURCE_TYPE(CONNECT_JOB, 3)
 SOURCE_TYPE(SOCKET, 4)
 SOURCE_TYPE(SPDY_SESSION, 5)
-SOURCE_TYPE(NETWORK_CHANGE_NOTIFIER, 6)
 
-SOURCE_TYPE(COUNT, 7) // Always keep this as the last entry.
+SOURCE_TYPE(COUNT, 6) // Always keep this as the last entry.
diff --git a/net/base/network_change_notifier.cc b/net/base/network_change_notifier.cc
index ebc33b3..aeca2ab 100644
--- a/net/base/network_change_notifier.cc
+++ b/net/base/network_change_notifier.cc
@@ -16,13 +16,13 @@ namespace net {
 
 // static
 NetworkChangeNotifier*
-NetworkChangeNotifier::CreateDefaultNetworkChangeNotifier(NetLog* net_log) {
+NetworkChangeNotifier::CreateDefaultNetworkChangeNotifier() {
 #if defined(OS_WIN)
-  return new NetworkChangeNotifierWin(net_log);
+  return new NetworkChangeNotifierWin();
 #elif defined(OS_LINUX)
-  return new NetworkChangeNotifierLinux(net_log);
+  return new NetworkChangeNotifierLinux();
 #elif defined(OS_MACOSX)
-  return new NetworkChangeNotifierMac(net_log);
+  return new NetworkChangeNotifierMac();
 #else
   NOTIMPLEMENTED();
   return NULL;
diff --git a/net/base/network_change_notifier.h b/net/base/network_change_notifier.h
index d15b737..70b195d 100644
--- a/net/base/network_change_notifier.h
+++ b/net/base/network_change_notifier.h
@@ -9,8 +9,6 @@
 
 namespace net {
 
-class NetLog;
-
 // NetworkChangeNotifier monitors the system for network changes, and notifies
 // observers on those events.
 class NetworkChangeNotifier {
@@ -42,8 +40,7 @@ class NetworkChangeNotifier {
   virtual void RemoveObserver(Observer* observer) = 0;
 
   // This will create the platform specific default NetworkChangeNotifier.
-  static NetworkChangeNotifier* CreateDefaultNetworkChangeNotifier(
-      NetLog* net_log);
+  static NetworkChangeNotifier* CreateDefaultNetworkChangeNotifier();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifier);
diff --git a/net/base/network_change_notifier_linux.cc b/net/base/network_change_notifier_linux.cc
index e2e2236..9821be5 100644
--- a/net/base/network_change_notifier_linux.cc
+++ b/net/base/network_change_notifier_linux.cc
@@ -12,7 +12,6 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "net/base/net_errors.h"
-#include "net/base/net_log.h"
 #include "net/base/network_change_notifier_netlink_linux.h"
 
 namespace net {
@@ -23,13 +22,12 @@ const int kInvalidSocket = -1;
 
 }  // namespace
 
-NetworkChangeNotifierLinux::NetworkChangeNotifierLinux(NetLog* net_log)
+NetworkChangeNotifierLinux::NetworkChangeNotifierLinux()
     : netlink_fd_(kInvalidSocket),
 #if defined(OS_CHROMEOS)
       ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)),
 #endif
-      loop_(MessageLoopForIO::current()),
-      net_log_(net_log) {
+      loop_(MessageLoopForIO::current()) {
   netlink_fd_ = InitializeNetlinkSocket();
   if (netlink_fd_ < 0) {
     netlink_fd_ = kInvalidSocket;
@@ -110,10 +108,6 @@ void NetworkChangeNotifierLinux::ListenForNotifications() {
 }
 
 void NetworkChangeNotifierLinux::NotifyObserversIPAddressChanged() {
-  BoundNetLog net_log =
-      BoundNetLog::Make(net_log_, NetLog::SOURCE_NETWORK_CHANGE_NOTIFIER);
-  // TODO(willchan): Add the netlink information into an EventParameter.
-  net_log.AddEvent(NetLog::TYPE_NETWORK_IP_ADDRESS_CHANGED, NULL);
   FOR_EACH_OBSERVER(Observer, observers_, OnIPAddressChanged());
 }
 
diff --git a/net/base/network_change_notifier_linux.h b/net/base/network_change_notifier_linux.h
index 2492dc1..dcedbf4 100644
--- a/net/base/network_change_notifier_linux.h
+++ b/net/base/network_change_notifier_linux.h
@@ -17,15 +17,13 @@
 
 namespace net {
 
-class NetLog;
-
 class NetworkChangeNotifierLinux
     : public NetworkChangeNotifier,
       public NonThreadSafe,
       public MessageLoopForIO::Watcher,
       public MessageLoop::DestructionObserver {
  public:
-  explicit NetworkChangeNotifierLinux(NetLog* net_log);
+  NetworkChangeNotifierLinux();
 
   // NetworkChangeNotifier methods:
   virtual void AddObserver(Observer* observer);
@@ -67,8 +65,6 @@ class NetworkChangeNotifierLinux
   MessageLoopForIO* loop_;
   MessageLoopForIO::FileDescriptorWatcher netlink_watcher_;
 
-  NetLog* const net_log_;
-
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierLinux);
 };
 
diff --git a/net/base/network_change_notifier_mac.cc b/net/base/network_change_notifier_mac.cc
index 40c0808..ba38907 100644
--- a/net/base/network_change_notifier_mac.cc
+++ b/net/base/network_change_notifier_mac.cc
@@ -31,7 +31,6 @@
 #include "base/message_loop.h"
 #include "base/scoped_cftyperef.h"
 #include "base/thread.h"
-#include "net/base/net_log.h"
 
 namespace net {
 
@@ -219,10 +218,9 @@ void NetworkChangeNotifierThread::Init() {
 
 }  // namespace
 
-NetworkChangeNotifierMac::NetworkChangeNotifierMac(NetLog* net_log)
+NetworkChangeNotifierMac::NetworkChangeNotifierMac()
     : notifier_thread_(NULL),
-      method_factory_(this),
-      net_log_(net_log) {
+      method_factory_(this) {
   // TODO(willchan): Look to see if there's a better signal for when it's ok to
   // initialize this, rather than just delaying it by a fixed time.
   const int kNotifierThreadInitializationDelayMS = 1000;
@@ -236,10 +234,6 @@ NetworkChangeNotifierMac::NetworkChangeNotifierMac(NetLog* net_log)
 
 void NetworkChangeNotifierMac::OnIPAddressChanged() {
   DCHECK(CalledOnValidThread());
-  BoundNetLog net_log =
-      BoundNetLog::Make(net_log_, NetLog::SOURCE_NETWORK_CHANGE_NOTIFIER);
-  // TODO(willchan): Add the network change information into an EventParameter.
-  net_log.AddEvent(NetLog::TYPE_NETWORK_IP_ADDRESS_CHANGED, NULL);
   FOR_EACH_OBSERVER(Observer, observers_, OnIPAddressChanged());
 }
 
diff --git a/net/base/network_change_notifier_mac.h b/net/base/network_change_notifier_mac.h
index 096b3bd..2ffaaba 100644
--- a/net/base/network_change_notifier_mac.h
+++ b/net/base/network_change_notifier_mac.h
@@ -20,12 +20,10 @@ class Thread;
 
 namespace net {
 
-class NetLog;
-
 class NetworkChangeNotifierMac : public NetworkChangeNotifier,
                                  public NonThreadSafe {
  public:
-  explicit NetworkChangeNotifierMac(NetLog* net_log);
+  NetworkChangeNotifierMac();
 
   void OnIPAddressChanged();
 
@@ -54,8 +52,6 @@ class NetworkChangeNotifierMac : public NetworkChangeNotifier,
   // Used to initialize the notifier thread.
   ScopedRunnableMethodFactory<NetworkChangeNotifierMac> method_factory_;
 
-  NetLog* const net_log_;
-
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierMac);
 };
 
diff --git a/net/base/network_change_notifier_win.cc b/net/base/network_change_notifier_win.cc
index 020e160..bed361c 100644
--- a/net/base/network_change_notifier_win.cc
+++ b/net/base/network_change_notifier_win.cc
@@ -12,7 +12,6 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/object_watcher.h"
-#include "net/base/net_log.h"
 
 namespace net {
 
@@ -63,16 +62,12 @@ void NetworkChangeNotifierWin::Impl::OnObjectSignaled(HANDLE object) {
   WatchForAddressChange();
 }
 
-NetworkChangeNotifierWin::NetworkChangeNotifierWin(NetLog* net_log)
-    : impl_(new Impl(ALLOW_THIS_IN_INITIALIZER_LIST(this))),
-      net_log_(net_log) {
+NetworkChangeNotifierWin::NetworkChangeNotifierWin()
+    : impl_(new Impl(ALLOW_THIS_IN_INITIALIZER_LIST(this))) {
   impl_->WatchForAddressChange();
 }
 void NetworkChangeNotifierWin::OnIPAddressChanged() {
   DCHECK(CalledOnValidThread());
-  BoundNetLog net_log =
-      BoundNetLog::Make(net_log_, NetLog::SOURCE_NETWORK_CHANGE_NOTIFIER);
-  net_log.AddEvent(NetLog::TYPE_NETWORK_IP_ADDRESS_CHANGED, NULL);
   FOR_EACH_OBSERVER(Observer, observers_, OnIPAddressChanged());
 }
 
diff --git a/net/base/network_change_notifier_win.h b/net/base/network_change_notifier_win.h
index 403377b..ba2f53dc 100644
--- a/net/base/network_change_notifier_win.h
+++ b/net/base/network_change_notifier_win.h
@@ -13,12 +13,10 @@
 
 namespace net {
 
-class NetLog;
-
 class NetworkChangeNotifierWin : public NetworkChangeNotifier,
                                  public NonThreadSafe {
  public:
-  explicit NetworkChangeNotifierWin(NetLog* net_log);
+  NetworkChangeNotifierWin();
 
   // Called by NetworkChangeNotifierWin::Impl.
   void OnIPAddressChanged();
@@ -36,7 +34,6 @@ class NetworkChangeNotifierWin : public NetworkChangeNotifier,
   // true so we assert that all observers have been removed.
   ObserverList<Observer, false> observers_;
   scoped_ptr<Impl> impl_;
-  NetLog* const net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierWin);
 };