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

chrome/browser/media_gallery/media_file_system_registry_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.
 
 // MediaFileSystemRegistry unit tests.
 
 #include <algorithm>
 #include <set>
 
 #include "base/command_line.h"
@@ skipping 11 matching lines @@
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/media_gallery/media_file_system_context.h"
 #include "chrome/browser/media_gallery/media_file_system_registry.h"
 #include "chrome/browser/media_gallery/media_galleries_preferences_factory.h"
 #include "chrome/browser/media_gallery/media_galleries_test_util.h"
 #include "chrome/browser/system_monitor/media_storage_util.h"
 #include "chrome/browser/system_monitor/removable_device_constants.h"
+#include "chrome/browser/system_monitor/removable_storage_notifications.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/render_process_host_factory.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_thread.h"
@@ skipping 140 matching lines @@
   EXPECT_TRUE(dict->HasKey(MediaFileSystemRegistry::kGalleryIdKey)) << name;
 
   // Check name.
   EXPECT_TRUE(dict->HasKey(MediaFileSystemRegistry::kNameKey)) << name;
   std::string gallery_name;
   EXPECT_TRUE(dict->GetString(MediaFileSystemRegistry::kNameKey,
                               &gallery_name)) << name;
   EXPECT_FALSE(gallery_name.empty()) << name;
 }
 
+}  // namespace
+
 class TestMediaStorageUtil : public MediaStorageUtil {
  public:
   static void SetTestingMode();
 
   static bool GetDeviceInfoFromPathTestFunction(const FilePath& path,
                                                 std::string* device_id,
                                                 string16* device_name,
                                                 FilePath* relative_path);
 };
 
@@ skipping 103 matching lines @@
 
   void InitForGalleryNamesTest(std::set<std::string>* gallery_names);
 
   void CheckNewGallery(ProfileState* profile_state,
                        const std::set<std::string>& gallery_names,
                        bool removable);
 
   std::vector<MediaFileSystemInfo> GetAutoAddedGalleries(
       ProfileState* profile_state);
 
+  void ProcessAttach(const std::string& id,
+                     const string16& name,
+                     const FilePath::StringType& location) {
+    RemovableStorageNotifications::GetInstance()->ProcessAttach(

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

Is RemovableStorageNotifications instance always created for testing? Do we need
to add if statement to check it?

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

Good question. This test isn't fully converted yet -- I'll fix this up.

On 2013/01/17 09:38:03, Hongbo Min wrote:

+        id, name, location);
+  }
+
+  void ProcessDetach(const std::string& id) {
+    RemovableStorageNotifications::GetInstance()->ProcessDetach(id);
+  }
+
  protected:
   void SetUp();
   void TearDown();
 
  private:
   // This makes sure that at least one default gallery exists on the file
   // system.
   EnsureMediaDirectoriesExists media_directories_;
 
   // Some test gallery directories.
@@ skipping 255 matching lines @@
   return device_id;
 }
 
 std::string MediaFileSystemRegistryTest::AttachDevice(
     MediaStorageUtil::Type type,
     const std::string& unique_id,
     const FilePath& location) {
   std::string device_id = MediaStorageUtil::MakeDeviceId(type, unique_id);
   DCHECK(MediaStorageUtil::IsRemovableDevice(device_id));
   string16 name = location.LossyDisplayName();
-  base::SystemMonitor::Get()->ProcessRemovableStorageAttached(device_id, name,
-                                                              location.value());
+  ProcessAttach(device_id, name, location.value());
   bool user_added = (type == MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM);
   for (size_t i = 0; i < profile_states_.size(); ++i) {
     profile_states_[i]->GetMediaGalleriesPrefs()->AddGallery(
         device_id, name, FilePath(), user_added);
   }
   MessageLoop::current()->RunUntilIdle();
   return device_id;
 }
 
 void MediaFileSystemRegistryTest::DetachDevice(const std::string& device_id) {
   DCHECK(MediaStorageUtil::IsRemovableDevice(device_id));
-  base::SystemMonitor::Get()->ProcessRemovableStorageDetached(device_id);
+  ProcessDetach(device_id);
   MessageLoop::current()->RunUntilIdle();
 }
 
 void MediaFileSystemRegistryTest::SetGalleryPermission(
     ProfileState* profile_state, extensions::Extension* extension,
     const std::string& device_id, bool has_access) {
   MediaGalleriesPreferences* preferences =
       profile_state->GetMediaGalleriesPrefs();
   MediaGalleryPrefIdSet pref_id =
       preferences->LookUpGalleriesByDeviceId(device_id);
@@ skipping 225 matching lines @@
                                          empty_dir());
   // Add permission for new non-default gallery.
   ProfileState* profile_state = GetProfileState(0U);
   SetGalleryPermission(profile_state,
                        profile_state->all_permission_extension(),
                        device_id,
                        true /*has access*/);
   CheckNewGallery(profile_state, gallery_names, false /*not removable*/);
 }
 
-}  // namespace
-
 }  // namespace chrome