Rename NetworkChangeNotifierChromeos to NetworkChangeNotifierNetworkLibrary

We are eventually deprecating this version of the network change notifier 
for Chrome OS in favor of a version that will use the new network state handler.

This lets us avoid file and class name conflicts with the new version.

BUG=chromium:162040
TEST=none


Review URL: https://chromiumcodereview.appspot.com/11488011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172226 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 50 insertions, 47 deletions

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 6df5bd3..2a0ac03 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -45,7 +45,7 @@
 #include "chrome/browser/chromeos/memory/low_memory_observer.h"
 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
-#include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
+#include "chrome/browser/chromeos/net/network_change_notifier_network_library.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
 #include "chrome/browser/chromeos/power/brightness_observer.h"
 #include "chrome/browser/chromeos/power/output_observer.h"
diff --git a/chrome/browser/chromeos/net/cros_network_change_notifier_factory.cc b/chrome/browser/chromeos/net/cros_network_change_notifier_factory.cc
index 2f210da..6941f45 100644
--- a/chrome/browser/chromeos/net/cros_network_change_notifier_factory.cc
+++ b/chrome/browser/chromeos/net/cros_network_change_notifier_factory.cc
@@ -3,24 +3,25 @@
 // found in the LICENSE file.
 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
 
-#include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
+#include "chrome/browser/chromeos/net/network_change_notifier_network_library.h"
 
 namespace chromeos {
 
 namespace {
 
-NetworkChangeNotifierChromeos* g_network_change_notifier = NULL;
+NetworkChangeNotifierNetworkLibrary* g_network_change_notifier = NULL;
 
 }  // namespace
 
 net::NetworkChangeNotifier* CrosNetworkChangeNotifierFactory::CreateInstance() {
   DCHECK(!g_network_change_notifier);
-  g_network_change_notifier = new NetworkChangeNotifierChromeos();
+  g_network_change_notifier = new NetworkChangeNotifierNetworkLibrary();
   return g_network_change_notifier;
 }
 
 // static
-NetworkChangeNotifierChromeos* CrosNetworkChangeNotifierFactory::GetInstance() {
+NetworkChangeNotifierNetworkLibrary*
+CrosNetworkChangeNotifierFactory::GetInstance() {
   return g_network_change_notifier;
 }
 
diff --git a/chrome/browser/chromeos/net/cros_network_change_notifier_factory.h b/chrome/browser/chromeos/net/cros_network_change_notifier_factory.h
index 440fc2a..b51d46f5 100644
--- a/chrome/browser/chromeos/net/cros_network_change_notifier_factory.h
+++ b/chrome/browser/chromeos/net/cros_network_change_notifier_factory.h
@@ -10,7 +10,7 @@
 
 namespace chromeos {
 
-class NetworkChangeNotifierChromeos;
+class NetworkChangeNotifierNetworkLibrary;
 
 // CrosNetworkChangeNotifierFactory creates ChromeOS-specific specialization of
 // NetworkChangeNotifier.
@@ -24,7 +24,7 @@ class CrosNetworkChangeNotifierFactory
 
   // Gets the instance of the NetworkChangeNotifier for Chrome OS.
   // This is used for setting up the notifier at startup.
-  static NetworkChangeNotifierChromeos* GetInstance();
+  static NetworkChangeNotifierNetworkLibrary* GetInstance();
 };
 
 }  // namespace net
diff --git a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc b/chrome/browser/chromeos/net/network_change_notifier_network_library.cc
index 4cc06a4..e6480be 100644
--- a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
+++ b/chrome/browser/chromeos/net/network_change_notifier_network_library.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
+#include "chrome/browser/chromeos/net/network_change_notifier_network_library.h"
 
 #include <vector>
 
@@ -30,7 +30,7 @@ bool IsOnline(chromeos::ConnectionState state) {
 
 namespace chromeos {
 
-class NetworkChangeNotifierChromeos::DnsConfigServiceChromeos
+class NetworkChangeNotifierNetworkLibrary::DnsConfigServiceChromeos
     : public net::internal::DnsConfigServicePosix {
  public:
   DnsConfigServiceChromeos() {}
@@ -40,7 +40,7 @@ class NetworkChangeNotifierChromeos::DnsConfigServiceChromeos
   // net::DnsConfigServicePosix:
   virtual bool StartWatching() OVERRIDE {
     // Notifications from NetworkLibrary are sent to
-    // NetworkChangeNotifierChromeos.
+    // NetworkChangeNotifierNetworkLibrary.
     return true;
   }
 
@@ -51,7 +51,7 @@ class NetworkChangeNotifierChromeos::DnsConfigServiceChromeos
   }
 };
 
-NetworkChangeNotifierChromeos::NetworkChangeNotifierChromeos()
+NetworkChangeNotifierNetworkLibrary::NetworkChangeNotifierNetworkLibrary()
     : NetworkChangeNotifier(NetworkChangeCalculatorParamsChromeos()),
       has_active_network_(false),
       connection_state_(chromeos::STATE_UNKNOWN),
@@ -60,14 +60,14 @@ NetworkChangeNotifierChromeos::NetworkChangeNotifierChromeos()
   BrowserThread::PostDelayedTask(
          BrowserThread::UI, FROM_HERE,
          base::Bind(
-             &NetworkChangeNotifierChromeos::UpdateInitialState, this),
+             &NetworkChangeNotifierNetworkLibrary::UpdateInitialState, this),
          base::TimeDelta::FromMilliseconds(kInitialNotificationCheckDelayMS));
 }
 
