Fix WeakPtrFactory member order in chrome/browser/plugins/.

BUG=303818

Review URL: https://codereview.chromium.org/61233003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235296 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 7 insertions, 6 deletions

diff --git a/chrome/browser/plugins/plugin_observer.h b/chrome/browser/plugins/plugin_observer.h
index 9e77213..3bddc94 100644
--- a/chrome/browser/plugins/plugin_observer.h
+++ b/chrome/browser/plugins/plugin_observer.h
@@ -65,13 +65,13 @@ class PluginObserver : public content::WebContentsObserver,
   void OnCouldNotLoadPlugin(const base::FilePath& plugin_path);
   void OnNPAPINotSupported(const std::string& identifier);
 
-  base::WeakPtrFactory<PluginObserver> weak_ptr_factory_;
-
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   // Stores all PluginPlaceholderHosts, keyed by their routing ID.
   std::map<int, PluginPlaceholderHost*> plugin_placeholders_;
 #endif
 
+  base::WeakPtrFactory<PluginObserver> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(PluginObserver);
 };
 
diff --git a/chrome/browser/plugins/plugin_status_pref_setter.cc b/chrome/browser/plugins/plugin_status_pref_setter.cc
index f2b4e7f..990084f 100644
--- a/chrome/browser/plugins/plugin_status_pref_setter.cc
+++ b/chrome/browser/plugins/plugin_status_pref_setter.cc
@@ -63,9 +63,9 @@ void PluginStatusPrefSetter::GotPlugins(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Set the values on the PrefService instead of through the PrefMembers to
   // notify observers if they changed.
-  profile_->GetPrefs()
-      ->SetBoolean(clear_plugin_lso_data_enabled_.GetPrefName().c_str(),
-                   PluginDataRemoverHelper::IsSupported(plugin_prefs.get()));
+  profile_->GetPrefs()->SetBoolean(
+      clear_plugin_lso_data_enabled_.GetPrefName().c_str(),
+      PluginDataRemoverHelper::IsSupported(plugin_prefs.get()));
   profile_->GetPrefs()->SetBoolean(
       pepper_flash_settings_enabled_.GetPrefName().c_str(),
       PepperFlashSettingsManager::IsPepperFlashInUse(plugin_prefs.get(), NULL));
diff --git a/chrome/browser/plugins/plugin_status_pref_setter.h b/chrome/browser/plugins/plugin_status_pref_setter.h
index e77c94a..2899cd2 100644
--- a/chrome/browser/plugins/plugin_status_pref_setter.h
+++ b/chrome/browser/plugins/plugin_status_pref_setter.h
@@ -58,13 +58,14 @@ class PluginStatusPrefSetter : public content::NotificationObserver {
   content::NotificationRegistrar registrar_;
   // Weak pointer.
   Profile* profile_;
-  base::WeakPtrFactory<PluginStatusPrefSetter> factory_;
 
   // Whether clearing LSO data is supported.
   BooleanPrefMember clear_plugin_lso_data_enabled_;
   // Whether we should show Pepper Flash-specific settings.
   BooleanPrefMember pepper_flash_settings_enabled_;
 
+  base::WeakPtrFactory<PluginStatusPrefSetter> factory_;
+
   DISALLOW_COPY_AND_ASSIGN(PluginStatusPrefSetter);
 };