Media Galleries API: Fix MediaGalleriesPreferences finders race.

chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc

 // Copyright 2013 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 <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 65 matching lines @@
   TestVolumeMountWatcherWin* mount_watcher = new TestVolumeMountWatcherWin;
   portable_device_watcher->set_use_dummy_mtp_storage_info(true);
   scoped_ptr<TestStorageMonitorWin> monitor(
       new TestStorageMonitorWin(mount_watcher, portable_device_watcher));
   TestingBrowserProcess* browser_process = TestingBrowserProcess::GetGlobal();
   DCHECK(browser_process);
   monitor_ = monitor.get();
   browser_process->SetStorageMonitor(monitor.Pass());
 
   base::RunLoop runloop;
-  monitor_->EnsureInitialized(runloop.QuitClosure());
+  browser_process->media_file_system_registry()->GetPreferences(profile())->
+      EnsureInitialized(runloop.QuitClosure());
   runloop.Run();
 
   extensions::TestExtensionSystem* extension_system(
       static_cast<extensions::TestExtensionSystem*>(
           extensions::ExtensionSystem::Get(profile())));
   extension_system->CreateExtensionService(
       CommandLine::ForCurrentProcess(), base::FilePath(), false);
 
   std::vector<std::string> all_permissions;
   all_permissions.push_back("allAutoDetected");
@@ skipping 67 matching lines @@
   for (FSInfoMap::iterator i = results.begin(); i != results.end(); ++i) {
     MediaFileSystemInfo info = i->second;
     if (info.path == location) {
       CheckGalleryInfo(info, location.LossyDisplayName(), location, true, true);
       checked = true;
       break;
     }
   }
   EXPECT_TRUE(checked);
 }