Storage Monitor Linux: Do not try to initialize MediaTransferProtocolManager during unit tests.

chrome/browser/storage_monitor/storage_monitor_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.
 
 // StorageMonitorLinux implementation.
 
 #include "chrome/browser/storage_monitor/storage_monitor_linux.h"
 
 #include <mntent.h>
 #include <stdio.h>
@@ skipping 257 matching lines @@
 StorageMonitorLinux::StorageMonitorLinux(const base::FilePath& path,
                                          GetDeviceInfoFunc get_device_info_func)
     : initialized_(false),
       mtab_path_(path),
       get_device_info_func_(get_device_info_func) {
 }
 
 StorageMonitorLinux::~StorageMonitorLinux() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
+  if (!IsRunningTest()) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&device::MediaTransferProtocolManager::Shutdown));
   }
 }
 
 void StorageMonitorLinux::Init() {
   DCHECK(!mtab_path_.empty());
 
   // Put |kKnownFileSystems| in std::set to get O(log N) access time.
   for (size_t i = 0; i < arraysize(kKnownFileSystems); ++i)
     known_file_systems_.insert(kKnownFileSystems[i]);
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&StorageMonitorLinux::InitOnFileThread, this));
 
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
+  if (!IsRunningTest()) {
     scoped_refptr<base::MessageLoopProxy> loop_proxy;
     loop_proxy = content::BrowserThread::GetMessageLoopProxyForThread(
         content::BrowserThread::FILE);
     device::MediaTransferProtocolManager::Initialize(loop_proxy);
 
     media_transfer_protocol_device_observer_.reset(
         new MediaTransferProtocolDeviceObserverLinux());
     media_transfer_protocol_device_observer_->SetNotifications(receiver());
   }
 }
@@ skipping 32 matching lines @@
     return;
   }
   if (error) {
     LOG(ERROR) << "Error watching " << mtab_path_.value();
     return;
   }
 
   UpdateMtab();
 }
 
+bool StorageMonitorLinux::IsRunningTest() const {
+  return CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType);
+}
+
 void StorageMonitorLinux::InitOnFileThread() {
   DCHECK(!initialized_);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   initialized_ = true;
 
   // The callback passed to Watch() has to be unretained. Otherwise
   // StorageMonitorLinux will live longer than expected, and FilePathWatcher
   // will get in trouble at shutdown time.
   bool ret = file_watcher_.Watch(
       mtab_path_, false,
@@ skipping 127 matching lines @@
   if (removable) {
     string16 display_name = MediaStorageUtil::GetDisplayNameForDevice(
         partition_size_in_bytes, name);
 
     receiver()->ProcessAttach(StorageInfo(device_id, display_name,
                                           mount_point.value()));
   }
 }
 
 }  // namespace chrome