Eliminate NetworkManagerChanged

chrome/browser/chromeos/login/auth_prewarmer.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/auth_prewarmer.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/preconnect.h"
@@ skipping 29 matching lines @@
   if (doing_prewarm_) {
     LOG(ERROR) << "PrewarmAuthentication called twice.";
     return;
   }
   doing_prewarm_ = true;
   completion_callback_ = completion_callback;
   if (GetRequestContext() && IsNetworkConnected()) {
     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,
         chrome::NOTIFICATION_PROFILE_URL_REQUEST_CONTEXT_GETTER_INITIALIZED,
         content::Source<Profile>(ProfileHelper::GetSigninProfile()));
   }
 }
 
-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,
                             const content::NotificationSource& source,
                             const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_PROFILE_URL_REQUEST_CONTEXT_GETTER_INITIALIZED:
       registrar_.Remove(
           this,
           chrome::NOTIFICATION_PROFILE_URL_REQUEST_CONTEXT_GETTER_INITIALIZED,
@@ skipping 32 matching lines @@
   NetworkStateHandler* nsh = NetworkHandler::Get()->network_state_handler();
   return (nsh->ConnectedNetworkByType(NetworkStateHandler::kMatchTypeDefault) !=
           NULL);
 }
 
 net::URLRequestContextGetter* AuthPrewarmer::GetRequestContext() const {
   return ProfileHelper::GetSigninProfile()->GetRequestContext();
 }
 
 }  // namespace chromeos
-