Revert of Move more utility functions to arc_util.

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_util.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"
@@ skipping 370 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::IsArcAllowedForProfile(profile_)) {
+      arc::ArcSessionManager::IsAllowedForProfile(profile_)) {
     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::IsArcAllowedForProfile(profile_)) {
+      arc::ArcSessionManager::IsAllowedForProfile(profile_)) {
     auto* session_manager = arc::ArcSessionManager::Get();
     // TODO(crbug.com/672829): We need nullptr check here because
     // 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);
@@ skipping 293 matching lines @@
   disk_mount_manager_->UnmountPath(
       mount_path, chromeos::UNMOUNT_OPTIONS_NONE,
       base::Bind(
           &VolumeManager::OnExternalStorageDisabledChangedUnmountCallback,
           weak_ptr_factory_.GetWeakPtr()));
 }
 
 void VolumeManager::OnArcOptInChanged(bool enabled) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(base::FeatureList::IsEnabled(arc::kMediaViewFeature));
-  DCHECK(arc::IsArcAllowedForProfile(profile_));
+  DCHECK(arc::ArcSessionManager::IsAllowedForProfile(profile_));
 
   if (enabled == arc_volumes_mounted_)
     return;
 
   if (enabled) {
     DoMountEvent(chromeos::MOUNT_ERROR_NONE,
                  linked_ptr<Volume>(
                      Volume::CreateForMediaView(arc::kImagesRootDocumentId)));
     DoMountEvent(chromeos::MOUNT_ERROR_NONE,
                  linked_ptr<Volume>(
@@ skipping 227 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