Remove dependencies to 'chrome' from device/media_transfer_protocol.

chrome/browser/chrome_browser_main_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/chrome_browser_main_linux.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)
@@ skipping 120 matching lines @@
     InitCrashReporter();
 #endif
 
 #if !defined(OS_CHROMEOS)
   const FilePath kDefaultMtabPath("/etc/mtab");
   removable_device_notifications_linux_ =
       new chrome::RemovableDeviceNotificationsLinux(kDefaultMtabPath);
   removable_device_notifications_linux_->Init();
 #endif
 
-  device::MediaTransferProtocolManager::Initialize();
-
-  did_pre_profile_init_ = true;
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
+    device::MediaTransferProtocolManager::Initialize();
+    did_pre_profile_init_ = true;

[Lei Zhang, 2013/01/31 01:33:01]

You have changed the meaning of this variable. In which case, please give it a
new name.

[kmadhusu, 2013/01/31 02:30:40]

Done.

+  }
 
   ChromeBrowserMainPartsPosix::PreProfileInit();
 }
 
 void ChromeBrowserMainPartsLinux::PostProfileInit() {
-  media_transfer_protocol_device_observer_.reset(
-      new chrome::MediaTransferProtocolDeviceObserverLinux());
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
+    media_transfer_protocol_device_observer_.reset(
+        new chrome::MediaTransferProtocolDeviceObserverLinux());

[kmadhusu, 2013/01/31 02:30:40]

We don't need to instantiate MediaTransferProtocolDeviceObserverLinux for
testing.

+  }
 
   ChromeBrowserMainPartsPosix::PostProfileInit();
 }
 
 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
 #if !defined(OS_CHROMEOS)
   // Release it now. Otherwise the FILE thread would be gone when we try to
   // release it in the dtor and Valgrind would report a leak on almost ever
   // single browser_test.
   removable_device_notifications_linux_ = NULL;
 #endif
 
   media_transfer_protocol_device_observer_.reset();
 
   ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
 }