-NetworkChangeNotifierChromeos::~NetworkChangeNotifierChromeos() {
+NetworkChangeNotifierNetworkLibrary::~NetworkChangeNotifierNetworkLibrary() {
 }
 
-void NetworkChangeNotifierChromeos::Init() {
+void NetworkChangeNotifierNetworkLibrary::Init() {
   chromeos::NetworkLibrary* network_library =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   network_library->AddNetworkManagerObserver(this);
@@ -81,7 +81,7 @@ void NetworkChangeNotifierChromeos::Init() {
   UpdateNetworkState(network_library);
 }
 
-void NetworkChangeNotifierChromeos::Shutdown() {
+void NetworkChangeNotifierNetworkLibrary::Shutdown() {
   weak_factory_.InvalidateWeakPtrs();
 
   dns_config_service_.reset();
@@ -97,7 +97,7 @@ void NetworkChangeNotifierChromeos::Shutdown() {
   DBusThreadManager::Get()->GetRootPowerManagerClient()->RemoveObserver(this);
 }
 
-void NetworkChangeNotifierChromeos::OnResume(
+void NetworkChangeNotifierNetworkLibrary::OnResume(
     const base::TimeDelta& sleep_duration) {
   // Force invalidation of various net resources on system resume.
   BrowserThread::PostTask(
@@ -107,17 +107,17 @@ void NetworkChangeNotifierChromeos::OnResume(
 }
 
 
-void NetworkChangeNotifierChromeos::OnNetworkManagerChanged(
+void NetworkChangeNotifierNetworkLibrary::OnNetworkManagerChanged(
     chromeos::NetworkLibrary* cros) {
   UpdateNetworkState(cros);
 }
 
 net::NetworkChangeNotifier::ConnectionType
-NetworkChangeNotifierChromeos::GetCurrentConnectionType() const {
+NetworkChangeNotifierNetworkLibrary::GetCurrentConnectionType() const {
   return connection_type_;
 }
 
-void NetworkChangeNotifierChromeos::OnNetworkChanged(
+void NetworkChangeNotifierNetworkLibrary::OnNetworkChanged(
     chromeos::NetworkLibrary* cros,
     const chromeos::Network* network) {
   CHECK(network);
@@ -129,16 +129,17 @@ void NetworkChangeNotifierChromeos::OnNetworkChanged(
     UpdateConnectivityState(network);
 }
 
-void NetworkChangeNotifierChromeos::UpdateNetworkState(
+void NetworkChangeNotifierNetworkLibrary::UpdateNetworkState(
     chromeos::NetworkLibrary* lib) {
   const chromeos::Network* network = lib->active_network();
   if (network) {
     lib->GetIPConfigs(
         network->device_path(),
         chromeos::NetworkLibrary::FORMAT_COLON_SEPARATED_HEX,
-        base::Bind(&NetworkChangeNotifierChromeos::UpdateNetworkStateCallback,
-                   weak_factory_.GetWeakPtr(),
-                   lib));
+        base::Bind(
+            &NetworkChangeNotifierNetworkLibrary::UpdateNetworkStateCallback,
+            weak_factory_.GetWeakPtr(),
+            lib));
   } else {
     // If we don't have a network, then we can't fetch ipconfigs, but we still
     // need to process state updates when we lose a network (i.e. when
@@ -148,7 +149,7 @@ void NetworkChangeNotifierChromeos::UpdateNetworkState(
   }
 }
 
-void NetworkChangeNotifierChromeos::UpdateNetworkStateCallback(
+void NetworkChangeNotifierNetworkLibrary::UpdateNetworkStateCallback(
     chromeos::NetworkLibrary* lib,
     const NetworkIPConfigVector& ipconfigs,
     const std::string& hardware_address) {
@@ -214,7 +215,7 @@ void NetworkChangeNotifierChromeos::UpdateNetworkStateCallback(
   }
 }
 
-void NetworkChangeNotifierChromeos::UpdateConnectivityState(
+void NetworkChangeNotifierNetworkLibrary::UpdateConnectivityState(
       const chromeos::Network* network) {
   if (network) {
     VLOG(1) << "UpdateConnectivityState: " << network->name()
@@ -258,7 +259,7 @@ void NetworkChangeNotifierChromeos::UpdateConnectivityState(
           << ", new_type_ = " << new_connection_type;
 }
 
-void NetworkChangeNotifierChromeos::ReportConnectionChange() {
+void NetworkChangeNotifierNetworkLibrary::ReportConnectionChange() {
   if (weak_factory_.HasWeakPtrs()) {
     // If we have a pending task, cancel it.
     DVLOG(1) << "ReportConnectionChange: has pending task";
@@ -268,27 +269,28 @@ void NetworkChangeNotifierChromeos::ReportConnectionChange() {
   // Posting task with delay allows us to cancel it when connection type is
   // changed frequently. This should help us avoid transient edge reporting
   // while switching between connection types (e.g. ethernet->wifi).
+  base::Closure task = base::Bind(
+      &NetworkChangeNotifierNetworkLibrary::ReportConnectionChangeOnUIThread,
+      weak_factory_.GetWeakPtr());
+
   BrowserThread::PostDelayedTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(
-          &NetworkChangeNotifierChromeos::ReportConnectionChangeOnUIThread,
-          weak_factory_.GetWeakPtr()),
+      BrowserThread::UI, FROM_HERE, task,
       base::TimeDelta::FromMilliseconds(kOnlineNotificationDelayMS));
 }
 
-void NetworkChangeNotifierChromeos::ReportConnectionChangeOnUIThread() {
+void NetworkChangeNotifierNetworkLibrary::ReportConnectionChangeOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
-         &NetworkChangeNotifierChromeos::
+         &NetworkChangeNotifierNetworkLibrary::
              NotifyObserversOfConnectionTypeChange));
 }
 
 // static
-void NetworkChangeNotifierChromeos::UpdateInitialState(
-    NetworkChangeNotifierChromeos* self) {
+void NetworkChangeNotifierNetworkLibrary::UpdateInitialState(
+    NetworkChangeNotifierNetworkLibrary* self) {
   chromeos::NetworkLibrary* net =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   self->UpdateNetworkState(net);
@@ -296,7 +298,7 @@ void NetworkChangeNotifierChromeos::UpdateInitialState(
 
 // static
 net::NetworkChangeNotifier::ConnectionType
-NetworkChangeNotifierChromeos::GetNetworkConnectionType(
+NetworkChangeNotifierNetworkLibrary::GetNetworkConnectionType(
     const chromeos::Network* network) {
   if (!network || !IsOnline(network->connection_state()))
     return net::NetworkChangeNotifier::CONNECTION_NONE;
@@ -336,7 +338,7 @@ NetworkChangeNotifierChromeos::GetNetworkConnectionType(
 
 // static
 net::NetworkChangeNotifier::NetworkChangeCalculatorParams
-NetworkChangeNotifierChromeos::NetworkChangeCalculatorParamsChromeos() {
+NetworkChangeNotifierNetworkLibrary::NetworkChangeCalculatorParamsChromeos() {
   NetworkChangeCalculatorParams params;
   // Delay values arrived at by simple experimentation and adjusted so as to
   // produce a single signal when switching between network connections.
diff --git a/chrome/browser/chromeos/net/network_change_notifier_chromeos.h b/chrome/browser/chromeos/net/network_change_notifier_network_library.h
index 4a9ccf0..16d8aa4 100644
--- a/chrome/browser/chromeos/net/network_change_notifier_chromeos.h
+++ b/chrome/browser/chromeos/net/network_change_notifier_network_library.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_CHROMEOS_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_CHROMEOS_H_
+#ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_NETWORK_LIBRARY_H_
+#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_NETWORK_LIBRARY_H_
 
 #include <vector>
 
@@ -18,14 +18,14 @@ namespace chromeos {
 
 class OnlineStatusReportThreadTask;
 
-class NetworkChangeNotifierChromeos
+class NetworkChangeNotifierNetworkLibrary
     : public net::NetworkChangeNotifier,
       public chromeos::RootPowerManagerObserver,
       public chromeos::NetworkLibrary::NetworkObserver,
       public chromeos::NetworkLibrary::NetworkManagerObserver {
  public:
-  NetworkChangeNotifierChromeos();
-  virtual ~NetworkChangeNotifierChromeos();
+  NetworkChangeNotifierNetworkLibrary();
+  virtual ~NetworkChangeNotifierNetworkLibrary();
 
   // Initializes the network change notifier. Starts to observe changes
   // from the power manager and the network manager.
@@ -75,7 +75,7 @@ class NetworkChangeNotifierChromeos
   // Updates the initial state. Lets us trigger initial eval of the
   // connectivity status without waiting for an event from the connection
   // manager.
-  static void UpdateInitialState(NetworkChangeNotifierChromeos* self);
+  static void UpdateInitialState(NetworkChangeNotifierNetworkLibrary* self);
 
   // Gets connection type for given |network|.
   static net::NetworkChangeNotifier::ConnectionType GetNetworkConnectionType(
@@ -99,11 +99,11 @@ class NetworkChangeNotifierChromeos
 
   scoped_ptr<DnsConfigServiceChromeos> dns_config_service_;
 
-  base::WeakPtrFactory<NetworkChangeNotifierChromeos> weak_factory_;
+  base::WeakPtrFactory<NetworkChangeNotifierNetworkLibrary> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierChromeos);
+  DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierNetworkLibrary);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_CHROMEOS_H_
+#endif  // CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_NETWORK_LIBRARY_H_
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index f9a0f92..2e8ffb4 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -503,8 +503,8 @@
         'browser/chromeos/mobile_config.h',
         'browser/chromeos/net/cros_network_change_notifier_factory.cc',
         'browser/chromeos/net/cros_network_change_notifier_factory.h',
-        'browser/chromeos/net/network_change_notifier_chromeos.cc',
-        'browser/chromeos/net/network_change_notifier_chromeos.h',
+        'browser/chromeos/net/network_change_notifier_network_library.cc',
+        'browser/chromeos/net/network_change_notifier_network_library.h',
         'browser/chromeos/net/network_portal_detector.cc',
         'browser/chromeos/net/network_portal_detector.h',
         'browser/chromeos/network_login_observer.cc',