Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager.

chrome/browser/media_galleries/linux/mtp_device_task_helper.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/media_galleries/linux/mtp_device_task_helper.h"
 
 #include "base/logging.h"
 #include "chrome/browser/media_galleries/linux/mtp_device_object_enumerator.h"
 #include "chrome/browser/media_galleries/linux/mtp_read_file_worker.h"
 #include "chrome/browser/media_galleries/linux/snapshot_file_details.h"
+#include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "webkit/fileapi/async_file_util.h"
 #include "webkit/fileapi/file_system_util.h"
 
 namespace chrome {
 
 namespace {
 
 // Does nothing.
 // This method is used to handle the results of
 // MediaTransferProtocolManager::CloseStorage method call.
 void DoNothing(bool error) {
 }
 
 device::MediaTransferProtocolManager* GetMediaTransferProtocolManager() {
-  device::MediaTransferProtocolManager* mtp_device_mgr =
-      device::MediaTransferProtocolManager::GetInstance();
-  DCHECK(mtp_device_mgr);
-  return mtp_device_mgr;
+  return StorageMonitor::GetInstance()->media_transfer_protocol_manager();
 }
 
 }  // namespace
 
 MTPDeviceTaskHelper::MTPDeviceTaskHelper()
     : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 }
 
 MTPDeviceTaskHelper::~MTPDeviceTaskHelper() {
@@ skipping 137 matching lines @@
 void MTPDeviceTaskHelper::HandleDeviceError(
     const ErrorCallback& error_callback,
     base::PlatformFileError error) const {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   content::BrowserThread::PostTask(content::BrowserThread::IO,
                                    FROM_HERE,
                                    base::Bind(error_callback, error));
 }
 
 }  // namespace chrome