[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/storage_monitor.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 "chrome/browser/storage_monitor/storage_monitor.h"
 
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/storage_monitor/removable_storage_observer.h"
 #include "chrome/browser/storage_monitor/transient_device_ids.h"
 
 namespace chrome {
 
-static StorageMonitor* g_storage_monitor = NULL;
-
 StorageMonitor::Receiver::~Receiver() {
 }
 
 class StorageMonitor::ReceiverImpl : public StorageMonitor::Receiver {
  public:
   explicit ReceiverImpl(StorageMonitor* notifications)
       : notifications_(notifications) {}
 
   virtual ~ReceiverImpl() {}
 
@@ skipping 13 matching lines @@
 
 void StorageMonitor::ReceiverImpl::ProcessDetach(const std::string& id) {
   notifications_->ProcessDetach(id);
 }
 
 void StorageMonitor::ReceiverImpl::MarkInitialized() {
   notifications_->MarkInitialized();
 }
 
 StorageMonitor* StorageMonitor::GetInstance() {
-  return g_storage_monitor;
+  if (g_browser_process)
+    return g_browser_process->storage_monitor();
+
+  return NULL;
 }
 
 std::vector<StorageInfo> StorageMonitor::GetAllAvailableStorages() const {
   std::vector<StorageInfo> results;
 
   base::AutoLock lock(storage_lock_);
   for (StorageMap::const_iterator it = storage_map_.begin();
        it != storage_map_.end();
        ++it) {
     results.push_back(it->second);
@@ skipping 50 matching lines @@
   // perform actual device ejection.
   callback.Run(EJECT_FAILURE);
 }
 
 StorageMonitor::StorageMonitor()
     : observer_list_(new ObserverListThreadSafe<RemovableStorageObserver>()),
       initializing_(false),
       initialized_(false),
       transient_device_ids_(new TransientDeviceIds) {
   receiver_.reset(new ReceiverImpl(this));
-
-  DCHECK(!g_storage_monitor);
-  g_storage_monitor = this;
 }
 
 StorageMonitor::~StorageMonitor() {
-  g_storage_monitor = NULL;
-}
-
-// static
-void StorageMonitor::RemoveSingletonForTesting() {
-  g_storage_monitor = NULL;
 }
 
 StorageMonitor::Receiver* StorageMonitor::receiver() const {
   return receiver_.get();
 }
 
 void StorageMonitor::MarkInitialized() {
   initialized_ = true;
   for (std::vector<base::Closure>::iterator iter =
            on_initialize_callbacks_.begin();
@@ skipping 34 matching lines @@
   }
 
   DVLOG(1) << "StorageDetached for id " << id;
   if (StorageInfo::IsRemovableDevice(info.device_id())) {
     observer_list_->Notify(
         &RemovableStorageObserver::OnRemovableStorageDetached, info);
   }
 }
 
 }  // namespace chrome