Regularize ownerships and lifecycle for storage monitor platform classes.

chrome/browser/storage_monitor/removable_device_notifications_chromeos.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.
 
 // chromeos::RemovableDeviceNotificationsCros implementation.
 
 #include "chrome/browser/storage_monitor/removable_device_notifications_chromeos.h"
 
+#include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #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/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 namespace chromeos {
 
 namespace {
 
 // Constructs a device name using label or manufacturer (vendor and product)
 // name details.
 string16 GetDeviceName(const disks::DiskMountManager::Disk& disk) {
   if (disk.device_type() == DEVICE_TYPE_SD) {
     // Mount path of an SD card will be one of the following:
@@ skipping 51 matching lines @@
   if (storage_size_in_bytes)
     *storage_size_in_bytes = disk->total_size_in_bytes();
   return true;
 }
 
 }  // namespace
 
 using content::BrowserThread;
 
 RemovableDeviceNotificationsCros::RemovableDeviceNotificationsCros() {
-  DCHECK(disks::DiskMountManager::GetInstance());
-  disks::DiskMountManager::GetInstance()->AddObserver(this);
-  CheckExistingMountPointsOnUIThread();
 }
 
 RemovableDeviceNotificationsCros::~RemovableDeviceNotificationsCros() {
+  device::MediaTransferProtocolManager::Shutdown();

[Lei Zhang, 2013/03/01 04:40:15]

Add a check before calling this to avoid the shutdown dcheck?

if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType))
...

[Greg Billock, 2013/03/01 18:00:50]

Done.

+
   disks::DiskMountManager* manager = disks::DiskMountManager::GetInstance();
   if (manager) {
     manager->RemoveObserver(this);
   }
 }
 
+void RemovableDeviceNotificationsCros::Init() {
+  DCHECK(disks::DiskMountManager::GetInstance());
+  disks::DiskMountManager::GetInstance()->AddObserver(this);
+  CheckExistingMountPointsOnUIThread();
+
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
+    scoped_refptr<base::MessageLoopProxy> loop_proxy;
+    device::MediaTransferProtocolManager::Initialize(loop_proxy);
+
+    media_transfer_protocol_device_observer_.reset(
+        new chrome::MediaTransferProtocolDeviceObserverLinux());
+    media_transfer_protocol_device_observer_->SetNotifications(receiver());
+  }
+}
+
+
 void RemovableDeviceNotificationsCros::CheckExistingMountPointsOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const disks::DiskMountManager::MountPointMap& mount_point_map =
       disks::DiskMountManager::GetInstance()->mount_points();
   for (disks::DiskMountManager::MountPointMap::const_iterator it =
            mount_point_map.begin(); it != mount_point_map.end(); ++it) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(
             &RemovableDeviceNotificationsCros::CheckMountedPathOnFileThread,
@@ skipping 134 matching lines @@
       storage_size_in_bytes
   };
   mount_map_.insert(std::make_pair(mount_info.mount_path, object_info));
   receiver()->ProcessAttach(StorageInfo(
       device_id,
       chrome::GetDisplayNameForDevice(storage_size_in_bytes, device_label),
       mount_info.mount_path));
 }
 
 }  // namespace chromeos