Landing change for ers@chromium.org: http://codereview.chromium.org/4134012/s...

chrome/browser/chromeos/login/login_utils.cc

 // Copyright (c) 2010 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/login_utils.h"
 
+#include <vector>
+
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/lock.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 281 matching lines @@
   browser_launch_enabled_ = enable;
 }
 
 bool LoginUtilsImpl::IsBrowserLaunchEnabled() const {
   return browser_launch_enabled_;
 }
 
 // We use a special class for this so that it can be safely leaked if we
 // never connect. At shutdown the order is not well defined, and it's possible
 // for the infrastructure needed to unregister might be unstable and crash.
-class WarmingObserver : public NetworkLibrary::Observer {
+class WarmingObserver : public NetworkLibrary::NetworkManagerObserver {
  public:
   WarmingObserver() {
-    NetworkLibrary *network = CrosLibrary::Get()->GetNetworkLibrary();
-    network->AddObserver(this);
+    NetworkLibrary *netlib = CrosLibrary::Get()->GetNetworkLibrary();
+    netlib->AddNetworkManagerObserver(this);
   }
 
   // If we're now connected, prewarm the auth url.
-  void NetworkChanged(NetworkLibrary* network) {
-    if (network->Connected()) {
+  void OnNetworkManagerChanged(NetworkLibrary* netlib) {
+    if (netlib->Connected()) {
       chrome_browser_net::Preconnect::PreconnectOnUIThread(
           GURL(GaiaAuthenticator2::kClientLoginUrl),
           chrome_browser_net::UrlInfo::EARLY_LOAD_MOTIVATED);
-      network->RemoveObserver(this);
+      netlib->RemoveNetworkManagerObserver(this);
       delete this;
     }
   }
 };
 
 void LoginUtilsImpl::PrewarmAuthentication() {
   if (CrosLibrary::Get()->EnsureLoaded()) {
     NetworkLibrary *network = CrosLibrary::Get()->GetNetworkLibrary();
     if (network->Connected()) {
       chrome_browser_net::Preconnect::PreconnectOnUIThread(
@@ skipping 27 matching lines @@
   BrowserInit browser_init;
   int return_code;
   browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(),
                              profile,
                              FilePath(),
                              true,
                              &return_code);
 }
 
 }  // namespace chromeos