Merge 185431 - Ignore the disabled state of component-updated PPAPI Flash for once.

chrome/browser/plugins/plugin_prefs_factory.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/plugins/plugin_prefs_factory.h"
 
 #include "base/path_service.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 44 matching lines @@
                               PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF,
                              false,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kPluginsEnabledNaCl,
                              false,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kPluginsMigratedToPepperFlash,
                              false,
                              PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterBooleanPref(
+      prefs::kPluginsRemovedOldComponentPepperFlashSettings,
+      false,
+      PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(prefs::kPluginsPluginsList,
                           PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(prefs::kPluginsDisabledPlugins,
                           PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions,
                           PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(prefs::kPluginsEnabledPlugins,
                           PrefService::UNSYNCABLE_PREF);
 }
 
 bool PluginPrefsFactory::ServiceRedirectedInIncognito() const {
   return true;
 }
 
 bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }
 
 bool PluginPrefsFactory::ServiceIsCreatedWithProfile() const {
   return true;
 }