[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

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

 // Copyright (c) 2013 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.
 //
 // MediaGalleriesPrivate eject API browser tests.
 
 #include "base/files/file_path.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 35 matching lines @@
 
 }  // namespace
 
 
 ///////////////////////////////////////////////////////////////////////////////
 //                 MediaGalleriesPrivateEjectApiTest                         //
 ///////////////////////////////////////////////////////////////////////////////
 
 class MediaGalleriesPrivateEjectApiTest : public ExtensionApiTest {
  public:
-  MediaGalleriesPrivateEjectApiTest() : device_id_(GetDeviceId()) {}
+  MediaGalleriesPrivateEjectApiTest()
+      : device_id_(GetDeviceId()), monitor_(NULL) {}
   virtual ~MediaGalleriesPrivateEjectApiTest() {}
 
  protected:
   // ExtensionApiTest overrides.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(switches::kWhitelistedExtensionID,
                                     kTestExtensionId);
   }
 
@@ skipping 29 matching lines @@
   }
 
   static std::string GetDeviceId() {
     return chrome::StorageInfo::MakeDeviceId(
         chrome::StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM, kDeviceId);
   }
 
  protected:
   const std::string device_id_;
 
+  // Weak ptr to the storage monitor owned by the browser process.
+  chrome::test::TestStorageMonitor* monitor_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPrivateEjectApiTest);
 };
 
 
 ///////////////////////////////////////////////////////////////////////////////
 //                               TESTS                                       //
 ///////////////////////////////////////////////////////////////////////////////
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateEjectApiTest, EjectTest) {
-  scoped_ptr<chrome::test::TestStorageMonitor> monitor(
-      chrome::test::TestStorageMonitor::CreateForBrowserTests());
-  monitor->Init();
-  monitor->MarkInitialized();
-
+  monitor_ = chrome::test::TestStorageMonitor::CreateForBrowserTests();

[Lei Zhang, 2013/07/02 23:16:57]

Just override InProcesBrowserTest::SetUpOnMainThread() and do it there instead
of repeating it in every test case.

[Greg Billock, 2013/07/03 17:49:17]

That's what I initially did. There's some kind of blockage upstream, though, and
SetUpOnMainThread never gets called. The extension test fixture is blocking it
by making it non-virtual. I can see the IPBT method get called, but it doesn't
come through. I'm not sure whether that's a mistake or on purpose, but we have
just a couple tests that need it, so it's probably ok to just do it here.

[Lei Zhang, 2013/07/03 23:25:10]

I tried it and it seems to work for me. SetUpOnMainThread() gets called here.

[Greg Billock, 2013/07/08 18:50:07]

Yeah. I have no idea what I was doing wrong. Tried it again and it works fine.
I'd suspect myself of typing "SetupOnMainThread" or something, but I spent a
while trying to figure out what was up, including copy-pasting the method
signature directly from the base class in. Sigh. Anyway, now changed.

   content::RenderViewHost* host = GetHost();
   ExecuteCmdAndCheckReply(host, kAddAttachListenerCmd, kAddAttachListenerOk);
 
   // Attach / detach
   const std::string expect_attach_msg =
       base::StringPrintf("%s,%s", kAttachTestOk, kDeviceName);
   ExtensionTestMessageListener attach_finished_listener(expect_attach_msg,
                                                         false  /* no reply */);
   Attach();
   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();
-
+  monitor_ = chrome::test::TestStorageMonitor::CreateForBrowserTests();
   ExecuteCmdAndCheckReply(GetHost(), kEjectFailTestCmd, kEjectFailListenerOk);
 
-  EXPECT_EQ("", monitor->ejected_device());
+  EXPECT_EQ("", monitor_->ejected_device());
 }