Media Galleries API: Fix MediaGalleriesPreferences finders race.

chrome/browser/media_galleries/media_galleries_dialog_controller.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 "chrome/browser/media_galleries/media_galleries_dialog_controller.h"
 
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 32 matching lines @@
 
 }  // namespace
 
 MediaGalleriesDialogController::MediaGalleriesDialogController(
     content::WebContents* web_contents,
     const Extension& extension,
     const base::Closure& on_finish)
       : web_contents_(web_contents),
         extension_(&extension),
         on_finish_(on_finish) {
+  preferences_ =
+      g_browser_process->media_file_system_registry()->GetPreferences(
+          Profile::FromBrowserContext(web_contents_->GetBrowserContext()));
   // Passing unretained pointer is safe, since the dialog controller
   // is self-deleting, and so won't be deleted until it can be shown
   // and then closed.
-  StorageMonitor::GetInstance()->EnsureInitialized(base::Bind(
-      &MediaGalleriesDialogController::OnStorageMonitorInitialized,
-      base::Unretained(this)));
+  preferences_->EnsureInitialized(
+      base::Bind(&MediaGalleriesDialogController::OnPreferencesInitialized,
+                 base::Unretained(this)));
 }
 
-void MediaGalleriesDialogController::OnStorageMonitorInitialized() {
-  MediaFileSystemRegistry* registry =
-      g_browser_process->media_file_system_registry();
-  preferences_ = registry->GetPreferences(
-      Profile::FromBrowserContext(web_contents_->GetBrowserContext()));
+void MediaGalleriesDialogController::OnPreferencesInitialized() {
   InitializePermissions();
 
   dialog_.reset(MediaGalleriesDialog::Create(this));
 
   StorageMonitor::GetInstance()->AddObserver(this);
 
   preferences_->AddGalleryChangeObserver(this);
 }
 
 MediaGalleriesDialogController::MediaGalleriesDialogController(
@@ skipping 360 matching lines @@
   for (GalleryPermissionsVector::iterator iter = new_galleries_.begin();
        iter != new_galleries_.end(); ++iter) {
     if (iter->pref_info.device_id == device_id)
       dialog_->UpdateGallery(iter->pref_info, iter->allowed);
   }
 }
 
 // MediaGalleries dialog -------------------------------------------------------
 
 MediaGalleriesDialog::~MediaGalleriesDialog() {}