Move device notification impl out of chrome/browser/media_gallery

BUG=145400
TEST=None


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

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

27 files changed, 73 insertions, 73 deletions

diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc
index be3b048..5c8220e 100644
--- a/chrome/browser/chrome_browser_main_linux.cc
+++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/chrome_browser_main_linux.h"
 
 #if !defined(OS_CHROMEOS)
-#include "chrome/browser/media_gallery/removable_device_notifications_linux.h"
+#include "chrome/browser/system_monitor/removable_device_notifications_linux.h"
 #endif
 
 #if defined(USE_LINUX_BREAKPAD)
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
index a03619d..b2f8b72 100644
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -22,10 +22,10 @@
 #include "base/win/wrapped_window_proc.h"
 #include "chrome/browser/browser_util_win.h"
 #include "chrome/browser/first_run/first_run.h"
-#include "chrome/browser/media_gallery/media_device_notifications_window_win.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
+#include "chrome/browser/system_monitor/media_device_notifications_window_win.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/browser/ui/uninstall_browser_prompt.h"
 #include "chrome/common/chrome_constants.h"
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 8fcf8ee..1fdaeda 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -59,7 +59,6 @@
 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
 #include "chrome/browser/defaults.h"
-#include "chrome/browser/media_gallery/media_device_notifications_chromeos.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
@@ -68,6 +67,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/token_service_factory.h"
+#include "chrome/browser/system_monitor/media_device_notifications_chromeos.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
diff --git a/chrome/browser/intents/device_attached_intent_source.cc b/chrome/browser/intents/device_attached_intent_source.cc
index 7f874e7..60b9666 100644
--- a/chrome/browser/intents/device_attached_intent_source.cc
+++ b/chrome/browser/intents/device_attached_intent_source.cc
@@ -13,8 +13,8 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/intents/web_intents_registry_factory.h"
-#include "chrome/browser/media_gallery/media_storage_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "content/public/browser/web_intents_dispatcher.h"
diff --git a/chrome/browser/media_gallery/media_file_system_registry.cc b/chrome/browser/media_gallery/media_file_system_registry.cc
index 2522d80..e2a32e1 100644
--- a/chrome/browser/media_gallery/media_file_system_registry.cc
+++ b/chrome/browser/media_gallery/media_file_system_registry.cc
@@ -12,7 +12,7 @@
 #include "base/path_service.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/media_gallery/media_storage_util.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension.h"
diff --git a/chrome/browser/media_gallery/media_galleries_preferences.cc b/chrome/browser/media_gallery/media_galleries_preferences.cc
index 80bf638..3743419 100644
--- a/chrome/browser/media_gallery/media_galleries_preferences.cc
+++ b/chrome/browser/media_gallery/media_galleries_preferences.cc
@@ -12,10 +12,10 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/media_gallery/media_file_system_registry.h"
-#include "chrome/browser/media_gallery/media_storage_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
diff --git a/chrome/browser/media_gallery/media_galleries_preferences_unittest.cc b/chrome/browser/media_gallery/media_galleries_preferences_unittest.cc
index c93a667..9d3b856 100644
--- a/chrome/browser/media_gallery/media_galleries_preferences_unittest.cc
+++ b/chrome/browser/media_gallery/media_galleries_preferences_unittest.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/media_gallery/media_file_system_registry.h"
-#include "chrome/browser/media_gallery/media_storage_util.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/media_gallery/media_device_notifications_chromeos.cc b/chrome/browser/system_monitor/media_device_notifications_chromeos.cc
index 7be2775..3f203fc 100644
--- a/chrome/browser/media_gallery/media_device_notifications_chromeos.cc
+++ b/chrome/browser/system_monitor/media_device_notifications_chromeos.cc
@@ -4,7 +4,7 @@
 
 // chromeos::MediaDeviceNotifications implementation.
 
