4 files changed, 11 insertions, 13 deletions
diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc
index ec39b18..f4dd392 100644
--- a/chrome/browser/chrome_browser_main_linux.cc
+++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -109,11 +109,11 @@ bool IsCrashReportingEnabled(const PrefService* local_state) {
 ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux(
     const content::MainFunctionParams& parameters)
     : ChromeBrowserMainPartsPosix(parameters),
-      did_pre_profile_init_(false) {
+      initialized_media_transfer_protocol_manager_(false) {
 }
 
 ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLinux() {
-  if (did_pre_profile_init_)
+  if (initialized_media_transfer_protocol_manager_)
     device::MediaTransferProtocolManager::Shutdown();
 }
 
@@ -138,16 +138,19 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
   removable_device_notifications_linux_->Init();
 #endif
 
-  device::MediaTransferProtocolManager::Initialize();
-
-  did_pre_profile_init_ = true;
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
+    device::MediaTransferProtocolManager::Initialize();
+    initialized_media_transfer_protocol_manager_ = true;
+  }
 
   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());
+  }
 
   ChromeBrowserMainPartsPosix::PostProfileInit();
 }
diff --git a/chrome/browser/chrome_browser_main_linux.h b/chrome/browser/chrome_browser_main_linux.h
index a7550e7..e76f348 100644
--- a/chrome/browser/chrome_browser_main_linux.h
+++ b/chrome/browser/chrome_browser_main_linux.h
@@ -39,7 +39,7 @@ class ChromeBrowserMainPartsLinux : public ChromeBrowserMainPartsPosix {
 #endif
   scoped_ptr<chrome::MediaTransferProtocolDeviceObserverLinux>
       media_transfer_protocol_device_observer_;
-  bool did_pre_profile_init_;
+  bool initialized_media_transfer_protocol_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsLinux);
 };
diff --git a/device/media_transfer_protocol/DEPS b/device/media_transfer_protocol/DEPS
index e461e37..2708b71 100644
--- a/device/media_transfer_protocol/DEPS
+++ b/device/media_transfer_protocol/DEPS
@@ -1,7 +1,6 @@
 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/device/media_transfer_protocol/media_transfer_protocol_manager.cc b/device/media_transfer_protocol/media_transfer_protocol_manager.cc
index dba7d18..6b87b2e 100644
--- a/device/media_transfer_protocol/media_transfer_protocol_manager.cc
+++ b/device/media_transfer_protocol/media_transfer_protocol_manager.cc
@@ -14,7 +14,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/stl_util.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"
@@ -38,9 +37,6 @@ MediaTransferProtocolManager* g_media_transfer_protocol_manager = NULL;
 class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
  public:
   MediaTransferProtocolManagerImpl() : weak_ptr_factory_(this) {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType))
-      return;
-
     dbus::Bus* bus = NULL;
 #if defined(OS_CHROMEOS)
     chromeos::DBusThreadManager* dbus_thread_manager =