[Media Galleries] Lazily initialize the storage monitor.

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/utf_string_conversions.h"
 #include "chrome/browser/storage_monitor/removable_storage_observer.h"
 #include "chrome/browser/storage_monitor/transient_device_ids.h"
+#include "content/public/browser/browser_thread.h"
 
 namespace chrome {
 
 static StorageMonitor* g_storage_monitor = NULL;
 
 StorageMonitor::Receiver::~Receiver() {
 }
 
 class StorageMonitor::ReceiverImpl : public StorageMonitor::Receiver {
  public:
@@ skipping 34 matching lines @@
   base::AutoLock lock(storage_lock_);
   for (RemovableStorageMap::const_iterator it = storage_map_.begin();
        it != storage_map_.end();
        ++it) {
     results.push_back(it->second);
   }
   return results;
 }
 
 void StorageMonitor::Initialize(base::Closure callback) {
+  //DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
   if (initialized_) {
     if (!callback.is_null())
       callback.Run();
     return;
   }
 
   if (!callback.is_null()) {
     on_initialize_callbacks_.push_back(callback);
   }
 
@@ skipping 48 matching lines @@
 // static
 void StorageMonitor::RemoveSingletonForTesting() {
   g_storage_monitor = NULL;
 }
 
 StorageMonitor::Receiver* StorageMonitor::receiver() const {
   return receiver_.get();
 }
 
 void StorageMonitor::MarkInitialized() {
+  //DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
   initialized_ = true;
   for (std::vector<base::Closure>::iterator iter =
            on_initialize_callbacks_.begin();
        iter != on_initialize_callbacks_.end(); ++iter) {
     iter->Run();
   }
   on_initialize_callbacks_.clear();
 }
 
 void StorageMonitor::ProcessAttach(const StorageInfo& info) {
@@ skipping 23 matching lines @@
     info = it->second;
     storage_map_.erase(it);
   }
 
   DVLOG(1) << "RemovableStorageDetached for id " << id;
   observer_list_->Notify(
       &RemovableStorageObserver::OnRemovableStorageDetached, info);
 }
 
 }  // namespace chrome