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

chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc

 // Copyright (c) 2012 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/system_monitor/media_transfer_protocol_device_observer_linux.h"
 
 #include "base/file_path.h"
 #include "base/stl_util.h"
 #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 {
 
 using base::SystemMonitor;
 
 namespace {
 
 static MediaTransferProtocolDeviceObserverLinux* g_mtp_device_observer = NULL;
 
 // Device root path constant.
@@ skipping 69 matching lines @@
   return UTF8ToUTF16(device_label);
 }
 
 // Helper function to get the device storage details such as device id, label
 // and location. On success and fills in |id|, |label| and |location|.
 void GetStorageInfo(const std::string& storage_name,
                     std::string* id,
                     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);
 
   if (!storage_info)
     return;
 
   if (id)
     *id = GetDeviceIdFromStorageInfo(*storage_info);
 
   if (label)
     *label = GetDeviceLabelFromStorageInfo(*storage_info);
 
 
   if (location)
     *location = GetDeviceLocationFromStorageName(storage_name);
 }
 
 }  // namespace
 
 MediaTransferProtocolDeviceObserverLinux::
 MediaTransferProtocolDeviceObserverLinux()
     : get_storage_info_func_(&GetStorageInfo) {
   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();
 }
 
 // This constructor is only used by unit tests.
 MediaTransferProtocolDeviceObserverLinux::
 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;
 }
 
 MediaTransferProtocolDeviceObserverLinux::
 ~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);
 }
 
 // static
 MediaTransferProtocolDeviceObserverLinux*
 MediaTransferProtocolDeviceObserverLinux::GetInstance() {
   DCHECK(g_mtp_device_observer != NULL);
   return g_mtp_device_observer;
 }
@@ skipping 15 matching lines @@
   StorageLocationToInfoMap::const_iterator info_it =
       storage_map_.find(GetDeviceLocationFromStorageName(path_components[1]));
   if (info_it == storage_map_.end())
     return false;
 
   if (storage_info)
     *storage_info = info_it->second;
   return true;
 }
 
-// MediaTransferProtocolManager::Observer override.
+// device::MediaTransferProtocolManager::Observer override.
 void MediaTransferProtocolDeviceObserverLinux::StorageChanged(
     bool is_attached,
     const std::string& storage_name) {
   DCHECK(!storage_name.empty());
 
   SystemMonitor* system_monitor = SystemMonitor::Get();
   DCHECK(system_monitor);
 
   // New storage is attached.
   if (is_attached) {
@@ skipping 21 matching lines @@
         storage_map_.find(GetDeviceLocationFromStorageName(storage_name));
     if (it == storage_map_.end())
       return;
     system_monitor->ProcessRemovableStorageDetached(it->second.device_id);
     storage_map_.erase(it);
   }
 }
 
 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) {
     StorageChanged(true, *storage_iter);
   }
 }
 
 }  // namespace chrome