| Index: chrome/browser/storage_monitor/removable_device_notifications_linux.cc
|
| diff --git a/chrome/browser/storage_monitor/removable_device_notifications_linux.cc b/chrome/browser/storage_monitor/removable_device_notifications_linux.cc
|
| index ee62aea33d1c00a3e2ee4e205cb8384d49625416..68178bc1b9658e8cfca2d4b3ef99ca142f5c70db 100644
|
| --- a/chrome/browser/storage_monitor/removable_device_notifications_linux.cc
|
| +++ b/chrome/browser/storage_monitor/removable_device_notifications_linux.cc
|
| @@ -13,6 +13,7 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/bind.h"
|
| +#include "base/command_line.h"
|
| #include "base/files/file_path.h"
|
| #include "base/metrics/histogram.h"
|
| #include "base/stl_util.h"
|
| @@ -21,8 +22,10 @@
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/storage_monitor/media_device_notifications_utils.h"
|
| #include "chrome/browser/storage_monitor/media_storage_util.h"
|
| +#include "chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h"
|
| #include "chrome/browser/storage_monitor/removable_device_constants.h"
|
| #include "chrome/browser/storage_monitor/udev_util_linux.h"
|
| +#include "chrome/common/chrome_switches.h"
|
|
|
| namespace chrome {
|
|
|
| @@ -253,6 +256,12 @@ void RemovableDeviceNotificationsLinux::Init() {
|
| BrowserThread::PostTask(
|
| BrowserThread::FILE, FROM_HERE,
|
| base::Bind(&RemovableDeviceNotificationsLinux::InitOnFileThread, this));
|
| +
|
| + if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
|
| + media_transfer_protocol_device_observer_.reset(
|
| + new MediaTransferProtocolDeviceObserverLinux());
|
| + media_transfer_protocol_device_observer_->SetNotifications(receiver());
|
| + }
|
| }
|
|
|
| bool RemovableDeviceNotificationsLinux::GetDeviceInfoForPath(
|
|
|