Chromium Code Reviews| Index: chrome/browser/chrome_browser_main_linux.cc |
| diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc |
| index ec39b182b0f2b30570e7f584381022b3f3b66aa0..c8f5f6a30a9ffba261d419abb6d60b865f8b4653 100644 |
| --- a/chrome/browser/chrome_browser_main_linux.cc |
| +++ b/chrome/browser/chrome_browser_main_linux.cc |
| @@ -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(); |
| + did_pre_profile_init_ = true; |
|
Lei Zhang
2013/01/31 01:33:01
You have changed the meaning of this variable. In
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 MediaTransferProtocol
|
| + } |
| ChromeBrowserMainPartsPosix::PostProfileInit(); |
| } |