-#include "chrome/browser/media_gallery/media_device_notifications_chromeos.h"
+#include "chrome/browser/system_monitor/media_device_notifications_chromeos.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ -12,8 +12,8 @@
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/media_gallery/media_device_notifications_utils.h"
-#include "chrome/browser/media_gallery/media_storage_util.h"
+#include "chrome/browser/system_monitor/media_device_notifications_utils.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
diff --git a/chrome/browser/media_gallery/media_device_notifications_chromeos.h b/chrome/browser/system_monitor/media_device_notifications_chromeos.h
index 49822b9..c0672d1 100644
--- a/chrome/browser/media_gallery/media_device_notifications_chromeos.h
+++ b/chrome/browser/system_monitor/media_device_notifications_chromeos.h
@@ -5,8 +5,8 @@
 // chromeos::MediaDeviceNotifications listens for mount point changes and
 // notifies the SystemMonitor about the addition and deletion of media devices.
 
-#ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_CHROMEOS_H_
-#define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_CHROMEOS_H_
+#ifndef CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_DEVICE_NOTIFICATIONS_CHROMEOS_H_
+#define CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_DEVICE_NOTIFICATIONS_CHROMEOS_H_
 
 #if !defined(OS_CHROMEOS)
 #error "Should only be used on ChromeOS."
@@ -70,4 +70,4 @@ class MediaDeviceNotifications
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_CHROMEOS_H_
+#endif  // CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_DEVICE_NOTIFICATIONS_CHROMEOS_H_
diff --git a/chrome/browser/media_gallery/media_device_notifications_chromeos_unittest.cc b/chrome/browser/system_monitor/media_device_notifications_chromeos_unittest.cc
index 1e75319..29a9ae4 100644
--- a/chrome/browser/media_gallery/media_device_notifications_chromeos_unittest.cc
+++ b/chrome/browser/system_monitor/media_device_notifications_chromeos_unittest.cc
@@ -4,7 +4,7 @@
 
 // chromeos::MediaDeviceNotifications unit tests.
 
-#include "chrome/browser/media_gallery/media_device_notifications_chromeos.h"
+#include "chrome/browser/system_monitor/media_device_notifications_chromeos.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ -14,7 +14,7 @@
 #include "base/system_monitor/system_monitor.h"
 #include "base/test/mock_devices_changed_observer.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/media_gallery/media_storage_util.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
 #include "chromeos/disks/mock_disk_mount_manager.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/media_gallery/media_device_notifications_utils.cc b/chrome/browser/system_monitor/media_device_notifications_utils.cc
index 9036b32b..5453eb6 100644
--- a/chrome/browser/media_gallery/media_device_notifications_utils.cc
+++ b/chrome/browser/system_monitor/media_device_notifications_utils.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/media_gallery/media_device_notifications_utils.h"
+#include "chrome/browser/system_monitor/media_device_notifications_utils.h"
 
 #include "base/file_util.h"
 #include "base/string_util.h"
diff --git a/chrome/browser/media_gallery/media_device_notifications_utils.h b/chrome/browser/system_monitor/media_device_notifications_utils.h
index 13f5b0c..46980b1 100644
--- a/chrome/browser/media_gallery/media_device_notifications_utils.h
+++ b/chrome/browser/system_monitor/media_device_notifications_utils.h
@@ -4,8 +4,8 @@
 
 // Common code shared between MediaDeviceNotifications{Win,Linux}.
 
-#ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_UTILS_H_
-#define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_UTILS_H_
+#ifndef CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_DEVICE_NOTIFICATIONS_UTILS_H_
+#define CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_DEVICE_NOTIFICATIONS_UTILS_H_
 
 #include "base/file_path.h"
 
@@ -20,4 +20,4 @@ bool IsMediaDevice(const FilePath::StringType& mount_point);
 
 }  // namespace chrome
 
