Add a unified observer to replace NetworkManagerObserver

chrome/browser/chromeos/extensions/file_browser_event_router.cc

Index: chrome/browser/chromeos/extensions/file_browser_event_router.cc
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
index 47d690b24a7bbd16d372616dfbf73b984f0dc5c3..5004fdb6700ca54b6d056982f43cb45df5c9d77b 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
@@ -22,6 +22,7 @@
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/net/connectivity_state_helper.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -274,10 +275,8 @@ void FileBrowserEventRouter::Shutdown() {
 
   chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
   if (cros_library) {
-    chromeos::NetworkLibrary* network_library =
-        cros_library->GetNetworkLibrary();
-    if (network_library)
-      network_library->RemoveNetworkManagerObserver(this);
+    chromeos::ConnectivityStateHelper::Get()->
+        RemoveNetworkManagerObserver(this);
   }
 
   profile_ = NULL;
@@ -307,10 +306,7 @@ void FileBrowserEventRouter::ObserveFileSystemEvents() {
 
   chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
   if (cros_library) {

[tbarzic, 2013/03/11 23:12:31]

Do we still have to check that cros_library is present.. if so, please add a
comment.

(note that afaik there are some browser tests that do not initialize cros
library, but still reach this part of code).

[gauravsh, 2013/03/12 00:30:25]

That's what I figured - this pattern is used in many browser tests to avoid
NetworkLibrary related operations in test code. However, I re-ran the
browser_tests after removing this check - and it doesn't look like there are any
tests relying on this behavior. So, removed.

-    chromeos::NetworkLibrary* network_library =
-        cros_library->GetNetworkLibrary();
-    if (network_library)
-     network_library->AddNetworkManagerObserver(this);
+    chromeos::ConnectivityStateHelper::Get()->AddNetworkManagerObserver(this);
   }
 
   suspend_state_delegate_.reset(new SuspendStateDelegateImpl());
@@ -533,8 +529,7 @@ void FileBrowserEventRouter::OnFormatEvent(
   }
 }
 
-void FileBrowserEventRouter::OnNetworkManagerChanged(
-    chromeos::NetworkLibrary* network_library) {
+void FileBrowserEventRouter::NetworkManagerChanged() {
   if (!profile_ ||
       !extensions::ExtensionSystem::Get(profile_)->event_router()) {
     NOTREACHED();