Try 2 [Media Gallery] Move chrome/browser/media_transfer_protocol code to src/device.

BUG=156929
TEST=none

Original CL: https://chromiumcodereview.appspot.com/11744014


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

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

26 files changed, 123 insertions, 104 deletions

diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 219cd51..6b17612 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -7,6 +7,7 @@ include_rules = [
   "+content/components",
   "+content/public/browser",
   "+device/bluetooth",
+  "+device/media_transfer_protocol",
   "+extensions/common",
   "+google/cacheinvalidation",  # Sync invalidation API protobuf files.
   "+google_apis",
diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc
index db40bec..2bf9e3a 100644
--- a/chrome/browser/chrome_browser_main_linux.cc
+++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/chrome_browser_main_linux.h"
 
-#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h"
 #include "chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/system_monitor/removable_device_notifications_linux.h"
@@ -82,7 +82,7 @@ ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux(
 
 ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLinux() {
   if (did_pre_profile_init_)
-    chrome::MediaTransferProtocolManager::Shutdown();
+    device::MediaTransferProtocolManager::Shutdown();
 }
 
 void ChromeBrowserMainPartsLinux::PreProfileInit() {
@@ -106,7 +106,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
   removable_device_notifications_linux_->Init();
 #endif
 
-  chrome::MediaTransferProtocolManager::Initialize();
+  device::MediaTransferProtocolManager::Initialize();
 
   did_pre_profile_init_ = true;
 
diff --git a/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc b/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc
index 38b6dff..6a5e2c1 100644
--- a/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc
+++ b/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.cc
@@ -16,8 +16,8 @@
 #include "chrome/browser/media_gallery/linux/mtp_read_directory_worker.h"
 #include "chrome/browser/media_gallery/linux/mtp_read_file_worker.h"
 #include "chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h"
-#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h"
 #include "content/public/browser/browser_thread.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 using base::Bind;
 using base::PlatformFileError;
diff --git a/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h b/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h
index d7ea79a..340298ad 100644
--- a/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h
+++ b/chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h
@@ -9,7 +9,7 @@
 
 #include "base/file_path.h"
 #include "base/time.h"
-#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h"
+#include "device/media_transfer_protocol/mtp_file_entry.pb.h"
 #include "webkit/fileapi/file_system_file_util.h"
 
 namespace chrome {
diff --git a/chrome/browser/media_gallery/linux/mtp_device_operations_utils.cc b/chrome/browser/media_gallery/linux/mtp_device_operations_utils.cc
index c92dda0..2a412bc 100644
--- a/chrome/browser/media_gallery/linux/mtp_device_operations_utils.cc
+++ b/chrome/browser/media_gallery/linux/mtp_device_operations_utils.cc
@@ -4,14 +4,14 @@
 
 #include "chrome/browser/media_gallery/linux/mtp_device_operations_utils.h"
 
-#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 namespace chrome {
 
 // Returns MediaTransferProtocolManager instance on success or NULL on failure.
-MediaTransferProtocolManager* GetMediaTransferProtocolManager() {
-  MediaTransferProtocolManager* mtp_device_mgr =
-      MediaTransferProtocolManager::GetInstance();
+device::MediaTransferProtocolManager* GetMediaTransferProtocolManager() {
+  device::MediaTransferProtocolManager* mtp_device_mgr =
+      device::MediaTransferProtocolManager::GetInstance();
   DCHECK(mtp_device_mgr);
   return mtp_device_mgr;
 }
diff --git a/chrome/browser/media_gallery/linux/mtp_device_operations_utils.h b/chrome/browser/media_gallery/linux/mtp_device_operations_utils.h
index 2ba22cc..f257dd1 100644
--- a/chrome/browser/media_gallery/linux/mtp_device_operations_utils.h
+++ b/chrome/browser/media_gallery/linux/mtp_device_operations_utils.h
@@ -14,9 +14,11 @@
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/threading/sequenced_worker_pool.h"
 
-namespace chrome {
-
+namespace device {
 class MediaTransferProtocolManager;
+}
+
+namespace chrome {
 
 // Helper struct to delete worker objects on |media_task_runner_| thread.
 template <typename WORKER> struct WorkerDeleter {
@@ -30,7 +32,7 @@ template <typename WORKER> struct WorkerDeleter {
 };
 
 // Returns MediaTransferProtocolManager instance on success or NULL on failure.
-MediaTransferProtocolManager* GetMediaTransferProtocolManager();
+device::MediaTransferProtocolManager* GetMediaTransferProtocolManager();
 
 }  // namespace chrome
 
diff --git a/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.cc b/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.cc
index 7115595..0b1cd80 100644
--- a/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.cc
+++ b/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.cc
@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
-#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h"
 #include "content/public/browser/browser_thread.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 namespace chrome {
 
diff --git a/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.h b/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.h
index 7bafca7..b6303e70 100644
--- a/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.h
+++ b/chrome/browser/media_gallery/linux/mtp_get_file_info_worker.h
@@ -10,7 +10,7 @@
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "chrome/browser/media_gallery/linux/mtp_device_operations_utils.h"
-#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h"
+#include "device/media_transfer_protocol/mtp_file_entry.pb.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/chrome/browser/media_gallery/linux/mtp_open_storage_worker.cc b/chrome/browser/media_gallery/linux/mtp_open_storage_worker.cc
index 8dd0513..0d248b8 100644
--- a/chrome/browser/media_gallery/linux/mtp_open_storage_worker.cc
+++ b/chrome/browser/media_gallery/linux/mtp_open_storage_worker.cc
@@ -10,8 +10,8 @@
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
-#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h"
 #include "content/public/browser/browser_thread.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chrome {
diff --git a/chrome/browser/media_gallery/linux/mtp_read_directory_worker.cc b/chrome/browser/media_gallery/linux/mtp_read_directory_worker.cc
index 4e6e74b..44a3294 100644
--- a/chrome/browser/media_gallery/linux/mtp_read_directory_worker.cc
+++ b/chrome/browser/media_gallery/linux/mtp_read_directory_worker.cc
@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
-#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h"
 #include "content/public/browser/browser_thread.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 namespace chrome {
 
diff --git a/chrome/browser/media_gallery/linux/mtp_read_directory_worker.h b/chrome/browser/media_gallery/linux/mtp_read_directory_worker.h
index 9ae84da..9b1f2ee 100644
--- a/chrome/browser/media_gallery/linux/mtp_read_directory_worker.h
+++ b/chrome/browser/media_gallery/linux/mtp_read_directory_worker.h
@@ -12,7 +12,7 @@
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "chrome/browser/media_gallery/linux/mtp_device_operations_utils.h"
-#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h"
+#include "device/media_transfer_protocol/mtp_file_entry.pb.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/chrome/browser/media_gallery/linux/mtp_read_file_worker.cc b/chrome/browser/media_gallery/linux/mtp_read_file_worker.cc
index 7b1e9f0..bcefa33 100644
--- a/chrome/browser/media_gallery/linux/mtp_read_file_worker.cc
+++ b/chrome/browser/media_gallery/linux/mtp_read_file_worker.cc
@@ -12,9 +12,9 @@
 #include "base/file_util.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
-#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h"
-#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h"
 #include "content/public/browser/browser_thread.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
+#include "device/media_transfer_protocol/mtp_file_entry.pb.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h b/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h
index 9701d4d..13b5910 100644
--- a/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h
+++ b/chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.h
@@ -11,7 +11,7 @@
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
-#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h"
+#include "device/media_transfer_protocol/mtp_file_entry.pb.h"
 #include "webkit/fileapi/file_system_file_util.h"
 
 namespace base {
diff --git a/chrome/browser/media_transfer_protocol/DEPS b/chrome/browser/media_transfer_protocol/DEPS
deleted file mode 100644
index 4e249e0..0000000
--- a/chrome/browser/media_transfer_protocol/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
-  # The media transfer protocol daemon uses D-Bus.
-  "+dbus",
-]
diff --git a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc
index f98455d..2c29771 100644
--- a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc
+++ b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc
@@ -9,9 +9,9 @@
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/media_transfer_protocol/mtp_storage_info.pb.h"
 #include "chrome/browser/system_monitor/media_storage_util.h"
 #include "chrome/browser/system_monitor/removable_device_constants.h"
+#include "device/media_transfer_protocol/mtp_storage_info.pb.h"
 
 namespace chrome {
 
@@ -101,8 +101,8 @@ void GetStorageInfo(const std::string& storage_name,
                     string16* label,
                     std::string* location) {
   DCHECK(!storage_name.empty());
-  MediaTransferProtocolManager* mtp_manager =
-      MediaTransferProtocolManager::GetInstance();
+  device::MediaTransferProtocolManager* mtp_manager =
+      device::MediaTransferProtocolManager::GetInstance();
   const MtpStorageInfo* storage_info =
       mtp_manager->GetStorageInfo(storage_name);
 
@@ -128,8 +128,8 @@ MediaTransferProtocolDeviceObserverLinux()
   DCHECK(!g_mtp_device_observer);
   g_mtp_device_observer = this;
 
-  MediaTransferProtocolManager* mtp_manager =
-      MediaTransferProtocolManager::GetInstance();
+  device::MediaTransferProtocolManager* mtp_manager =
+      device::MediaTransferProtocolManager::GetInstance();
   mtp_manager->AddObserver(this);
   EnumerateStorages();
 }
@@ -140,7 +140,7 @@ MediaTransferProtocolDeviceObserverLinux(
     GetStorageInfoFunc get_storage_info_func)
     : get_storage_info_func_(get_storage_info_func) {
   // In unit tests, we don't have a media transfer protocol manager.
-  DCHECK(!MediaTransferProtocolManager::GetInstance());
+  DCHECK(!device::MediaTransferProtocolManager::GetInstance());
   DCHECK(!g_mtp_device_observer);
   g_mtp_device_observer = this;
 }
@@ -150,8 +150,8 @@ MediaTransferProtocolDeviceObserverLinux::
   DCHECK_EQ(this, g_mtp_device_observer);
   g_mtp_device_observer = NULL;
 
-  MediaTransferProtocolManager* mtp_manager =
-      MediaTransferProtocolManager::GetInstance();
+  device::MediaTransferProtocolManager* mtp_manager =
+      device::MediaTransferProtocolManager::GetInstance();
   if (mtp_manager)
     mtp_manager->RemoveObserver(this);
 }
@@ -187,7 +187,7 @@ bool MediaTransferProtocolDeviceObserverLinux::GetStorageInfoForPath(
   return true;
 }
 
-// MediaTransferProtocolManager::Observer override.
+// device::MediaTransferProtocolManager::Observer override.
 void MediaTransferProtocolDeviceObserverLinux::StorageChanged(
     bool is_attached,
     const std::string& storage_name) {
@@ -229,8 +229,8 @@ void MediaTransferProtocolDeviceObserverLinux::StorageChanged(
 
 void MediaTransferProtocolDeviceObserverLinux::EnumerateStorages() {
   typedef std::vector<std::string> StorageList;
-  MediaTransferProtocolManager* mtp_manager =
-      MediaTransferProtocolManager::GetInstance();
+  device::MediaTransferProtocolManager* mtp_manager =
+      device::MediaTransferProtocolManager::GetInstance();
   StorageList storages = mtp_manager->GetStorages();
   for (StorageList::const_iterator storage_iter = storages.begin();
        storage_iter != storages.end(); ++storage_iter) {
diff --git a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h
index 3602ccc..a9df128 100644
--- a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h
+++ b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h
@@ -10,7 +10,7 @@
 
 #include "base/string16.h"
 #include "base/system_monitor/system_monitor.h"
-#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 class FilePath;
 
@@ -26,7 +26,7 @@ typedef void (*GetStorageInfoFunc)(const std::string& storage_name,
 // Helper class to send MTP storage attachment and detachment events to
 // SystemMonitor.
 class MediaTransferProtocolDeviceObserverLinux
-    : public MediaTransferProtocolManager::Observer {
+    : public device::MediaTransferProtocolManager::Observer {
  public:
   // Should only be called by browser start up code. Use GetInstance() instead.
   MediaTransferProtocolDeviceObserverLinux();
@@ -45,7 +45,7 @@ class MediaTransferProtocolDeviceObserverLinux
   explicit MediaTransferProtocolDeviceObserverLinux(
       GetStorageInfoFunc get_storage_info_func);
 
-  // MediaTransferProtocolManager::Observer implementation.
+  // device::MediaTransferProtocolManager::Observer implementation.
   // Exposed for unit tests.
   virtual void StorageChanged(bool is_attached,
                               const std::string& storage_name) OVERRIDE;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index fafd32c..c0cb66e 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2458,15 +2458,10 @@
         }],
         ['OS=="linux"', {
           'dependencies': [
-            'mtp_file_entry_proto',
-            'mtp_storage_info_proto',
             '../build/linux/system.gyp:udev',
-          ],
-          'sources': [
-            'browser/media_transfer_protocol/media_transfer_protocol_daemon_client.cc',
-            'browser/media_transfer_protocol/media_transfer_protocol_daemon_client.h',
-            'browser/media_transfer_protocol/media_transfer_protocol_manager.cc',
-            'browser/media_transfer_protocol/media_transfer_protocol_manager.h',
+            '../device/device.gyp:mtp_file_entry_proto',
+            '../device/device.gyp:mtp_storage_info_proto',
+            '../device/device.gyp:device_media_transfer_protocol',
           ],
         }],
         ['OS=="linux" and chromeos==0', {
@@ -3124,38 +3119,5 @@
       ],
      },
     ],
-    ['OS=="linux"', {
-      'targets': [
-        {
-          # Protobuf compiler / generator for the MtpFileEntry and
-          # MtpFileEntries protocol buffers.
-          'target_name': 'mtp_file_entry_proto',
-          'type': 'static_library',
-          'sources': [
-            '../third_party/cros_system_api/dbus/mtp_file_entry.proto',
-          ],
-          'variables': {
-            'proto_in_dir': '../third_party/cros_system_api/dbus',
-            'proto_out_dir': 'chrome/browser/media_transfer_protocol',
-          },
-          'includes': ['../build/protoc.gypi'],
-        },
-        {
-          # Protobuf compiler / generator for the MtpStorageInfo protocol
-          # buffer.
-          'target_name': 'mtp_storage_info_proto',
-          'type': 'static_library',
-          'sources': [
-            '../third_party/cros_system_api/dbus/mtp_storage_info.proto',
-          ],
-          'variables': {
-            'proto_in_dir': '../third_party/cros_system_api/dbus',
-            'proto_out_dir': 'chrome/browser/media_transfer_protocol',
-          },
-          'includes': ['../build/protoc.gypi'],
-        },
-      ],
-     },
-    ],
   ],
 }
diff --git a/chrome/common/DEPS b/chrome/common/DEPS
index c85a982..a1d6202 100644
--- a/chrome/common/DEPS
+++ b/chrome/common/DEPS
@@ -1,6 +1,7 @@
 include_rules = [
   "+chrome/plugin",  # For checking whether we're a plugin process.
   "+device/bluetooth",  # For BluetoothDevicePermission
+  "+device/media_transfer_protocol",  # For MediaTransferProtocolManager
   "+device/usb",  # For UsbDevicePermission
   "+extensions/common",
   "+grit",  # For generated headers
diff --git a/device/device.gyp b/device/device.gyp
index 25db3cb..c8e6a50 100644
--- a/device/device.gyp
+++ b/device/device.gyp
@@ -151,4 +151,53 @@
       ],
     },
   ],
+  'conditions': [
+    ['OS=="linux"', {
+      'targets': [
+        {
+          # Protobuf compiler / generator for the MtpFileEntry and
+          # MtpFileEntries protocol buffers.
+          'target_name': 'mtp_file_entry_proto',
+          'type': 'static_library',
+          'sources': [
+            '../third_party/cros_system_api/dbus/mtp_file_entry.proto',
+          ],
+          'variables': {
+            'proto_in_dir': '../third_party/cros_system_api/dbus',
+            'proto_out_dir': 'device/media_transfer_protocol',
+          },
+          'includes': ['../build/protoc.gypi'],
+        },
+        {
+          # Protobuf compiler / generator for the MtpStorageInfo protocol
+          # buffer.
+          'target_name': 'mtp_storage_info_proto',
+          'type': 'static_library',
+          'sources': [
+            '../third_party/cros_system_api/dbus/mtp_storage_info.proto',
+          ],
+          'variables': {
+            'proto_in_dir': '../third_party/cros_system_api/dbus',
+            'proto_out_dir': 'device/media_transfer_protocol',
+          },
+          'includes': ['../build/protoc.gypi'],
+        },
+        {
+          'target_name': 'device_media_transfer_protocol',
+          'type': 'static_library',
+          'dependencies': [
+            '../build/linux/system.gyp:dbus',
+            'mtp_file_entry_proto',
+            'mtp_storage_info_proto',
+          ],
+          'sources': [
+            'media_transfer_protocol/media_transfer_protocol_daemon_client.cc',
+            'media_transfer_protocol/media_transfer_protocol_daemon_client.h',
+            'media_transfer_protocol/media_transfer_protocol_manager.cc',
+            'media_transfer_protocol/media_transfer_protocol_manager.h',
+          ],
+        },
+      ],
+    }],
+  ],
 }
diff --git a/device/media_transfer_protocol/DEPS b/device/media_transfer_protocol/DEPS
new file mode 100644
index 0000000..e461e37
--- /dev/null
+++ b/device/media_transfer_protocol/DEPS
@@ -0,0 +1,8 @@
+include_rules = [
+  # The media transfer protocol daemon uses D-Bus.
+  "+dbus",
+  "+chrome/common/chrome_switches.h",
+  "+chromeos/dbus",
+  "+content/public/browser/browser_thread.h",
+  "+third_party/cros_system_api/dbus",
+]
diff --git a/chrome/browser/media_transfer_protocol/OWNERS b/device/media_transfer_protocol/OWNERS
index 8cada85..8cada85 100644
--- a/chrome/browser/media_transfer_protocol/OWNERS
+++ b/device/media_transfer_protocol/OWNERS
diff --git a/chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.cc b/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc
index c88df8a..52e8e63 100644
--- a/chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.cc
+++ b/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_daemon_client.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h"
-#include "chrome/browser/media_transfer_protocol/mtp_storage_info.pb.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
+#include "device/media_transfer_protocol/mtp_file_entry.pb.h"
+#include "device/media_transfer_protocol/mtp_storage_info.pb.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
-namespace chrome {
+namespace device {
 
 namespace {
 
@@ -486,4 +486,4 @@ MediaTransferProtocolDaemonClient::Create(dbus::Bus* bus, bool is_stub) {
   return new MediaTransferProtocolDaemonClientImpl(bus);
 }
 
-}  // namespace chrome
+}  // namespace device
diff --git a/chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.h b/device/media_transfer_protocol/media_transfer_protocol_daemon_client.h
index 6b27fdd..bba9794 100644
--- a/chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.h
+++ b/device/media_transfer_protocol/media_transfer_protocol_daemon_client.h
@@ -6,8 +6,8 @@
 // responsible for communicating with PTP / MTP capable devices like cameras
 // and smartphones.
 
-#ifndef CHROME_BROWSER_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_
-#define CHROME_BROWSER_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_
+#ifndef DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_
+#define DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_
 
 #include <string>
 #include <vector>
@@ -27,7 +27,7 @@ namespace dbus {
 class Bus;
 }
 
-namespace chrome {
+namespace device {
 
 // A class to make the actual DBus calls for mtpd service.
 // This class only makes calls, result/error handling should be done
@@ -175,6 +175,6 @@ class MediaTransferProtocolDaemonClient {
   DISALLOW_COPY_AND_ASSIGN(MediaTransferProtocolDaemonClient);
 };
 
-}  // namespace chrome
+}  // namespace device
 
-#endif  // CHROME_BROWSER_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_
+#endif  // DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_
diff --git a/chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.cc b/device/media_transfer_protocol/media_transfer_protocol_manager.cc
index dbb246f..dba7d18 100644
--- a/chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.cc
+++ b/device/media_transfer_protocol/media_transfer_protocol_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/media_transfer_protocol/media_transfer_protocol_manager.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 #include <map>
 #include <queue>
@@ -14,11 +14,11 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/stl_util.h"
-#include "chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.h"
-#include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h"
-#include "chrome/browser/media_transfer_protocol/mtp_storage_info.pb.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_daemon_client.h"
+#include "device/media_transfer_protocol/mtp_file_entry.pb.h"
+#include "device/media_transfer_protocol/mtp_storage_info.pb.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ -28,7 +28,7 @@
 
 using content::BrowserThread;
 
-namespace chrome {
+namespace device {
 
 namespace {
 
@@ -391,7 +391,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
   }
 
   // Mtpd DBus client.
-  scoped_ptr<chrome::MediaTransferProtocolDaemonClient> mtp_client_;
+  scoped_ptr<MediaTransferProtocolDaemonClient> mtp_client_;
 
 #if !defined(OS_CHROMEOS)
   // And a D-Bus session for talking to mtpd.
@@ -450,4 +450,4 @@ MediaTransferProtocolManager* MediaTransferProtocolManager::GetInstance() {
   return g_media_transfer_protocol_manager;
 }
 
-}  // namespace chrome
+}  // namespace device
diff --git a/chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h b/device/media_transfer_protocol/media_transfer_protocol_manager.h
index 19247f4..5c416b5 100644
--- a/chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h
+++ b/device/media_transfer_protocol/media_transfer_protocol_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_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_
-#define CHROME_BROWSER_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_
+#ifndef DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_
+#define DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_
 
 #include <string>
 #include <vector>
@@ -18,7 +18,7 @@
 class MtpFileEntry;
 class MtpStorageInfo;
 
-namespace chrome {
+namespace device {
 
 // This class handles the interaction with mtpd.
 // Other classes can add themselves as observers.
@@ -138,6 +138,6 @@ class MediaTransferProtocolManager {
   static MediaTransferProtocolManager* GetInstance();
 };
 
-}  // namespace chrome
+}  // namespace device
 
-#endif  // CHROME_BROWSER_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_
+#endif  // DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_
diff --git a/third_party/mtpd/mtpd.gyp b/third_party/mtpd/mtpd.gyp
index 62a363de..8d41442 100644
--- a/third_party/mtpd/mtpd.gyp
+++ b/third_party/mtpd/mtpd.gyp
@@ -11,8 +11,8 @@
         '../../base/base.gyp:base',
         '../../build/linux/system.gyp:glib',
         '../../build/linux/system.gyp:udev',
-        '../../chrome/chrome.gyp:mtp_file_entry_proto',
-        '../../chrome/chrome.gyp:mtp_storage_info_proto',
+        '../../device/device.gyp:mtp_file_entry_proto',
+        '../../device/device.gyp:mtp_storage_info_proto',
         '../../third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp:dbus_cplusplus',
         '../../third_party/libmtp/libmtp.gyp:libmtp',
       ],
@@ -37,7 +37,7 @@
       ],
       'include_dirs': [
         '.',
-        '<(SHARED_INTERMEDIATE_DIR)/protoc_out/chrome/browser/media_transfer_protocol',
+        '<(SHARED_INTERMEDIATE_DIR)/protoc_out/device/media_transfer_protocol',
       ],
     },
   ],