[Media Galleries] Lazily initialize the storage monitor.

chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc

Index: chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc
diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc
index 96f64c4d7489ec88218e0f9c01010ae7e43add9a..ae40498c2173db8db43676aed081d955c8f8b1d1 100644
--- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc
+++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc
@@ -5,6 +5,7 @@
 // MediaGalleriesPrivate eject API browser tests.
 
 #include "base/files/file_path.h"
+#include "base/run_loop.h"

[vandebo (ex-Chrome), 2013/05/31 18:05:03]

not needed?

[Greg Billock, 2013/06/01 01:48:46]

removed

On 2013/05/31 18:05:03, vandebo wrote:

 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ -81,6 +82,7 @@ class MediaGalleriesPrivateEjectApiTest : public ExtensionApiTest {
   }
 
   void Attach() {
+    DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized());
     chrome::StorageInfo info(device_id_, ASCIIToUTF16(kDeviceName), kDevicePath,
                              string16(), string16(), string16(), 0);
     chrome::StorageMonitor::GetInstance()->receiver()->ProcessAttach(info);
@@ -88,6 +90,7 @@ class MediaGalleriesPrivateEjectApiTest : public ExtensionApiTest {
   }
 
   void Detach() {
+    DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized());
     chrome::StorageMonitor::GetInstance()->receiver()->ProcessDetach(
         device_id_);
     content::RunAllPendingInMessageLoop();
@@ -113,6 +116,8 @@ class MediaGalleriesPrivateEjectApiTest : public ExtensionApiTest {
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateEjectApiTest, EjectTest) {
   scoped_ptr<chrome::test::TestStorageMonitor> monitor(
       chrome::test::TestStorageMonitor::CreateForBrowserTests());
+  monitor->Init();
+  monitor->MarkInitialized();
 
   content::RenderViewHost* host = GetHost();
   ExecuteCmdAndCheckReply(host, kAddAttachListenerCmd, kAddAttachListenerOk);
@@ -134,6 +139,8 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateEjectApiTest, EjectTest) {
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateEjectApiTest, EjectBadDeviceTest) {
   scoped_ptr<chrome::test::TestStorageMonitor> monitor(
       chrome::test::TestStorageMonitor::CreateForBrowserTests());
+  monitor->Init();
+  monitor->MarkInitialized();
 
   ExecuteCmdAndCheckReply(GetHost(), kEjectFailTestCmd, kEjectFailListenerOk);