[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/extensions/api/system_info_storage/system_info_storage_eject_apitest.cc

Index: chrome/browser/extensions/api/system_info_storage/system_info_storage_eject_apitest.cc
diff --git a/chrome/browser/extensions/api/system_info_storage/system_info_storage_eject_apitest.cc b/chrome/browser/extensions/api/system_info_storage/system_info_storage_eject_apitest.cc
index ba519930262ac9de1f87231e33002944ad104783..7f66a004a9c4aa71b5e92f737879590f653f83d5 100644
--- a/chrome/browser/extensions/api/system_info_storage/system_info_storage_eject_apitest.cc
+++ b/chrome/browser/extensions/api/system_info_storage/system_info_storage_eject_apitest.cc
@@ -35,7 +35,7 @@ struct TestStorageUnitInfo kRemovableStorageData[] = {
 
 class SystemInfoStorageEjectApiTest : public ExtensionApiTest {
  public:
-  SystemInfoStorageEjectApiTest() {}
+  SystemInfoStorageEjectApiTest() : monitor_(NULL) {}
   virtual ~SystemInfoStorageEjectApiTest() {}
 
  protected:
@@ -45,6 +45,11 @@ class SystemInfoStorageEjectApiTest : public ExtensionApiTest {
     command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
   }
 
+  virtual void SetUpOnMainThread() OVERRIDE {
+    monitor_ = chrome::test::TestStorageMonitor::CreateForBrowserTests();
+    ExtensionApiTest::SetUpOnMainThread();
+  }
+
   content::RenderViewHost* GetHost() {
     const extensions::Extension* extension =
         LoadExtension(test_data_dir_.AppendASCII("systeminfo/storage_eject"));
@@ -75,17 +80,15 @@ class SystemInfoStorageEjectApiTest : public ExtensionApiTest {
     content::RunAllPendingInMessageLoop();
   }
 
+ protected:
+  chrome::test::TestStorageMonitor* monitor_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(SystemInfoStorageEjectApiTest);
 };
 
 
 IN_PROC_BROWSER_TEST_F(SystemInfoStorageEjectApiTest, EjectTest) {
-  scoped_ptr<chrome::test::TestStorageMonitor> monitor(
-      chrome::test::TestStorageMonitor::CreateForBrowserTests());
-  monitor->Init();
-  monitor->MarkInitialized();
-
   TestStorageInfoProvider* provider =
       new TestStorageInfoProvider(kRemovableStorageData,
                                   arraysize(kRemovableStorageData));
@@ -104,17 +107,12 @@ IN_PROC_BROWSER_TEST_F(SystemInfoStorageEjectApiTest, EjectTest) {
   EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied());
 
   ExecuteCmdAndCheckReply(host, "ejectTest()", "eject_ok");
-  EXPECT_EQ(kRemovableStorageData[0].device_id, monitor->ejected_device());
+  EXPECT_EQ(kRemovableStorageData[0].device_id, monitor_->ejected_device());
 
   Detach();
 }
 
 IN_PROC_BROWSER_TEST_F(SystemInfoStorageEjectApiTest, EjectBadDeviceTest) {
-  scoped_ptr<chrome::test::TestStorageMonitor> monitor(
-      chrome::test::TestStorageMonitor::CreateForBrowserTests());
-  monitor->Init();
-  monitor->MarkInitialized();
-
   TestStorageInfoProvider* provider =
       new TestStorageInfoProvider(kRemovableStorageData,
                                   arraysize(kRemovableStorageData));
@@ -122,5 +120,5 @@ IN_PROC_BROWSER_TEST_F(SystemInfoStorageEjectApiTest, EjectBadDeviceTest) {
 
   ExecuteCmdAndCheckReply(GetHost(), "ejectFailTest()", "eject_no_such_device");
 
-  EXPECT_EQ("", monitor->ejected_device());
+  EXPECT_EQ("", monitor_->ejected_device());
 }