Move VolumeManager to c/b/chromeos/file_manager

This is remaining part of r221334, because during its code review,
VolumeManager was actively being changed so that it was kept as is to avoid
conflict.

BUG=273386
TEST=Ran unit_tests

Review URL: https://chromiumcodereview.appspot.com/23892008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221650 0039d316-1c4b-4281-b951-d872f2087c98

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

@@ -16,12 +16,12 @@
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
-#include "chrome/browser/chromeos/extensions/file_manager/volume_manager.h"
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #include "chrome/browser/chromeos/file_manager/desktop_notifications.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
 #include "chrome/browser/chromeos/file_manager/mounted_disk_monitor.h"
 #include "chrome/browser/chromeos/file_manager/open_util.h"
+#include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/drive/drive_service_interface.h"

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

@@ -13,8 +13,8 @@
 #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/volume_manager_observer.h"
 #include "chrome/browser/chromeos/file_manager/file_watcher.h"
+#include "chrome/browser/chromeos/file_manager/volume_manager_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"

chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc

@@ -6,7 +6,7 @@
 
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h"
-#include "chrome/browser/chromeos/extensions/file_manager/volume_manager_factory.h"
+#include "chrome/browser/chromeos/file_manager/volume_manager_factory.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"

chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc

@@ -12,8 +12,8 @@
 #include "chrome/browser/chromeos/extensions/file_manager/event_router.h"
 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
-#include "chrome/browser/chromeos/extensions/file_manager/volume_manager.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
+#include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/chromeos/extensions/file_manager/volume_manager.cc → chrome/browser/chromeos/file_manager/volume_manager.cc

@@ -2,7 +2,7 @@
 // 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/volume_manager.h"
+#include "chrome/browser/chromeos/file_manager/volume_manager.h"
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
@@ -10,8 +10,8 @@
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/chromeos/extensions/file_manager/volume_manager_factory.h"
-#include "chrome/browser/chromeos/extensions/file_manager/volume_manager_observer.h"
+#include "chrome/browser/chromeos/file_manager/volume_manager_factory.h"
+#include "chrome/browser/chromeos/file_manager/volume_manager_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/dbus/cros_disks_client.h"

chrome/browser/chromeos/extensions/file_manager/volume_manager.h → chrome/browser/chromeos/file_manager/volume_manager.h

@@ -2,8 +2,8 @@
 // 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_VOLUME_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_VOLUME_MANAGER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_
+#define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
@@ -108,4 +108,4 @@ class VolumeManager : public BrowserContextKeyedService,
 
 }  // namespace file_manager
 
-#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_VOLUME_MANAGER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_

chrome/browser/chromeos/extensions/file_manager/volume_manager_factory.cc → chrome/browser/chromeos/file_manager/volume_manager_factory.cc

@@ -2,11 +2,11 @@
 // 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/volume_manager_factory.h"
+#include "chrome/browser/chromeos/file_manager/volume_manager_factory.h"
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
-#include "chrome/browser/chromeos/extensions/file_manager/volume_manager.h"
+#include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/disks/disk_mount_manager.h"

chrome/browser/chromeos/extensions/file_manager/volume_manager_factory.h → chrome/browser/chromeos/file_manager/volume_manager_factory.h

@@ -5,8 +5,8 @@
 #include "base/basictypes.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h"
 
-#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_
-#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_
+#define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_
 
 template<typename T> struct DefaultSingletonTraits;
 
@@ -49,4 +49,4 @@ class VolumeManagerFactory : public BrowserContextKeyedServiceFactory {
 
 }  // namespace file_manager
 
-#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_

chrome/browser/chromeos/extensions/file_manager/volume_manager_observer.h → chrome/browser/chromeos/file_manager/volume_manager_observer.h

@@ -2,8 +2,8 @@
 // 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_VOLUME_MANAGER_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_VOLUME_MANAGER_OBSERVER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_OBSERVER_H_
+#define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_OBSERVER_H_
 
 #include <string>
 
@@ -43,4 +43,4 @@ class VolumeManagerObserver {
 
 }  // namespace file_manager
 
-#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_VOLUME_MANAGER_OBSERVER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_OBSERVER_H_

chrome/browser/chromeos/extensions/file_manager/volume_manager_unittest.cc → chrome/browser/chromeos/file_manager/volume_manager_unittest.cc

@@ -2,14 +2,14 @@
 // 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/volume_manager.h"
+#include "chrome/browser/chromeos/file_manager/volume_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/chromeos/extensions/file_manager/volume_manager_observer.h"
+#include "chrome/browser/chromeos/file_manager/volume_manager_observer.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/disks/disk_mount_manager.h"

chrome/chrome_browser_chromeos.gypi

@@ -323,11 +323,6 @@
         'browser/chromeos/extensions/external_cache.h',
         'browser/chromeos/extensions/external_pref_cache_loader.cc',
         'browser/chromeos/extensions/external_pref_cache_loader.h',
-        'browser/chromeos/extensions/file_manager/volume_manager.cc',
-        'browser/chromeos/extensions/file_manager/volume_manager.h',
-        'browser/chromeos/extensions/file_manager/volume_manager_factory.cc',
-        'browser/chromeos/extensions/file_manager/volume_manager_factory.h',
-        'browser/chromeos/extensions/file_manager/volume_manager_observer.h',
         'browser/chromeos/extensions/info_private_api.cc',
         'browser/chromeos/extensions/info_private_api.h',
         'browser/chromeos/extensions/input_method_event_router.cc',
@@ -369,6 +364,11 @@
         'browser/chromeos/file_manager/select_file_dialog_util.h',
         'browser/chromeos/file_manager/url_util.cc',
         'browser/chromeos/file_manager/url_util.h',
+        'browser/chromeos/file_manager/volume_manager.cc',
+        'browser/chromeos/file_manager/volume_manager.h',
+        'browser/chromeos/file_manager/volume_manager_factory.cc',
+        'browser/chromeos/file_manager/volume_manager_factory.h',
+        'browser/chromeos/file_manager/volume_manager_observer.h',
         'browser/chromeos/file_manager/zip_file_creator.cc',
         'browser/chromeos/file_manager/zip_file_creator.h',
         'browser/chromeos/fileapi/file_access_permissions.cc',

chrome/chrome_tests_unit.gypi

@@ -660,12 +660,12 @@
         'browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc',
         'browser/chromeos/drive/write_on_cache_file_unittest.cc',
         'browser/chromeos/extensions/default_app_order_unittest.cc',
-        'browser/chromeos/extensions/file_manager/volume_manager_unittest.cc',
         'browser/chromeos/file_manager/desktop_notifications_unittest.cc',
         'browser/chromeos/file_manager/file_tasks_unittest.cc',
         'browser/chromeos/file_manager/file_watcher_unittest.cc',
         'browser/chromeos/file_manager/mime_util_unittest.cc',
         'browser/chromeos/file_manager/url_util_unittest.cc',
+        'browser/chromeos/file_manager/volume_manager_unittest.cc',
         'browser/chromeos/extensions/wallpaper_private_api_unittest.cc',
         'browser/chromeos/external_metrics_unittest.cc',
         'browser/chromeos/fileapi/file_access_permissions_unittest.cc',