Remove ConnectivityStateHelper

chrome/browser/chromeos/extensions/file_manager/event_router.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_EVENT_ROUTER_H_
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_EVENT_ROUTER_H_
 
 #include <map>
 #include <string>
 
 #include "base/files/file_path_watcher.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_observer.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
 #include "chrome/browser/chromeos/extensions/file_manager/file_watcher.h"
-#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h"
 #include "chrome/browser/drive/drive_service_interface.h"
 #include "chromeos/disks/disk_mount_manager.h"
+#include "chromeos/network/network_state_handler_observer.h"
 
 class PrefChangeRegistrar;
 class Profile;
 
+namespace chromeos {
+class NetworkState;
+}
+
 namespace file_manager {
 
 class DesktopNotifications;
 class MountedDiskMonitor;
 
 // Monitors changes in disk mounts, network connection state and preferences
 // affecting File Manager. Dispatches appropriate File Browser events.
 class EventRouter
     : public chromeos::disks::DiskMountManager::Observer,
-      public chromeos::ConnectivityStateHelperObserver,
+      public chromeos::NetworkStateHandlerObserver,
       public drive::DriveIntegrationServiceObserver,
       public drive::FileSystemObserver,
       public drive::JobListObserver,
       public drive::DriveServiceObserver {
  public:
   explicit EventRouter(Profile* profile);
   virtual ~EventRouter();
 
   void Shutdown();
 
@@ skipping 26 matching lines @@
   virtual void OnMountEvent(
       chromeos::disks::DiskMountManager::MountEvent event,
       chromeos::MountError error_code,
       const chromeos::disks::DiskMountManager::MountPointInfo& mount_info)
       OVERRIDE;
   virtual void OnFormatEvent(
       chromeos::disks::DiskMountManager::FormatEvent event,
       chromeos::FormatError error_code,
       const std::string& device_path) OVERRIDE;
 
-  // chromeos::ConnectivityStateHelperObserver override.
+  // chromeos::NetworkStateHandlerObserver overrides.
   virtual void NetworkManagerChanged() OVERRIDE;
-  virtual void DefaultNetworkChanged() OVERRIDE;
+  virtual void DefaultNetworkChanged(
+      const chromeos::NetworkState* network) OVERRIDE;
 
   // drive::JobListObserver overrides.
   virtual void OnJobAdded(const drive::JobInfo& job_info) OVERRIDE;
   virtual void OnJobUpdated(const drive::JobInfo& job_info) OVERRIDE;
   virtual void OnJobDone(const drive::JobInfo& job_info,
                          drive::FileError error) OVERRIDE;
 
   // drive::DriveServiceObserver overrides.
   virtual void OnRefreshTokenInvalid() OVERRIDE;
 
@@ skipping 72 matching lines @@
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<EventRouter> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(EventRouter);
 };
 
 }  // namespace file_manager
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_EVENT_ROUTER_H_