[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) {}

[sky, 2013/07/15 17:45:37]

nit: when you wrap, each param on its own line.

[Greg Billock, 2013/07/15 20:00:18]

Done.

   virtual ~MediaGalleriesPrivateEjectApiTest() {}
 
  protected:
   // ExtensionApiTest overrides.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(switches::kWhitelistedExtensionID,
                                     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));
     return extensions::ExtensionSystem::Get(browser()->profile())->
         process_manager()->GetBackgroundHostForExtension(extension->id())->
             render_view_host();
   }
 
   void ExecuteCmdAndCheckReply(content::RenderViewHost* host,
                                const std::string& js_command,
@@ skipping 19 matching lines @@
   }
 
   static std::string GetDeviceId() {
     return chrome::StorageInfo::MakeDeviceId(
         chrome::StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM, kDeviceId);
   }
 
  protected:
   const std::string device_id_;
 
+  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();
-
   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();
-
   ExecuteCmdAndCheckReply(GetHost(), kEjectFailTestCmd, kEjectFailListenerOk);
 
-  EXPECT_EQ("", monitor->ejected_device());
+  EXPECT_EQ("", monitor_->ejected_device());
 }