Add a unified observer to replace NetworkManagerObserver

chrome/browser/chromeos/extensions/file_browser_event_router.cc

 // Copyright (c) 2012 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/extensions/file_browser_event_router.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/drive/drive_cache.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/chromeos/drive/drive_system_service.h"
 #include "chrome/browser/chromeos/extensions/file_browser_notifications.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
 #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"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/google_apis/drive_service_interface.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ skipping 232 matching lines @@
 
   DriveSystemService* system_service =
       DriveSystemServiceFactory::FindForProfileRegardlessOfStates(profile_);
   if (system_service) {
     system_service->file_system()->RemoveObserver(this);
     system_service->drive_service()->RemoveObserver(this);
   }
 
   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;
 }
 
 void FileBrowserEventRouter::ObserveFileSystemEvents() {
   if (!profile_) {
     NOTREACHED();
     return;
   }
   if (!chromeos::UserManager::Get()->IsUserLoggedIn())
     return;
 
   DiskMountManager* disk_mount_manager = DiskMountManager::GetInstance();
   if (disk_mount_manager) {
     disk_mount_manager->RemoveObserver(this);
     disk_mount_manager->AddObserver(this);
     disk_mount_manager->RequestMountInfoRefresh();
   }
 
   DriveSystemService* system_service =
       DriveSystemServiceFactory::GetForProfileRegardlessOfStates(profile_);
   if (system_service) {
     system_service->drive_service()->AddObserver(this);
     system_service->file_system()->AddObserver(this);
   }
 
   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());
 
   pref_change_registrar_->Init(profile_->GetPrefs());
 
   pref_change_registrar_->Add(
       prefs::kExternalStorageDisabled,
       base::Bind(&FileBrowserEventRouter::OnExternalStorageDisabledChanged,
                  base::Unretained(this)));
@@ skipping 202 matching lines @@
       DiskMountManager::FormatEvent event,
       chromeos::FormatError error_code,
       const std::string& device_path) {
   if (event == DiskMountManager::FORMAT_STARTED) {
     OnFormatStarted(device_path, error_code == chromeos::FORMAT_ERROR_NONE);
   } else if (event == DiskMountManager::FORMAT_COMPLETED) {
     OnFormatCompleted(device_path, error_code == chromeos::FORMAT_ERROR_NONE);
   }
 }
 
-void FileBrowserEventRouter::OnNetworkManagerChanged(
-    chromeos::NetworkLibrary* network_library) {
+void FileBrowserEventRouter::NetworkManagerChanged() {
   if (!profile_ ||
       !extensions::ExtensionSystem::Get(profile_)->event_router()) {
     NOTREACHED();
     return;
   }
   scoped_ptr<extensions::Event> event(new extensions::Event(
       extensions::event_names::kOnFileBrowserDriveConnectionStatusChanged,
       scoped_ptr<ListValue>(new ListValue())));
   extensions::ExtensionSystem::Get(profile_)->event_router()->
       BroadcastEvent(event.Pass());
@@ skipping 403 matching lines @@
 }
 
 bool FileBrowserEventRouter::FileWatcherExtensions::Watch(
     const base::FilePath& path,
     const base::FilePathWatcher::Callback& callback) {
   if (is_remote_file_system_)
     return true;
 
   return file_watcher_->Watch(path, false, callback);
 }