-#endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_UTILS_H_
+#endif  // CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_DEVICE_NOTIFICATIONS_UTILS_H_
diff --git a/chrome/browser/media_gallery/media_device_notifications_utils_unittest.cc b/chrome/browser/system_monitor/media_device_notifications_utils_unittest.cc
index 313f5ee..d38b283 100644
--- a/chrome/browser/media_gallery/media_device_notifications_utils_unittest.cc
+++ b/chrome/browser/system_monitor/media_device_notifications_utils_unittest.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/media_gallery/media_device_notifications_utils.h"
+#include "chrome/browser/system_monitor/media_device_notifications_utils.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
diff --git a/chrome/browser/media_gallery/media_device_notifications_window_win.cc b/chrome/browser/system_monitor/media_device_notifications_window_win.cc
index 90e2013b..01136cd 100644
--- a/chrome/browser/media_gallery/media_device_notifications_window_win.cc
+++ b/chrome/browser/system_monitor/media_device_notifications_window_win.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/media_gallery/media_device_notifications_window_win.h"
+#include "chrome/browser/system_monitor/media_device_notifications_window_win.h"
 
 #include <windows.h>
 #include <dbt.h>
@@ -13,8 +13,8 @@
 #include "base/string_number_conversions.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/win/wrapped_window_proc.h"
-#include "chrome/browser/media_gallery/media_device_notifications_utils.h"
-#include "chrome/browser/media_gallery/media_storage_util.h"
+#include "chrome/browser/system_monitor/media_device_notifications_utils.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
 #include "content/public/browser/browser_thread.h"
 
 using base::SystemMonitor;
diff --git a/chrome/browser/media_gallery/media_device_notifications_window_win.h b/chrome/browser/system_monitor/media_device_notifications_window_win.h
index 4783aeae..26407a7 100644
--- a/chrome/browser/media_gallery/media_device_notifications_window_win.h
+++ b/chrome/browser/system_monitor/media_device_notifications_window_win.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_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_WINDOW_WIN_H_
-#define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_WINDOW_WIN_H_
+#ifndef CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_DEVICE_NOTIFICATIONS_WINDOW_WIN_H_
+#define CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_DEVICE_NOTIFICATIONS_WINDOW_WIN_H_
 
 #include <windows.h>
 
@@ -67,4 +67,4 @@ class MediaDeviceNotificationsWindowWin
 
 }  // namespace chrome
 
-#endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_WINDOW_WIN_H_
+#endif  // CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_DEVICE_NOTIFICATIONS_WINDOW_WIN_H_
diff --git a/chrome/browser/media_gallery/media_device_notifications_window_win_unittest.cc b/chrome/browser/system_monitor/media_device_notifications_window_win_unittest.cc
index 4556a34..9bf31be 100644
--- a/chrome/browser/media_gallery/media_device_notifications_window_win_unittest.cc
+++ b/chrome/browser/system_monitor/media_device_notifications_window_win_unittest.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/media_gallery/media_device_notifications_window_win.h"
+#include "chrome/browser/system_monitor/media_device_notifications_window_win.h"
 
 #include <dbt.h>
 
@@ -16,7 +16,7 @@
 #include "base/string_number_conversions.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/test/mock_devices_changed_observer.h"
-#include "chrome/browser/media_gallery/media_storage_util.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/media_gallery/media_storage_util.cc b/chrome/browser/system_monitor/media_storage_util.cc
index cededbe..a5dce62 100644
--- a/chrome/browser/media_gallery/media_storage_util.cc
+++ b/chrome/browser/system_monitor/media_storage_util.cc
@@ -4,7 +4,7 @@
 
 // chrome::MediaStorageUtil implementation.
 
-#include "chrome/browser/media_gallery/media_storage_util.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
 
 #include <vector>
 
diff --git a/chrome/browser/media_gallery/media_storage_util.h b/chrome/browser/system_monitor/media_storage_util.h
index 8efeb94..827b8ce 100644
--- a/chrome/browser/media_gallery/media_storage_util.h
+++ b/chrome/browser/system_monitor/media_storage_util.h
@@ -5,8 +5,8 @@
 // chrome::MediaStorageUtil provides information about storage devices attached
 // to the computer.
 
-#ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_STORAGE_UTIL_H_
-#define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_STORAGE_UTIL_H_
+#ifndef CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_STORAGE_UTIL_H_
+#define CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_STORAGE_UTIL_H_
 
 #include <string>
 
