[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"
@@ skipping 44 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(thread_checker_.CalledOnValidThread());

[Lei Zhang, 2013/06/03 20:17:13]

Isn't this always the UI thread?

[Greg Billock, 2013/06/03 22:33:02]

Not in tests.

   if (initialized_) {
     if (!callback.is_null())
       callback.Run();
     return;
   }
 
   if (!callback.is_null()) {
     on_initialize_callbacks_.push_back(callback);
   }
 
+  if (initializing_)
+    return;
+
+  initializing_ = true;
   Init();
 }
 
 bool StorageMonitor::IsInitialized() {
   return initialized_;
 }
 
 void StorageMonitor::AddObserver(RemovableStorageObserver* obs) {
   observer_list_->AddObserver(obs);
 }
@@ skipping 16 matching lines @@
 void StorageMonitor::EjectDevice(
     const std::string& device_id,
     base::Callback<void(EjectStatus)> callback) {
   // Platform-specific implementations will override this method to
   // 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;
@@ skipping 45 matching lines @@
     info = it->second;
     storage_map_.erase(it);
   }
 
   DVLOG(1) << "RemovableStorageDetached for id " << id;
   observer_list_->Notify(
       &RemovableStorageObserver::OnRemovableStorageDetached, info);
 }
 
 }  // namespace chrome