[Media Galleries] Move RemovableStorageInfo notifications to chrome namespace (part 2)

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/stringprintf.h"
 #include "base/system_monitor/system_monitor.h"

[vandebo (ex-Chrome), 2013/01/11 22:06:50]

remove?

[Greg Billock, 2013/01/17 22:10:45]

Done.

 #include "base/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/system_monitor/media_storage_util.h"
+#include "chrome/browser/system_monitor/removable_storage_notifications.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() {
-    base::SystemMonitor::Get()->ProcessRemovableStorageAttached(
+    chrome::RemovableStorageNotifications::GetInstance()->ProcessAttach(
         device_id_, ASCIIToUTF16(kDeviceName), kDevicePath);
     WaitForDeviceEvents();
   }
 
   void Detach() {
-    base::SystemMonitor::Get()->ProcessRemovableStorageDetached(device_id_);
+    chrome::RemovableStorageNotifications::GetInstance()->ProcessDetach(
+        device_id_);
     WaitForDeviceEvents();
   }
 
  private:
   void WaitForDeviceEvents() {
     content::RunAllPendingInMessageLoop();
   }
 
   std::string device_id_;
 
@@ skipping 68 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());
 }