Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager.

device/media_transfer_protocol/media_transfer_protocol_manager.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.
 
 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 #include <map>
 #include <queue>
 #include <set>
 #include <utility>
@@ skipping 17 matching lines @@
 
 namespace device {
 
 namespace {
 
 MediaTransferProtocolManager* g_media_transfer_protocol_manager = NULL;
 
 // The MediaTransferProtocolManager implementation.
 class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
  public:
-  MediaTransferProtocolManagerImpl(
+  explicit MediaTransferProtocolManagerImpl(
       scoped_refptr<base::MessageLoopProxy> loop_proxy)
       : weak_ptr_factory_(this) {
     dbus::Bus* bus = NULL;
 #if defined(OS_CHROMEOS)
     DCHECK(!loop_proxy.get());
     chromeos::DBusThreadManager* dbus_thread_manager =
         chromeos::DBusThreadManager::Get();
     bus = dbus_thread_manager->GetSystemBus();
     if (!bus)
       return;
@@ skipping 15 matching lines @@
     mtp_client_->SetUpConnections(
         base::Bind(&MediaTransferProtocolManagerImpl::OnStorageChanged,
                    weak_ptr_factory_.GetWeakPtr()));
     mtp_client_->EnumerateStorages(
         base::Bind(&MediaTransferProtocolManagerImpl::OnEnumerateStorages,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&base::DoNothing));
   }
 
   virtual ~MediaTransferProtocolManagerImpl() {
+    DCHECK(g_media_transfer_protocol_manager);
+    g_media_transfer_protocol_manager = NULL;
+    VLOG(1) << "MediaTransferProtocolManager Shutdown completed";
   }
 
   // MediaTransferProtocolManager override.
   virtual void AddObserver(Observer* observer) OVERRIDE {
     observers_.AddObserver(observer);
   }
 
   // MediaTransferProtocolManager override.
   virtual void RemoveObserver(Observer* observer) OVERRIDE {
     observers_.RemoveObserver(observer);
@@ skipping 343 matching lines @@
   GetFileInfoCallbackQueue get_file_info_callbacks_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaTransferProtocolManagerImpl);
 };
 
 }  // namespace
 
 // static
-void MediaTransferProtocolManager::Initialize(
+MediaTransferProtocolManager* MediaTransferProtocolManager::Initialize(
     scoped_refptr<base::MessageLoopProxy> loop_proxy) {
-  if (g_media_transfer_protocol_manager) {
-    LOG(WARNING) << "MediaTransferProtocolManager was already initialized";
-    return;
-  }
+  DCHECK(!g_media_transfer_protocol_manager);
+
   g_media_transfer_protocol_manager =
       new MediaTransferProtocolManagerImpl(loop_proxy);
   VLOG(1) << "MediaTransferProtocolManager initialized";
-}
 
-// static
-void MediaTransferProtocolManager::Shutdown() {
-  if (!g_media_transfer_protocol_manager) {
-    LOG(WARNING) << "MediaTransferProtocolManager::Shutdown() called with "
-                 << "NULL manager";
-    return;
-  }
-  delete g_media_transfer_protocol_manager;
-  g_media_transfer_protocol_manager = NULL;
-  VLOG(1) << "MediaTransferProtocolManager Shutdown completed";
-}
-
-// static
-MediaTransferProtocolManager* MediaTransferProtocolManager::GetInstance() {
   return g_media_transfer_protocol_manager;
 }
 
 }  // namespace device