[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

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 32055eba33d299bbb283dae55edf0fc26c654136..bc8e71dc9906f744a8d4451f83c40a704f3a4cc8 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
@@ -53,7 +53,8 @@ base::FilePath::CharType kDevicePath[] = FILE_PATH_LITERAL("/qux");
 
 class MediaGalleriesPrivateEjectApiTest : public ExtensionApiTest {
  public:
-  MediaGalleriesPrivateEjectApiTest() : device_id_(GetDeviceId()) {}
+  MediaGalleriesPrivateEjectApiTest()
+      : device_id_(GetDeviceId()), monitor_(NULL) {}
   virtual ~MediaGalleriesPrivateEjectApiTest() {}
 
  protected:
@@ -64,6 +65,11 @@ class MediaGalleriesPrivateEjectApiTest : public ExtensionApiTest {
                                     kTestExtensionId);
   }
 
+  virtual void SetUpOnMainThread() OVERRIDE {
+    monitor_ = chrome::test::TestStorageMonitor::CreateForBrowserTests();
+    ExtensionApiTest::SetUpOnMainThread();
+  }
+
   content::RenderViewHost* GetHost() {
     const extensions::Extension* extension =
         LoadExtension(test_data_dir_.AppendASCII(kTestExtensionPath));
@@ -103,6 +109,9 @@ class MediaGalleriesPrivateEjectApiTest : public ExtensionApiTest {
  protected:
   const std::string device_id_;
 
+  // Pointer to the storage monitor owned by the browser process.

[vandebo (ex-Chrome), 2013/07/09 21:14:11]

nit: "Owned by BrowserProcessImpl."

[Greg Billock, 2013/07/09 21:29:06]

or the testing mock... I think this gets a bit too into the implementation of
the browser process.

[vandebo (ex-Chrome), 2013/07/10 16:57:45]

Then is a comment needed? "Pointer to the storage monitor..." just restates the
line of code.  The only interesting bit of the comment is that it is owned by
someone else and this being a test, I'm not sure it's actually that important to
point that out.

[Greg Billock, 2013/07/10 21:11:16]

ok, I'll kill these off.

+  chrome::test::TestStorageMonitor* monitor_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPrivateEjectApiTest);
 };
@@ -113,11 +122,6 @@ 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);
 
@@ -130,18 +134,13 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateEjectApiTest, EjectTest) {
   EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied());
 
   ExecuteCmdAndCheckReply(host, kEjectTestCmd, kEjectListenerOk);
-  EXPECT_EQ(device_id_, monitor->ejected_device());
+  EXPECT_EQ(device_id_, monitor_->ejected_device());
 
   Detach();
 }
 
 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);
 
-  EXPECT_EQ("", monitor->ejected_device());
+  EXPECT_EQ("", monitor_->ejected_device());
 }