Merge r255817 and r257069: Do not initialize volume manager for signin profiles.

chrome/browser/chromeos/file_manager/volume_manager.cc

 // Copyright 2013 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/file_manager/volume_manager.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/file_manager/mounted_disk_monitor.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager_factory.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager_observer.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 
 namespace file_manager {
 namespace {
 
@@ skipping 141 matching lines @@
     const base::FilePath old_path =
         profile_->GetPrefs()->GetFilePath(kPathPreference[i]);
     base::FilePath new_path;
     if (!old_path.empty() &&
         file_manager::util::MigratePathFromOldFormat(profile_,
                                                      old_path, &new_path)) {
       profile_->GetPrefs()->SetFilePath(kPathPreference[i], new_path);
     }
   }
 
+  // If in Sign in profile, then skip mounting and listening for mount events.
+  if (chromeos::ProfileHelper::IsSigninProfile(profile_))
+    return;
+
   // Register 'Downloads' folder for the profile to the file system.
   fileapi::ExternalMountPoints* mount_points =
       content::BrowserContext::GetMountPoints(profile_);
   DCHECK(mount_points);
 
   const base::FilePath downloads_folder =
       file_manager::util::GetDownloadsFolderForProfile(profile_);
   bool success = mount_points->RegisterFileSystem(
       downloads_folder.BaseName().AsUTF8Unsafe(),
       fileapi::kFileSystemTypeNativeLocal,
@@ skipping 112 matching lines @@
 void VolumeManager::OnDiskEvent(
     chromeos::disks::DiskMountManager::DiskEvent event,
     const chromeos::disks::DiskMountManager::Disk* disk) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   // Disregard hidden devices.
   if (disk->is_hidden())
     return;
 
   switch (event) {
-    case chromeos::disks::DiskMountManager::DISK_ADDED: {
+    case chromeos::disks::DiskMountManager::DISK_ADDED:
+    case chromeos::disks::DiskMountManager::DISK_CHANGED: {
       if (disk->device_path().empty()) {
         DVLOG(1) << "Empty system path for " << disk->device_path();
         return;
       }
 
       bool mounting = false;
       if (disk->mount_path().empty() && disk->has_media() &&
           !profile_->GetPrefs()->GetBoolean(prefs::kExternalStorageDisabled)) {
         // If disk is not mounted yet and it has media and there is no policy
         // forbidding external storage, give it a try.
@@ skipping 18 matching lines @@
         disk_mount_manager_->UnmountPath(
             disk->mount_path(),
             chromeos::UNMOUNT_OPTIONS_LAZY,
             chromeos::disks::DiskMountManager::UnmountPathCallback());
       }
 
       // Notify to observers.
       FOR_EACH_OBSERVER(VolumeManagerObserver, observers_,
                         OnDiskRemoved(*disk));
       return;
-
-    case chromeos::disks::DiskMountManager::DISK_CHANGED:
-      DVLOG(1) << "Ignore CHANGED event.";
-      return;
   }
   NOTREACHED();
 }
 
 void VolumeManager::OnDeviceEvent(
     chromeos::disks::DiskMountManager::DeviceEvent event,
     const std::string& device_path) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   DVLOG(1) << "OnDeviceEvent: " << event << ", " << device_path;
 
@@ skipping 110 matching lines @@
           disk_mount_manager_->mount_points().begin()->second.mount_path;
       disk_mount_manager_->UnmountPath(
           mount_path,
           chromeos::UNMOUNT_OPTIONS_NONE,
           chromeos::disks::DiskMountManager::UnmountPathCallback());
     }
   }
 }
 
 }  // namespace file_manager