[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

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

 // Copyright (c) 2012 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.
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ skipping 90 matching lines @@
     content::RunAllPendingInMessageLoop();
   }
 
  private:
   std::string device_id_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPrivateApiTest);
 };
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateApiTest, DeviceAttachDetachEvents) {
-  scoped_ptr<chrome::test::TestStorageMonitor> monitor(
-      chrome::test::TestStorageMonitor::CreateForBrowserTests());
-  monitor->Init();
-  monitor->MarkInitialized();
-
   // Setup.
+  chrome::test::TestStorageMonitor::SyncInitialize();

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

Why is the test storage monitor setup different in eject_apitest and
private_apitest ?

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

The eject one needs the mock object (we check for the eject call in the test).
This test can use the live object, but it needs to make sure the object is
initialized for the various force-fed registration calls it does.

   const extensions::Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII(kTestExtensionPath));
   ASSERT_TRUE(extension);
 
   content::RenderViewHost* host =
       extensions::ExtensionSystem::Get(browser()->profile())->
           process_manager()->GetBackgroundHostForExtension(extension->id())->
               render_view_host();
   ASSERT_TRUE(host);
 
@@ skipping 53 matching lines @@
   Attach();
   EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied());
   Detach();
   EXPECT_TRUE(detach_finished_listener.WaitUntilSatisfied());
 
   Attach();
   EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied());
   Detach();
   EXPECT_TRUE(detach_finished_listener.WaitUntilSatisfied());
 }