Eliminate NetworkManagerChanged

chrome/browser/chromeos/login/auth_prewarmer.cc

Index: chrome/browser/chromeos/login/auth_prewarmer.cc
diff --git a/chrome/browser/chromeos/login/auth_prewarmer.cc b/chrome/browser/chromeos/login/auth_prewarmer.cc
index 64eb2ac02a693eeb382e3ea6b5d7f5d94fca3a6e..efda0a747cbd54637cbb4e25f69698bc4ece5d7a 100644
--- a/chrome/browser/chromeos/login/auth_prewarmer.cc
+++ b/chrome/browser/chromeos/login/auth_prewarmer.cc
@@ -47,9 +47,11 @@ void AuthPrewarmer::PrewarmAuthentication(
     DoPrewarm();
     return;
   }
-  if (!IsNetworkConnected())
-    NetworkHandler::Get()->network_state_handler()->AddObserver(this,
-                                                                FROM_HERE);
+  if (!IsNetworkConnected()) {
+    // DefaultNetworkChanged will get called when a network becomes connected.
+    NetworkHandler::Get()->network_state_handler()
+        ->AddObserver(this, FROM_HERE);
+  }
   if (!GetRequestContext()) {
     registrar_.Add(
         this,
@@ -58,17 +60,14 @@ void AuthPrewarmer::PrewarmAuthentication(
   }
 }
 
-void AuthPrewarmer::NetworkManagerChanged() {
-  if (IsNetworkConnected()) {
-    NetworkHandler::Get()->network_state_handler()->RemoveObserver(this,
-                                                                   FROM_HERE);
-    if (GetRequestContext())
-      DoPrewarm();
-  }
-}
-
 void AuthPrewarmer::DefaultNetworkChanged(const NetworkState* network) {
-  NetworkManagerChanged();
+  if (!network)
+    return;  // Still no default (connected) network.
+
+  NetworkHandler::Get()->network_state_handler()
+      ->RemoveObserver(this, FROM_HERE);
+  if (GetRequestContext())
+    DoPrewarm();
 }
 
 void AuthPrewarmer::Observe(int type,
@@ -121,4 +120,3 @@ net::URLRequestContextGetter* AuthPrewarmer::GetRequestContext() const {
 }
 
 }  // namespace chromeos
-