Add a receiver interface to RemovableStorageNotifications.

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 342 matching lines @@
 
   void CheckNewGalleryInfo(ProfileState* profile_state,
                            const FSInfoMap& galleries_info,
                            const base::FilePath& location,
                            bool removable,
                            bool media_device);
 
   std::vector<MediaFileSystemInfo> GetAutoAddedGalleries(
       ProfileState* profile_state);
 
+  // TODO(gbillock): Rework these once windows-specific code is gone.
   void ProcessAttach(const std::string& id,
                      const string16& name,
                      const base::FilePath::StringType& location) {
-    RemovableStorageNotifications::GetInstance()->ProcessAttach(
+    RemovableStorageNotifications::GetInstance()->receiver()->ProcessAttach(
         id, name, location);
   }
 
   void ProcessDetach(const std::string& id) {
-    RemovableStorageNotifications::GetInstance()->ProcessDetach(id);
+    RemovableStorageNotifications::GetInstance()->receiver()->ProcessDetach(id);
   }
 
  protected:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
  private:
   // This makes sure that at least one default gallery exists on the file
   // system.
   EnsureMediaDirectoriesExists media_directories_;
 
   // Some test gallery directories.
   base::ScopedTempDir galleries_dir_;
   // An empty directory in |galleries_dir_|
   base::FilePath empty_dir_;
   // A directory in |galleries_dir_| with a DCIM directory in it.
   base::FilePath dcim_dir_;
 
   // MediaFileSystemRegistry owns this.
   TestMediaFileSystemContext* test_file_system_context_;
 
   // Needed for extension service & friends to work.
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
+// TODO(gbillock): Eliminate windows-specific code from this test.
 #if defined(OS_WIN)
   scoped_ptr<test::TestRemovableDeviceNotificationsWindowWin> window_;
 #else
   chrome::test::TestRemovableStorageNotifications notifications_;
 #endif
 
   MockProfileSharedRenderProcessHostFactory rph_factory_;
 
   ScopedVector<ProfileState> profile_states_;
 
@@ skipping 554 matching lines @@
   pref_info_with_relpath.device_id = device_id;
   EXPECT_EQ(dcim_dir().Append(pref_info_with_relpath.path).value(),
             pref_info_with_relpath.AbsolutePath().value());
 
   DetachDevice(device_id);
   EXPECT_TRUE(pref_info.AbsolutePath().empty());
   EXPECT_TRUE(pref_info_with_relpath.AbsolutePath().empty());
 }
 
 }  // namespace chrome