Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager.

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 212 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   // Owned by caller.
   return new MtabWatcherLinux(mtab_path, delegate);
 }
 
 }  // namespace
 
 StorageMonitorLinux::StorageMonitorLinux(const base::FilePath& path)
     : mtab_path_(path),
       get_device_info_callback_(base::Bind(&GetDeviceInfo)),
+      use_dummy_media_transfer_protocol_manager_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
+    UseDummyMediaTransferProtocolManagerForTest();
+  }
 }
 
 StorageMonitorLinux::~StorageMonitorLinux() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType))
-    device::MediaTransferProtocolManager::Shutdown();

[Greg Billock, 2013/04/10 18:27:25]

Still need to call this, right? Or does the destructor now do it?

[Lei Zhang, 2013/04/11 06:54:04]

The dtor does it now.

 }
 
 void StorageMonitorLinux::Init() {
   DCHECK(!mtab_path_.empty());
 
   BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&CreateMtabWatcherLinuxOnFileThread,
                  mtab_path_,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&StorageMonitorLinux::OnMtabWatcherCreated,
                  weak_ptr_factory_.GetWeakPtr()));
 
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
-    scoped_refptr<base::MessageLoopProxy> loop_proxy;
-    loop_proxy = content::BrowserThread::GetMessageLoopProxyForThread(
-        content::BrowserThread::FILE);
-    device::MediaTransferProtocolManager::Initialize(loop_proxy);
+  scoped_refptr<base::MessageLoopProxy> loop_proxy =
+      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE);
+  media_transfer_protocol_manager_.reset(
+      device::MediaTransferProtocolManager::Initialize(
+          loop_proxy, use_dummy_media_transfer_protocol_manager_));
 
     media_transfer_protocol_device_observer_.reset(
         new MediaTransferProtocolDeviceObserverLinux(receiver()));
-  }
 }
 
 bool StorageMonitorLinux::GetStorageInfoForPath(
     const base::FilePath& path,
     StorageInfo* device_info) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // TODO(thestig) |media_transfer_protocol_device_observer_| should always be
   // valid.
   if (media_transfer_protocol_device_observer_ &&
@@ skipping 10 matching lines @@
     current = current.DirName();
 
   MountMap::const_iterator mount_info = mount_info_map_.find(current);
   if (mount_info == mount_info_map_.end())
     return false;
   if (device_info)
     *device_info = mount_info->second.storage_info;
   return true;
 }
 
+device::MediaTransferProtocolManager*
+StorageMonitorLinux::media_transfer_protocol_manager() {
+  return media_transfer_protocol_manager_.get();
+}
+
 void StorageMonitorLinux::SetGetDeviceInfoCallbackForTest(
     const GetDeviceInfoCallback& get_device_info_callback) {
   get_device_info_callback_ = get_device_info_callback;
 }
 
+void StorageMonitorLinux::UseDummyMediaTransferProtocolManagerForTest() {
+  use_dummy_media_transfer_protocol_manager_ = true;
+}
+
 void StorageMonitorLinux::OnMtabWatcherCreated(MtabWatcherLinux* watcher) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   mtab_watcher_.reset(watcher);
 }
 
 void StorageMonitorLinux::UpdateMtab(const MountPointDeviceMap& new_mtab) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Check existing mtab entries for unaccounted mount points.
   // These mount points must have been removed in the new mtab.
@@ skipping 120 matching lines @@
 
   if (removable) {
     // TODO(gbillock) Do this in a higher level instead of here.
     storage_info->name = MediaStorageUtil::GetDisplayNameForDevice(
         storage_info->total_size_in_bytes, storage_info->name);
     receiver()->ProcessAttach(*storage_info);
   }
 }
 
 }  // namespace chrome