Defer ARC file system operations while ARC is booting.

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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/arc/fileapi/arc_documents_provider_util.h"
 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_service.h"
 #include "chrome/browser/chromeos/arc/fileapi/arc_media_view_util.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/chromeos/file_manager/snapshot_manager.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/file_system_provider/provided_file_system_info.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/media_galleries/fileapi/mtp_device_map_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/disks/disk_mount_manager.h"
-#include "components/arc/arc_service_manager.h"
 #include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/prefs/pref_service.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 #include "storage/browser/fileapi/external_mount_points.h"
 
 namespace file_manager {
@@ skipping 355 matching lines @@
   // Subscribe to storage monitor for MTP notifications.
   if (storage_monitor::StorageMonitor::GetInstance()) {
     storage_monitor::StorageMonitor::GetInstance()->EnsureInitialized(
         base::Bind(&VolumeManager::OnStorageMonitorInitialized,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   // Subscribe to ARC file system events.
   if (base::FeatureList::IsEnabled(arc::kMediaViewFeature) &&
       arc::ArcSessionManager::IsAllowedForProfile(profile_)) {
-    arc::ArcServiceManager::GetGlobalService<arc::ArcFileSystemService>()
-        ->AddObserver(this);
+    arc::ArcSessionManager::Get()->AddObserver(this);
+    OnArcOptInChanged(arc::ArcSessionManager::Get()->IsArcEnabled());
   }
 }
 
 void VolumeManager::Shutdown() {
   weak_ptr_factory_.InvalidateWeakPtrs();
 
   snapshot_manager_.reset();
   pref_change_registrar_.RemoveAll();
   disk_mount_manager_->RemoveObserver(this);
   if (storage_monitor::StorageMonitor::GetInstance())
     storage_monitor::StorageMonitor::GetInstance()->RemoveObserver(this);
 
   if (drive_integration_service_)
     drive_integration_service_->RemoveObserver(this);
 
   if (file_system_provider_service_)
     file_system_provider_service_->RemoveObserver(this);
 
   // Unsubscribe from ARC file system events.
   if (base::FeatureList::IsEnabled(arc::kMediaViewFeature) &&
       arc::ArcSessionManager::IsAllowedForProfile(profile_)) {
-    arc::ArcFileSystemService* file_system_service =
-        arc::ArcServiceManager::GetGlobalService<arc::ArcFileSystemService>();
+    auto* session_manager = arc::ArcSessionManager::Get();
     // TODO(crbug.com/672829): We need nullptr check here because
-    // ArcServiceManager may or may not be alive at this point.
-    if (file_system_service)
-      file_system_service->RemoveObserver(this);
+    // ArcSessionManager may or may not be alive at this point.
+    if (session_manager)
+      session_manager->RemoveObserver(this);
   }
 }
 
 void VolumeManager::AddObserver(VolumeManagerObserver* observer) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(observer);
   observers_.AddObserver(observer);
 }
 
 void VolumeManager::RemoveObserver(VolumeManagerObserver* observer) {
@@ skipping 285 matching lines @@
   // Repeat until unmount all paths
   const std::string& mount_path =
       disk_mount_manager_->mount_points().begin()->second.mount_path;
   disk_mount_manager_->UnmountPath(
       mount_path, chromeos::UNMOUNT_OPTIONS_NONE,
       base::Bind(
           &VolumeManager::OnExternalStorageDisabledChangedUnmountCallback,
           weak_ptr_factory_.GetWeakPtr()));
 }
 
-void VolumeManager::OnFileSystemsReady() {
+void VolumeManager::OnArcOptInChanged(bool enabled) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(base::FeatureList::IsEnabled(arc::kMediaViewFeature));
   DCHECK(arc::ArcSessionManager::IsAllowedForProfile(profile_));
 
-  DoMountEvent(chromeos::MOUNT_ERROR_NONE,
-               linked_ptr<Volume>(
-                   Volume::CreateForMediaView(arc::kImagesRootDocumentId)));
-  DoMountEvent(chromeos::MOUNT_ERROR_NONE,
-               linked_ptr<Volume>(
-                   Volume::CreateForMediaView(arc::kVideosRootDocumentId)));
-  DoMountEvent(chromeos::MOUNT_ERROR_NONE,
-               linked_ptr<Volume>(
-                   Volume::CreateForMediaView(arc::kAudioRootDocumentId)));
-}
+  if (enabled == arc_volumes_mounted_)
+    return;
 
-void VolumeManager::OnFileSystemsClosed() {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  DCHECK(base::FeatureList::IsEnabled(arc::kMediaViewFeature));
-  DCHECK(arc::ArcSessionManager::IsAllowedForProfile(profile_));
-
-  DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,
+  if (enabled) {
+    DoMountEvent(chromeos::MOUNT_ERROR_NONE,
                  linked_ptr<Volume>(
                      Volume::CreateForMediaView(arc::kImagesRootDocumentId)));
-  DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,
+    DoMountEvent(chromeos::MOUNT_ERROR_NONE,
                  linked_ptr<Volume>(
                      Volume::CreateForMediaView(arc::kVideosRootDocumentId)));
-  DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,
+    DoMountEvent(chromeos::MOUNT_ERROR_NONE,
                  linked_ptr<Volume>(
                      Volume::CreateForMediaView(arc::kAudioRootDocumentId)));
+    arc_volumes_mounted_ = true;

[hashimoto, 2017/01/23 08:28:43]

nit: arc_volumes_mounted_ = enabled at the last of this function?

[Shuhei Takahashi, 2017/01/23 09:17:51]

Done.

+  } else {
+    DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,
+                   linked_ptr<Volume>(
+                       Volume::CreateForMediaView(arc::kImagesRootDocumentId)));
+    DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,
+                   linked_ptr<Volume>(
+                       Volume::CreateForMediaView(arc::kVideosRootDocumentId)));
+    DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,
+                   linked_ptr<Volume>(
+                       Volume::CreateForMediaView(arc::kAudioRootDocumentId)));
+    arc_volumes_mounted_ = false;
+  }
 }
 
 void VolumeManager::OnExternalStorageDisabledChanged() {
   // If the policy just got disabled we have to unmount every device currently
   // mounted. The opposite is fine - we can let the user re-plug their device to
   // make it available.
   if (profile_->GetPrefs()->GetBoolean(prefs::kExternalStorageDisabled)) {
     // We do not iterate on mount_points directly, because mount_points can
     // be changed by UnmountPath().
     // TODO(hidehiko): Is it necessary to unmount mounted archives, too, here?
@@ skipping 200 matching lines @@
   if (mounted_volumes_.find(volume->volume_id()) == mounted_volumes_.end())
     return;
   if (error_code == chromeos::MOUNT_ERROR_NONE)
     mounted_volumes_.erase(volume->volume_id());
 
   for (auto& observer : observers_)
     observer.OnVolumeUnmounted(error_code, *volume.get());
 }
 
 }  // namespace file_manager