Move OnFileSystemMounted/BeingUnmounted to VolumeManager.

chrome/browser/chromeos/extensions/file_manager/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_manager/event_router.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_change_registrar.h"
@@ skipping 307 matching lines @@
 
   DLOG_IF(WARNING, !file_watchers_.empty())
       << "Not all file watchers are "
       << "removed. This can happen when Files.app is open during shutdown.";
   STLDeleteValues(&file_watchers_);
   if (!profile_) {
     NOTREACHED();
     return;
   }
 
+  pref_change_registrar_->RemoveAll();
+
+  if (NetworkHandler::IsInitialized()) {
+    NetworkHandler::Get()->network_state_handler()->RemoveObserver(this,
+                                                                   FROM_HERE);
+  }
+
+  DriveIntegrationService* integration_service =
+      DriveIntegrationServiceFactory::FindForProfileRegardlessOfStates(
+          profile_);
+  if (integration_service) {
+    integration_service->file_system()->RemoveObserver(this);
+    integration_service->drive_service()->RemoveObserver(this);
+    integration_service->job_list()->RemoveObserver(this);
+  }
+
   VolumeManager* volume_manager = VolumeManager::Get(profile_);
   if (volume_manager)
     volume_manager->RemoveObserver(this);
 
-  DriveIntegrationService* integration_service =
-      DriveIntegrationServiceFactory::FindForProfileRegardlessOfStates(
-          profile_);
-  if (integration_service) {
-    integration_service->RemoveObserver(this);
-    integration_service->file_system()->RemoveObserver(this);
-    integration_service->drive_service()->RemoveObserver(this);
-    integration_service->job_list()->RemoveObserver(this);
-  }
-
-  if (NetworkHandler::IsInitialized()) {
-    NetworkHandler::Get()->network_state_handler()->RemoveObserver(this,
-                                                                   FROM_HERE);
-  }
   profile_ = NULL;
 }
 
 void EventRouter::ObserveFileSystemEvents() {
   if (!profile_) {
     NOTREACHED();
     return;
   }
   if (!chromeos::LoginState::IsInitialized() ||
       !chromeos::LoginState::Get()->IsUserLoggedIn()) {
     return;
   }
 
+  // VolumeManager's construction triggers DriveIntegrationService's
+  // construction, so it is necessary to call VolumeManager's Get before
+  // accessing DriveIntegrationService.
+  VolumeManager* volume_manager = VolumeManager::Get(profile_);
+  if (volume_manager)
+    volume_manager->AddObserver(this);
+
   DriveIntegrationService* integration_service =
-      DriveIntegrationServiceFactory::GetForProfileRegardlessOfStates(
+      DriveIntegrationServiceFactory::FindForProfileRegardlessOfStates(
           profile_);
   if (integration_service) {
-    integration_service->AddObserver(this);
     integration_service->drive_service()->AddObserver(this);
     integration_service->file_system()->AddObserver(this);
     integration_service->job_list()->AddObserver(this);
   }
 
   if (NetworkHandler::IsInitialized()) {
     NetworkHandler::Get()->network_state_handler()->AddObserver(this,
                                                                 FROM_HERE);
   }
 
   pref_change_registrar_->Init(profile_->GetPrefs());
   base::Closure callback =
       base::Bind(&EventRouter::OnFileManagerPrefsChanged,
                  weak_factory_.GetWeakPtr());
   pref_change_registrar_->Add(prefs::kDisableDriveOverCellular, callback);
   pref_change_registrar_->Add(prefs::kDisableDriveHostedFiles, callback);
   pref_change_registrar_->Add(prefs::kDisableDrive, callback);
   pref_change_registrar_->Add(prefs::kUse24HourClock, callback);
-
-  VolumeManager* volume_manager = VolumeManager::Get(profile_);
-  if (volume_manager)
-    volume_manager->AddObserver(this);
 }
 
 // File watch setup routines.
 void EventRouter::AddFileWatch(const base::FilePath& local_path,
                                const base::FilePath& virtual_path,
                                const std::string& extension_id,
                                const BoolCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
@@ skipping 186 matching lines @@
   extensions::ExtensionSystem::Get(profile_)->event_router()->
       DispatchEventToExtension(kFileManagerAppId, event.Pass());
 
   last_file_transfer_event_ = now;
 }
 
 void EventRouter::OnDirectoryChanged(const base::FilePath& directory_path) {
   HandleFileWatchNotification(directory_path, false);
 }
 
-void EventRouter::OnFileSystemMounted() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  // Raise mount event.
-  // We can pass chromeos::MOUNT_ERROR_NONE even when authentication is failed
-  // or network is unreachable. These two errors will be handled later.
-  OnVolumeMounted(chromeos::MOUNT_ERROR_NONE,
-                  CreateDriveVolumeInfo(),
-                  false);  // Not remounting.
-}
-
-void EventRouter::OnFileSystemBeingUnmounted() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  OnVolumeUnmounted(chromeos::MOUNT_ERROR_NONE, CreateDriveVolumeInfo());
-}
-
 void EventRouter::OnRefreshTokenInvalid() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Raise a DriveConnectionStatusChanged event to notify the status offline.
   BroadcastEvent(
       profile_,
       extensions::event_names::kOnFileBrowserDriveConnectionStatusChanged,
       make_scoped_ptr(new ListValue));
 }
 
@@ skipping 179 matching lines @@
         base::TimeDelta::FromSeconds(4));
   } else {
     notifications_->HideNotification(DesktopNotifications::FORMAT_START,
                                      device_path);
     notifications_->ShowNotification(DesktopNotifications::FORMAT_FAIL,
                                      device_path);
   }
 }
 
 }  // namespace file_manager