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

chrome/browser/browser_init.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/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 423 matching lines @@
     chromeos::CrosLibrary::Get()->GetPowerLibrary()->AddObserver(
         low_battery_observer);
 
     static chromeos::UpdateObserver* update_observer =
         new chromeos::UpdateObserver(profile);
     chromeos::CrosLibrary::Get()->GetUpdateLibrary()->AddObserver(
         update_observer);
 
     static chromeos::NetworkMessageObserver* network_message_observer =
         new chromeos::NetworkMessageObserver(profile);
-    chromeos::CrosLibrary::Get()->GetNetworkLibrary()->AddObserver(
-        network_message_observer);
+    chromeos::CrosLibrary::Get()->GetNetworkLibrary()
+        ->AddNetworkManagerObserver(network_message_observer);
+    chromeos::CrosLibrary::Get()->GetNetworkLibrary()
+        ->AddCellularDataPlanObserver(network_message_observer);
 
-    chromeos::CrosLibrary::Get()->GetNetworkLibrary()->AddObserver(
-        chromeos::NetworkStateNotifier::Get());
+    chromeos::CrosLibrary::Get()->GetNetworkLibrary()
+        ->AddNetworkManagerObserver(chromeos::NetworkStateNotifier::Get());
   }
 #endif
   return true;
 }
 
 // Tab ------------------------------------------------------------------------
 
 BrowserInit::LaunchWithProfile::Tab::Tab() : is_app(false), is_pinned(true) {}
 
 BrowserInit::LaunchWithProfile::Tab::~Tab() {}
@@ skipping 565 matching lines @@
   scoped_refptr<AutomationProviderClass> automation =
       new AutomationProviderClass(profile);
   automation->ConnectToChannel(channel_id);
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 }