@@ -91,4 +91,4 @@ class MediaStorageUtil {
 
 }  // namespace chrome
 
-#endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_STORAGE_UTIL_H_
+#endif  // CHROME_BROWSER_SYSTEM_MONITOR_MEDIA_STORAGE_UTIL_H_
diff --git a/chrome/browser/media_gallery/media_storage_util_linux.cc b/chrome/browser/system_monitor/media_storage_util_linux.cc
index 7b8a247..7a09f2c 100644
--- a/chrome/browser/media_gallery/media_storage_util_linux.cc
+++ b/chrome/browser/system_monitor/media_storage_util_linux.cc
@@ -4,11 +4,11 @@
 
 // Linux specific implementation of chrome::MediaStorageUtil.
 
-#include "chrome/browser/media_gallery/media_storage_util.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
 
 #include "base/callback.h"
 #include "base/system_monitor/system_monitor.h"
-#include "chrome/browser/media_gallery/removable_device_notifications_linux.h"
+#include "chrome/browser/system_monitor/removable_device_notifications_linux.h"
 
 namespace chrome {
 
diff --git a/chrome/browser/media_gallery/media_storage_util_unittest.cc b/chrome/browser/system_monitor/media_storage_util_unittest.cc
index 79364df..175cb78 100644
--- a/chrome/browser/media_gallery/media_storage_util_unittest.cc
+++ b/chrome/browser/system_monitor/media_storage_util_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <string>
 
-#include "chrome/browser/media_gallery/media_storage_util.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chrome {
diff --git a/chrome/browser/media_gallery/media_gallery_constants.cc b/chrome/browser/system_monitor/removable_device_constants.cc
index 074b579..88d9e2d 100644
--- a/chrome/browser/media_gallery/media_gallery_constants.cc
+++ b/chrome/browser/system_monitor/removable_device_constants.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/media_gallery/media_gallery_constants.h"
+#include "chrome/browser/system_monitor/removable_device_constants.h"
 
 namespace chrome {
 
diff --git a/chrome/browser/media_gallery/media_gallery_constants.h b/chrome/browser/system_monitor/removable_device_constants.h
index a4fbfe9..64ba0ec 100644
--- a/chrome/browser/media_gallery/media_gallery_constants.h
+++ b/chrome/browser/system_monitor/removable_device_constants.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_MEDIA_GALLERY_MEDIA_GALLERY_CONSTANTS_H_
-#define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_GALLERY_CONSTANTS_H_
+#ifndef CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_CONSTANTS_H_
+#define CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_CONSTANTS_H_
 
 namespace chrome {
 
@@ -17,4 +17,4 @@ extern const char kSpaceDelim[];
 
 }  // namespace chrome
 
-#endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_GALLERY_CONSTANTS_H_
+#endif  // CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_CONSTANTS_H_
diff --git a/chrome/browser/media_gallery/removable_device_notifications_linux.cc b/chrome/browser/system_monitor/removable_device_notifications_linux.cc
index 76fc08b..cab74f3 100644
--- a/chrome/browser/media_gallery/removable_device_notifications_linux.cc
+++ b/chrome/browser/system_monitor/removable_device_notifications_linux.cc
@@ -4,7 +4,7 @@
 
 // RemovableDeviceNotificationsLinux implementation.
 
-#include "chrome/browser/media_gallery/removable_device_notifications_linux.h"
+#include "chrome/browser/system_monitor/removable_device_notifications_linux.h"
 
 #include <libudev.h>
 #include <mntent.h>
@@ -22,9 +22,9 @@
 #include "base/stringprintf.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/media_gallery/media_device_notifications_utils.h"
-#include "chrome/browser/media_gallery/media_gallery_constants.h"
-#include "chrome/browser/media_gallery/media_storage_util.h"
+#include "chrome/browser/system_monitor/media_device_notifications_utils.h"
+#include "chrome/browser/system_monitor/removable_device_constants.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
 
 namespace chrome {
 
diff --git a/chrome/browser/media_gallery/removable_device_notifications_linux.h b/chrome/browser/system_monitor/removable_device_notifications_linux.h
index 241ff92..cead6ed 100644
--- a/chrome/browser/media_gallery/removable_device_notifications_linux.h
+++ b/chrome/browser/system_monitor/removable_device_notifications_linux.h
@@ -6,8 +6,8 @@
 // the SystemMonitor about the addition and deletion of media devices, and
 // answers queries about mounted devices.
 
-#ifndef CHROME_BROWSER_MEDIA_GALLERY_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_
-#define CHROME_BROWSER_MEDIA_GALLERY_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_
+#ifndef CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_
+#define CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_
 
 #if defined(OS_CHROMEOS)
 #error "Use the ChromeOS-specific implementation instead."
@@ -140,4 +140,4 @@ class RemovableDeviceNotificationsLinux
 
 }  // namespace chrome
 
-#endif  // CHROME_BROWSER_MEDIA_GALLERY_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_
+#endif  // CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_
diff --git a/chrome/browser/media_gallery/removable_device_notifications_linux_unittest.cc b/chrome/browser/system_monitor/removable_device_notifications_linux_unittest.cc
index 5adbfc7..cf501e2 100644
--- a/chrome/browser/media_gallery/removable_device_notifications_linux_unittest.cc
+++ b/chrome/browser/system_monitor/removable_device_notifications_linux_unittest.cc
@@ -4,7 +4,7 @@
 
 // RemovableDeviceNotificationsLinux unit tests.
 
-#include "chrome/browser/media_gallery/removable_device_notifications_linux.h"
+#include "chrome/browser/system_monitor/removable_device_notifications_linux.h"
 
 #include <mntent.h>
 #include <stdio.h>
@@ -19,7 +19,7 @@
 #include "base/system_monitor/system_monitor.h"
 #include "base/test/mock_devices_changed_observer.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/media_gallery/media_storage_util.h"
+#include "chrome/browser/system_monitor/media_storage_util.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6eefa69..680d999 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -942,12 +942,6 @@
         'browser/media/media_stream_devices_controller.h',
         'browser/media/media_stream_devices_menu_model.cc',
         'browser/media/media_stream_devices_menu_model.h',
-        'browser/media_gallery/media_device_notifications_chromeos.cc',
-        'browser/media_gallery/media_device_notifications_chromeos.h',
-        'browser/media_gallery/media_device_notifications_utils.cc',
-        'browser/media_gallery/media_device_notifications_utils.h',
-        'browser/media_gallery/media_device_notifications_window_win.cc',
-        'browser/media_gallery/media_device_notifications_window_win.h',
         'browser/media_gallery/media_file_system_registry.cc',
         'browser/media_gallery/media_file_system_registry.h',
         'browser/media_gallery/media_galleries_dialog_controller.cc',
@@ -956,17 +950,10 @@
         'browser/media_gallery/media_galleries_preferences.h',
         'browser/media_gallery/media_galleries_preferences_factory.cc',
         'browser/media_gallery/media_galleries_preferences_factory.h',
-        'browser/media_gallery/media_gallery_constants.cc',
-        'browser/media_gallery/media_gallery_constants.h',
         'browser/media_gallery/media_gallery_database.cc',
         'browser/media_gallery/media_gallery_database.h',
         'browser/media_gallery/media_gallery_database_types.cc',
         'browser/media_gallery/media_gallery_database_types.h',
-        'browser/media_gallery/media_storage_util.cc',
-        'browser/media_gallery/media_storage_util.h',
-        'browser/media_gallery/media_storage_util_linux.cc',
-        'browser/media_gallery/removable_device_notifications_linux.cc',
-        'browser/media_gallery/removable_device_notifications_linux.h',
         'browser/memory_details.cc',
         'browser/memory_details.h',
         'browser/memory_details_android.cc',
@@ -1878,6 +1865,19 @@
         'browser/sync/sync_ui_util_mac.h',
         'browser/sync/sync_ui_util_mac.mm',
         'browser/sync/user_selectable_sync_type.h',
+        'browser/system_monitor/media_device_notifications_chromeos.cc',
+        'browser/system_monitor/media_device_notifications_chromeos.h',
+        'browser/system_monitor/media_device_notifications_utils.cc',
+        'browser/system_monitor/media_device_notifications_utils.h',
+        'browser/system_monitor/media_device_notifications_window_win.cc',
+        'browser/system_monitor/media_device_notifications_window_win.h',
+        'browser/system_monitor/removable_device_constants.cc',
+        'browser/system_monitor/removable_device_constants.h',
+        'browser/system_monitor/media_storage_util.cc',
+        'browser/system_monitor/media_storage_util.h',
+        'browser/system_monitor/media_storage_util_linux.cc',
+        'browser/system_monitor/removable_device_notifications_linux.cc',
+        'browser/system_monitor/removable_device_notifications_linux.h',
         'browser/tab_contents/background_contents.cc',
         'browser/tab_contents/background_contents.h',
         'browser/tab_contents/language_state.cc',
@@ -4107,8 +4107,6 @@
             ['exclude', 'browser/extensions/extension_input_method_api.h'],
             ['exclude', 'browser/icon_loader_chromeos.cc'],
             ['exclude', 'browser/icon_manager_chromeos.cc'],
-            ['exclude', 'browser/media_gallery/media_device_notifications_chromeos.cc'],
-            ['exclude', 'browser/media_gallery/media_device_notifications_chromeos.h'],
             ['exclude', 'browser/net/gaia/gaia_oauth_consumer.h'],
             ['exclude', 'browser/net/gaia/gaia_oauth_fetcher.cc'],
             ['exclude', 'browser/net/gaia/gaia_oauth_fetcher.h'],
@@ -4131,6 +4129,8 @@
             ['exclude', 'browser/renderer_host/offline_resource_throttle.cc'],
             ['exclude', 'browser/renderer_host/offline_resource_throttle.h'],
             ['exclude', 'browser/speech/extension_api/tts_extension_api_chromeos.cc'],
+            ['exclude', 'browser/system_monitor/media_device_notifications_chromeos.cc'],
+            ['exclude', 'browser/system_monitor/media_device_notifications_chromeos.h'],
             ['exclude', 'browser/ui/toolbar/wrench_menu_model_chromeos.cc'],
           ],
         }, {  # chromeos==1
@@ -4144,9 +4144,6 @@
             ['exclude', 'browser/icon_loader_linux.cc'],
             ['exclude', 'browser/icon_manager_linux.cc'],
             ['exclude', 'browser/idle_linux.cc'],
-            ['exclude', 'browser/media_gallery/media_storage_util_linux.cc'],
-            ['exclude', 'browser/media_gallery/removable_device_notifications_linux.cc'],
-            ['exclude', 'browser/media_gallery/removable_device_notifications_linux.h'],
             ['exclude', 'browser/password_manager/native_backend_gnome_x.cc'],
             ['exclude', 'browser/password_manager/native_backend_gnome_x.h'],
             ['exclude', 'browser/password_manager/native_backend_kwallet_x.cc'],
@@ -4159,6 +4156,9 @@
             ['exclude', 'browser/policy/user_policy_signin_service_factory.h'],
             ['exclude', 'browser/platform_util_linux.cc'],
             ['exclude', 'browser/speech/extension_api/tts_extension_api_linux.cc'],
+            ['exclude', 'browser/system_monitor/media_storage_util_linux.cc'],
+            ['exclude', 'browser/system_monitor/removable_device_notifications_linux.cc'],
+            ['exclude', 'browser/system_monitor/removable_device_notifications_linux.h'],
             ['exclude', 'browser/ui/webui/help/version_updater_basic.cc'],
             ['exclude', 'browser/ui/webui/help/version_updater_basic.h'],
             ['exclude', 'browser/upgrade_detector_impl.cc'],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 774e7c0..e65b020 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1388,15 +1388,10 @@
         'browser/managed_mode_unittest.cc',
         'browser/managed_mode_url_filter_unittest.cc',
         'browser/media/media_internals_unittest.cc',
-        'browser/media_gallery/media_device_notifications_chromeos_unittest.cc',
-        'browser/media_gallery/media_device_notifications_utils_unittest.cc',
-        'browser/media_gallery/media_device_notifications_window_win_unittest.cc',
         'browser/media_gallery/media_galleries_dialog_controller_mock.cc',
         'browser/media_gallery/media_galleries_dialog_controller_mock.h',
         'browser/media_gallery/media_galleries_preferences_unittest.cc',
         'browser/media_gallery/media_gallery_database_unittest.cc',
-        'browser/media_gallery/media_storage_util_unittest.cc',
-        'browser/media_gallery/removable_device_notifications_linux_unittest.cc',
         'browser/metrics/metrics_log_unittest.cc',
         'browser/metrics/metrics_log_serializer_unittest.cc',
         'browser/metrics/metrics_service_unittest.cc',
@@ -1670,6 +1665,11 @@
         'browser/sync/test/test_http_bridge_factory.h',
         'browser/sync/test_profile_sync_service.cc',
         'browser/sync/test_profile_sync_service.h',
+        'browser/system_monitor/media_device_notifications_chromeos_unittest.cc',
+        'browser/system_monitor/media_device_notifications_utils_unittest.cc',
+        'browser/system_monitor/media_device_notifications_window_win_unittest.cc',
+        'browser/system_monitor/media_storage_util_unittest.cc',
+        'browser/system_monitor/removable_device_notifications_linux_unittest.cc',
         'browser/tab_contents/render_view_context_menu_unittest.cc',
         'browser/tab_contents/thumbnail_generator_unittest.cc',
         'browser/tab_contents/web_contents_user_data_unittest.cc',
@@ -2246,13 +2246,13 @@
         }],
         ['chromeos==1', {
           'sources/': [
-            ['exclude', '^browser/media_gallery/removable_device_notifications_linux_unittest.cc'],
             ['exclude', '^browser/password_manager/native_backend_gnome_x_unittest.cc'],
             ['exclude', '^browser/password_manager/native_backend_kwallet_x_unittest.cc'],
             ['exclude', '^browser/policy/user_cloud_policy_store_unittest.cc'],
             ['exclude', '^browser/policy/user_policy_signin_service_unittest.cc'],
 
             ['exclude', '^browser/safe_browsing/download_protection_service_unittest.cc' ],
+            ['exclude', '^browser/system_monitor/removable_device_notifications_linux_unittest.cc'],
           ],
           'sources': [
             'browser/ui/webui/feedback_ui_unittest.cc',
@@ -2260,7 +2260,6 @@
         }, { # else: chromeos == 0
           'sources/': [
             ['exclude', '^browser/chromeos/'],
-            ['exclude', '^browser/media_gallery/media_device_notifications_chromeos_unittest.cc'],
             ['exclude', '^browser/net/gaia/gaia_oauth_fetcher_unittest.cc'],
             ['exclude', '^browser/policy/auto_enrollment_client_unittest.cc' ],
             ['exclude', '^browser/policy/configuration_policy_handler_chromeos_unittest.cc' ],
@@ -2270,6 +2269,7 @@
             ['exclude', '^browser/policy/enterprise_install_attributes_unittest.cc' ],
             ['exclude', '^browser/policy/network_configuration_updater_unittest.cc' ],
             ['exclude', '^browser/policy/user_cloud_policy_store_chromeos_unittest.cc'],
+            ['exclude', '^browser/system_monitor/media_device_notifications_chromeos_unittest.cc'],
             ['exclude', '^browser/ui/ash/ime_controller_chromeos_unittest.cc'],
             ['exclude', '^browser/ui/webui/chromeos/imageburner/'],
             ['exclude', '^browser/ui/webui/chromeos/login'],