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

chrome/browser/system_monitor/media_storage_util_unittest.cc

Index: chrome/browser/system_monitor/media_storage_util_unittest.cc
diff --git a/chrome/browser/system_monitor/media_storage_util_unittest.cc b/chrome/browser/system_monitor/media_storage_util_unittest.cc
index 103730c57ca68d42c6a81f3b59393e4a2053be4c..728f7bd2d62c2dc1f688c3a801ce31f3eedab423 100644
--- a/chrome/browser/system_monitor/media_storage_util_unittest.cc
+++ b/chrome/browser/system_monitor/media_storage_util_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/system_monitor/system_monitor.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/system_monitor/media_storage_util.h"
+#include "chrome/browser/system_monitor/removable_storage_notifications.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -24,7 +25,15 @@ const char kImageCaptureDeviceId[] = "ic:xyz";
 
 }  // namespace
 
-typedef testing::Test MediaStorageUtilTest;
+class MediaStorageUtilTest : public testing::Test {
+ public:
+  void ProcessAttach(const std::string& id,
+                     const string16& name,
+                     const FilePath::StringType& location) {
+    RemovableStorageNotifications::GetInstance()->ProcessAttach(
+        id, name, location);
+  }
+};
 
 // Test to verify |MediaStorageUtil::MakeDeviceId| functionality using a sample
 // mtp device unique id.
@@ -84,9 +93,8 @@ TEST_F(MediaStorageUtilTest, DetectDeviceFiltered) {
   event.Wait();
   EXPECT_FALSE(devices.find(kImageCaptureDeviceId) != devices.end());
 
-  base::SystemMonitor::Get()->ProcessRemovableStorageAttached(
-      kImageCaptureDeviceId, ASCIIToUTF16("name"),
-      FILE_PATH_LITERAL("/location"));
+  ProcessAttach(kImageCaptureDeviceId, ASCIIToUTF16("name"),
+                FILE_PATH_LITERAL("/location"));
   devices.insert(kImageCaptureDeviceId);
   event.Reset();
   MediaStorageUtil::FilterAttachedDevices(&devices,