Media Galleries API: Fix MediaGalleriesPreferences finders race.

chrome/browser/ui/webui/options/media_galleries_handler.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/ui/webui/options/media_galleries_handler.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 29 matching lines @@
     { "manageGalleriesButton", IDS_MEDIA_GALLERY_MANAGE_BUTTON },
     { "addNewGalleryButton", IDS_MEDIA_GALLERY_ADD_NEW_BUTTON },
   };
 
   RegisterStrings(values, resources, arraysize(resources));
   RegisterTitle(values, "manageMediaGalleries",
                 IDS_MEDIA_GALLERY_MANAGE_TITLE);
 }
 
 void MediaGalleriesHandler::InitializePage() {
-  StorageMonitor::GetInstance()->EnsureInitialized(
-      base::Bind(&MediaGalleriesHandler::InitializeOnStorageMonitorInit,
-                 weak_ptr_factory_.GetWeakPtr()));
+  Profile* profile = Profile::FromWebUI(web_ui());
+  MediaGalleriesPreferences* preferences =
+      g_browser_process->media_file_system_registry()->GetPreferences(profile);
+  preferences->EnsureInitialized(base::Bind(
+      &MediaGalleriesHandler::InitializeOnMediaGalleriesPreferencesInit,
+      weak_ptr_factory_.GetWeakPtr()));
 }
 
-void MediaGalleriesHandler::InitializeOnStorageMonitorInit() {
+void MediaGalleriesHandler::InitializeOnMediaGalleriesPreferencesInit() {
   Profile* profile = Profile::FromWebUI(web_ui());
   if (!MediaGalleriesPreferences::APIHasBeenUsed(profile))
     return;
 
   if (pref_change_registrar_.IsEmpty()) {
     pref_change_registrar_.Init(profile->GetPrefs());
     pref_change_registrar_.Add(
         prefs::kMediaGalleriesRememberedGalleries,
         base::Bind(&MediaGalleriesHandler::OnGalleriesChanged,
                    base::Unretained(this)));
   }
 
   OnGalleriesChanged();
 }
 
 void MediaGalleriesHandler::RegisterMessages() {
   StorageMonitor::GetInstance()->EnsureInitialized(
       base::Bind(&MediaGalleriesHandler::RegisterOnStorageMonitorInit,

[Lei Zhang, 2013/09/21 00:12:35]

Also change this to just wait for pref initialization?

[tommycli, 2013/09/23 20:39:12]

Done.

                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void MediaGalleriesHandler::RegisterOnStorageMonitorInit() {
   web_ui()->RegisterMessageCallback(
       "addNewGallery",
       base::Bind(&MediaGalleriesHandler::HandleAddNewGallery,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "forgetGallery",
       base::Bind(&MediaGalleriesHandler::HandleForgetGallery,
                  base::Unretained(this)));
 }
 
 void MediaGalleriesHandler::OnGalleriesChanged() {
   DCHECK(StorageMonitor::GetInstance()->IsInitialized());
   Profile* profile = Profile::FromWebUI(web_ui());
   MediaGalleriesPreferences* preferences =
       g_browser_process->media_file_system_registry()->GetPreferences(profile);
+  DCHECK(preferences->IsInitialized());
 
   ListValue list;
   const MediaGalleriesPrefInfoMap& galleries = preferences->known_galleries();
   for (MediaGalleriesPrefInfoMap::const_iterator iter = galleries.begin();
        iter != galleries.end(); ++iter) {
     const MediaGalleryPrefInfo& gallery = iter->second;
     if (gallery.type == MediaGalleryPrefInfo::kBlackListed)
       continue;
 
     DictionaryValue* dict = new DictionaryValue();
@@ skipping 28 matching lines @@
   if (!args->GetString(0, &string_id) ||
       !base::StringToUint64(string_id, &id)) {
     NOTREACHED();
     return;
   }
 
   DCHECK(StorageMonitor::GetInstance()->IsInitialized());
   MediaGalleriesPreferences* preferences =
       g_browser_process->media_file_system_registry()->GetPreferences(
           Profile::FromWebUI(web_ui()));
+  DCHECK(preferences->IsInitialized());
   preferences->ForgetGalleryById(id);
 }
 
 void MediaGalleriesHandler::FileSelected(const base::FilePath& path,
                                          int index,
                                          void* params) {
   DCHECK(StorageMonitor::GetInstance()->IsInitialized());
   MediaGalleriesPreferences* preferences =
       g_browser_process->media_file_system_registry()->GetPreferences(
           Profile::FromWebUI(web_ui()));
+  DCHECK(preferences->IsInitialized());
   preferences->AddGalleryByPath(path);
 }
 
 }  // namespace options