Patch to restore 6267009 (move about:flags from profile to local state)

chrome/browser/dom_ui/flags_ui.cc

 // Copyright (c) 2010 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/dom_ui/flags_ui.h"
 
 #include <string>
 
 #include "base/singleton.h"
 #include "base/values.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ skipping 101 matching lines @@
   dom_ui_->RegisterMessageCallback("enableFlagsExperiment",
       NewCallback(this, &FlagsDOMHandler::HandleEnableFlagsExperimentMessage));
   dom_ui_->RegisterMessageCallback("restartBrowser",
       NewCallback(this, &FlagsDOMHandler::HandleRestartBrowser));
 }
 
 void FlagsDOMHandler::HandleRequestFlagsExperiments(const ListValue* args) {
   DictionaryValue results;
   results.Set("flagsExperiments",
               about_flags::GetFlagsExperimentsData(
-                  dom_ui_->GetProfile()->GetPrefs()));
+                  g_browser_process->local_state()));
   results.SetBoolean("needsRestart",
                      about_flags::IsRestartNeededToCommitChanges());
   dom_ui_->CallJavascriptFunction(L"returnFlagsExperiments", results);
 }
 
 void FlagsDOMHandler::HandleEnableFlagsExperimentMessage(
     const ListValue* args) {
   DCHECK_EQ(2u, args->GetSize());
   if (args->GetSize() != 2)
     return;
 
   std::string experiment_internal_name;
   std::string enable_str;
   if (!args->GetString(0, &experiment_internal_name) ||
       !args->GetString(1, &enable_str))
     return;
 
   about_flags::SetExperimentEnabled(
-      dom_ui_->GetProfile()->GetPrefs(),
+      g_browser_process->local_state(),
       experiment_internal_name,
       enable_str == "true");
 }
 
 void FlagsDOMHandler::HandleRestartBrowser(const ListValue* args) {
   // Set the flag to restore state after the restart.
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, true);
   BrowserList::CloseAllBrowsersAndExit();
 }
@@ skipping 19 matching lines @@
                         make_scoped_refptr(html_source)));
 }
 
 // static
 RefCountedMemory* FlagsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_FLAGS);
 }
 
 // static
-void FlagsUI::RegisterUserPrefs(PrefService* prefs) {
+void FlagsUI::RegisterPrefs(PrefService* prefs) {
   prefs->RegisterListPref(prefs::kEnabledLabsExperiments);
 }