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

chrome/browser/system_monitor/media_storage_util_unittest.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 <string>
 
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #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"
 
 namespace chrome {
 
 namespace {
 
 // Sample mtp device id and unique id.
 const char kMtpDeviceId[] = "mtp:VendorModelSerial:ABC:1233:1237912873";
 const char kUniqueId[] = "VendorModelSerial:ABC:1233:1237912873";
 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,

[Hongbo Min, 2013/01/17 09:38:03]

nits: incorrect indent.

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

Done.

+                                       const FilePath::StringType& location) {
+    RemovableStorageNotifications::GetInstance()->ProcessAttach(
+        id, name, location);
+  }
+};
 
 // Test to verify |MediaStorageUtil::MakeDeviceId| functionality using a sample
 // mtp device unique id.
 TEST_F(MediaStorageUtilTest, MakeMtpDeviceId) {
   std::string device_id =
       MediaStorageUtil::MakeDeviceId(MediaStorageUtil::MTP_OR_PTP, kUniqueId);
   ASSERT_EQ(kMtpDeviceId, device_id);
 }
 
 // Test to verify |MediaStorageUtil::CrackDeviceId| functionality using a sample
@@ skipping 39 matching lines @@
   MediaStorageUtil::DeviceIdSet devices;
   devices.insert(kImageCaptureDeviceId);
 
   base::WaitableEvent event(true, false);
   MediaStorageUtil::FilterAttachedDevices(&devices,
       base::Bind(&base::WaitableEvent::Signal, base::Unretained(&event)));
   loop.RunUntilIdle();
   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,
       base::Bind(&base::WaitableEvent::Signal, base::Unretained(&event)));
   loop.RunUntilIdle();
   event.Wait();
 
   EXPECT_TRUE(devices.find(kImageCaptureDeviceId) != devices.end());
 }
 
 }  // namespace chrome