Reinitialize LocalState's CommandLinePrefStore after about_flags updates the command line.

chrome/browser/prefs/pref_service.cc

Index: chrome/browser/prefs/pref_service.cc
===================================================================
--- chrome/browser/prefs/pref_service.cc	(revision 118120)
+++ chrome/browser/prefs/pref_service.cc	(working copy)
@@ -187,15 +187,15 @@
   return new PrefService(
       pref_notifier,
       pref_value_store_->CloneAndSpecialize(
-          NULL, // managed_platform_prefs
-          NULL, // managed_cloud_prefs
+          NULL,  // managed_platform_prefs
+          NULL,  // managed_cloud_prefs
           incognito_extension_prefs,
-          NULL, // command_line_prefs
+          NULL,  // command_line_prefs
           incognito_pref_store,
-          NULL, // recommended_platform_prefs
-          NULL, // recommended_cloud_prefs
+          NULL,  // recommended_platform_prefs
+          NULL,  // recommended_cloud_prefs
           default_store_.get(),
-          NULL, // pref_sync_associator
+          NULL,  // pref_sync_associator
           pref_notifier),
       incognito_pref_store,
       default_store_.get(),
@@ -212,13 +212,13 @@
   return new PrefService(
       pref_notifier,
       pref_value_store_->CloneAndSpecialize(
-          NULL, // managed_platform_prefs
-          NULL, // managed_cloud_prefs
-          NULL, // extension_prefs
-          NULL, // command_line_prefs
+          NULL,  // managed_platform_prefs
+          NULL,  // managed_cloud_prefs
+          NULL,  // extension_prefs
+          NULL,  // command_line_prefs
           per_tab_pref_store,
-          NULL, // recommended_platform_prefs
-          NULL, // recommended_cloud_prefs
+          NULL,  // recommended_platform_prefs
+          NULL,  // recommended_cloud_prefs
           default_store,
           NULL,
           pref_notifier),
@@ -284,14 +284,14 @@
 namespace {
 
 // If there's no g_browser_process or no local state, return true (for testing).
-bool IsLocalStatePrefService(PrefService* prefs){
+bool IsLocalStatePrefService(PrefService* prefs) {
   return (!g_browser_process ||
           !g_browser_process->local_state() ||
           g_browser_process->local_state() == prefs);
 }
 
 // If there's no g_browser_process, return true (for testing).
-bool IsProfilePrefService(PrefService* prefs){
+bool IsProfilePrefService(PrefService* prefs) {
   // TODO(zea): uncomment this once all preferences are only ever registered
   // with either the local_state's pref service or the profile's pref service.
   // return (!g_browser_process || g_browser_process->local_state() != prefs);
@@ -519,7 +519,7 @@
   DCHECK(IsProfilePrefService(this));
   RegisterPreference(
       path,
-      CreateLocaleDefaultValue(Value::TYPE_BOOLEAN,locale_default_message_id),
+      CreateLocaleDefaultValue(Value::TYPE_BOOLEAN, locale_default_message_id),
       sync_status);
 }
 
@@ -883,6 +883,11 @@
   return pref_sync_associator_.get();
 }
 
+void PrefService::UpdateCommandLinePrefStore(CommandLine* command_line) {

[battre, 2012/01/19 09:52:21]

Could you please add a DCHECK to verify that no IncognitoPrefService has been
created yet? Otherwise, it would not be aware of the new command line pref
store.

--> DCHECK(!pref_service_forked_);

[Lei Zhang, 2012/01/19 20:33:59]

Done.

+  pref_value_store_->UpdateCommandLinePrefStore(
+      new CommandLinePrefStore(command_line));
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // PrefService::Preference