[Extensions Cleanup] Use members in ExtensionPrefs init code

Instead of passing an ExtensionPrefValueMap to
ExtensionPrefs::InitExtensionControlledPrefs(), just use the member
variable directly.

Similarly, instead of passing `this` and the value map to the
anonymous free function LoadExtensionControlledPrefs(), just
make LoadExtensionControlledPrefs() a member function and use
the ExtensionPrefs members directly.

Bug: None

Change-Id: Ifd036983e83a4ecc9b95144cb87c986b68c2fa12
Reviewed-on: https://chromium-review.googlesource.com/996499
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548317}

extensions/browser/extension_prefs.cc

@@ -238,28 +238,6 @@ bool IsBlacklistBitSet(const base::DictionaryValue* ext) {
   return ext->GetBoolean(kPrefBlacklist, &bool_value) && bool_value;
 }
 
-void LoadExtensionControlledPrefs(ExtensionPrefs* prefs,
-                                  ExtensionPrefValueMap* value_map,
-                                  const std::string& extension_id,
-                                  ExtensionPrefsScope scope) {
-  std::string scope_string;
-  if (!pref_names::ScopeToPrefName(scope, &scope_string))
-    return;
-  std::string key = extension_id + "." + scope_string;
-
-  const base::DictionaryValue* source_dict =
-      prefs->pref_service()->GetDictionary(pref_names::kExtensions);
-  const base::DictionaryValue* preferences = NULL;
-  if (!source_dict->GetDictionary(key, &preferences))
-    return;
-
-  for (base::DictionaryValue::Iterator iter(*preferences); !iter.IsAtEnd();
-       iter.Advance()) {
-    value_map->SetExtensionPref(
-        extension_id, iter.key(), scope, iter.value().DeepCopy());
-  }
-}
-
 // Whether SetAlertSystemFirstRun() should always return true, so that alerts
 // are triggered, even in first run.
 bool g_run_alerts_in_first_run_for_testing = false;
@@ -1597,7 +1575,7 @@ void ExtensionPrefs::InitPrefStore() {
     update.Get();
   }
 
-  InitExtensionControlledPrefs(extension_pref_value_map_);
+  InitExtensionControlledPrefs();
 
   extension_pref_value_map_->NotifyInitializationCompleted();
 }
@@ -1861,8 +1839,7 @@ void ExtensionPrefs::PopulateExtensionInfoPrefs(
     extension_dict->Remove(kPrefDoNotSync, NULL);
 }
 
-void ExtensionPrefs::InitExtensionControlledPrefs(
-    ExtensionPrefValueMap* value_map) {
+void ExtensionPrefs::InitExtensionControlledPrefs() {
   TRACE_EVENT0("browser,startup",
                "ExtensionPrefs::InitExtensionControlledPrefs")
   SCOPED_UMA_HISTOGRAM_TIMER("Extensions.InitExtensionControlledPrefsTime");
@@ -1876,29 +1853,47 @@ void ExtensionPrefs::InitExtensionControlledPrefs(
     base::Time install_time = GetInstallTime(*extension_id);
     bool is_enabled = !IsExtensionDisabled(*extension_id);
     bool is_incognito_enabled = IsIncognitoEnabled(*extension_id);
-    value_map->RegisterExtension(
+    extension_pref_value_map_->RegisterExtension(
         *extension_id, install_time, is_enabled, is_incognito_enabled);
 
     for (auto& observer : observer_list_)
       observer.OnExtensionRegistered(*extension_id, install_time, is_enabled);
 
     // Set regular extension controlled prefs.
-    LoadExtensionControlledPrefs(
-        this, value_map, *extension_id, kExtensionPrefsScopeRegular);
+    LoadExtensionControlledPrefs(*extension_id, kExtensionPrefsScopeRegular);
     // Set incognito extension controlled prefs.
-    LoadExtensionControlledPrefs(this,
-                                 value_map,
-                                 *extension_id,
+    LoadExtensionControlledPrefs(*extension_id,
                                  kExtensionPrefsScopeIncognitoPersistent);
     // Set regular-only extension controlled prefs.
-    LoadExtensionControlledPrefs(
-        this, value_map, *extension_id, kExtensionPrefsScopeRegularOnly);
+    LoadExtensionControlledPrefs(*extension_id,
+                                 kExtensionPrefsScopeRegularOnly);
 
     for (auto& observer : observer_list_)
       observer.OnExtensionPrefsLoaded(*extension_id, this);
   }
 }
 
+void ExtensionPrefs::LoadExtensionControlledPrefs(
+    const ExtensionId& extension_id,
+    ExtensionPrefsScope scope) {
+  std::string scope_string;
+  if (!pref_names::ScopeToPrefName(scope, &scope_string))
+    return;
+  std::string key = extension_id + "." + scope_string;
+
+  const base::DictionaryValue* source_dict =
+      pref_service()->GetDictionary(pref_names::kExtensions);
+  const base::DictionaryValue* preferences = NULL;
+  if (!source_dict->GetDictionary(key, &preferences))
+    return;
+
+  for (base::DictionaryValue::Iterator iter(*preferences); !iter.IsAtEnd();
+       iter.Advance()) {
+    extension_pref_value_map_->SetExtensionPref(extension_id, iter.key(), scope,
+                                                iter.value().DeepCopy());
+  }
+}
+
 void ExtensionPrefs::FinishExtensionInfoPrefs(
     const std::string& extension_id,
     const base::Time install_time,

extensions/browser/extension_prefs.h

@@ -21,6 +21,7 @@
 #include "components/sync/model/string_ordinal.h"
 #include "extensions/browser/blacklist_state.h"
 #include "extensions/browser/disable_reason.h"
+#include "extensions/browser/extension_prefs_scope.h"
 #include "extensions/browser/install_flag.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
@@ -690,7 +691,11 @@ class ExtensionPrefs : public KeyedService {
       const base::Optional<int>& dnr_ruleset_checksum,
       prefs::DictionaryValueUpdate* extension_dict) const;
 
-  void InitExtensionControlledPrefs(ExtensionPrefValueMap* value_map);
+  void InitExtensionControlledPrefs();
+
+  // Loads preferences for the given |extension_id| into the pref value map.
+  void LoadExtensionControlledPrefs(const ExtensionId& extension_id,
+                                    ExtensionPrefsScope scope);
 
   // Helper function to complete initialization of the values in
   // |extension_dict| for an extension install. Also see