Add test storage monitor for MediaGalleries Private API browser test.

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"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
+#include "chrome/browser/storage_monitor/test_storage_monitor.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
@@ skipping 55 matching lines @@
     host->ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16(js_command));
     EXPECT_TRUE(listener.WaitUntilSatisfied());
   }
 
   void AttachDetach() {
     Attach();
     Detach();
   }
 
   void Attach() {
+    DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized());
     chrome::StorageInfo info(device_id_, ASCIIToUTF16(kDeviceName), kDevicePath,
                              string16(), string16(), string16(), 0);
     chrome::StorageMonitor::GetInstance()->receiver()->ProcessAttach(info);
-    WaitForDeviceEvents();
+    content::RunAllPendingInMessageLoop();
   }
 
   void Detach() {
+    DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized());
     chrome::StorageMonitor::GetInstance()->receiver()->ProcessDetach(
         device_id_);
-    WaitForDeviceEvents();
+    content::RunAllPendingInMessageLoop();
   }
 
  private:
-  void WaitForDeviceEvents() {
-    content::RunAllPendingInMessageLoop();
-  }
-
   std::string device_id_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPrivateApiTest);
 };
 
-// TODO(jschuh): Flaky on Win64 & Linux Aura build. crbug.com/247336
-#if (defined(OS_WIN) && defined(ARCH_CPU_X86_64)) || \
-    (defined(OS_LINUX) && defined(USE_AURA))
-#define MAYBE_DeviceAttachDetachEvents DISABLED_DeviceAttachDetachEvents
-#else
-#define MAYBE_DeviceAttachDetachEvents DeviceAttachDetachEvents
-#endif
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateApiTest,
-                       MAYBE_DeviceAttachDetachEvents) {
+IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateApiTest, DeviceAttachDetachEvents) {
+  scoped_ptr<chrome::test::TestStorageMonitor> monitor(
+      chrome::test::TestStorageMonitor::CreateForBrowserTests());
+  monitor->Init();
+  monitor->MarkInitialized();
+
   // Setup.
   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 54 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());
 }