Remove base::ScopedPtrHashMap from components/prefs/.

BUG=579229

Review-Url: https://codereview.chromium.org/2602553003
Cr-Commit-Position: refs/heads/master@{#441444}

chrome/browser/chromeos/settings/device_settings_provider.cc

@@ -735,11 +735,11 @@ void DeviceSettingsProvider::UpdateValuesCache(
   // cache so that if somebody actually reads the cache will be already valid.
   std::vector<std::string> notifications;
   // Go through the new values and verify in the old ones.
-  PrefValueMap::iterator iter = new_values_cache.begin();
+  auto iter = new_values_cache.begin();
   for (; iter != new_values_cache.end(); ++iter) {
     const base::Value* old_value;
     if (!values_cache_.GetValue(iter->first, &old_value) ||
-        !old_value->Equals(iter->second)) {
+        !old_value->Equals(iter->second.get())) {
       notifications.push_back(iter->first);
     }
   }

chrome/browser/prefs/profile_pref_store_manager_unittest.cc

@@ -37,7 +37,7 @@ class FirstEqualsPredicate {
  public:
   explicit FirstEqualsPredicate(const std::string& expected)
       : expected_(expected) {}
-  bool operator()(const std::pair<std::string, base::Value*>& pair) {
+  bool operator()(const PrefValueMap::Map::value_type& pair) {
     return pair.first == expected_;
   }
 

components/prefs/pref_value_map.cc

@@ -10,7 +10,6 @@
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "base/stl_util.h"
 #include "base/values.h"
 
 PrefValueMap::PrefValueMap() {}
@@ -19,7 +18,11 @@ PrefValueMap::~PrefValueMap() {}
 
 bool PrefValueMap::GetValue(const std::string& key,
                             const base::Value** value) const {
-  const base::Value* got_value = prefs_.get(key);
+  auto it = prefs_.find(key);
+  if (it == prefs_.end())
+    return false;
+
+  const base::Value* got_value = it->second.get();
   if (value && got_value)
     *value = got_value;
 
@@ -27,7 +30,11 @@ bool PrefValueMap::GetValue(const std::string& key,
 }
 
 bool PrefValueMap::GetValue(const std::string& key, base::Value** value) {
-  base::Value* got_value = prefs_.get(key);
+  auto it = prefs_.find(key);
+  if (it == prefs_.end())
+    return false;
+
+  base::Value* got_value = it->second.get();
   if (value && got_value)
     *value = got_value;
 
@@ -38,11 +45,11 @@ bool PrefValueMap::SetValue(const std::string& key,
                             std::unique_ptr<base::Value> value) {
   DCHECK(value);
 
-  base::Value* old_value = prefs_.get(key);
-  if (old_value && value->Equals(old_value))
+  std::unique_ptr<base::Value>& existing_value = prefs_[key];
+  if (existing_value && value->Equals(existing_value.get()))
     return false;
 
-  prefs_.set(key, std::move(value));
+  existing_value = std::move(value);
   return true;
 }
 
@@ -118,13 +125,16 @@ void PrefValueMap::GetDifferingKeys(
   differing_keys->clear();
 
   // Put everything into ordered maps.
-  std::map<std::string, base::Value*> this_prefs(prefs_.begin(), prefs_.end());
-  std::map<std::string, base::Value*> other_prefs(other->prefs_.begin(),
-                                                  other->prefs_.end());
+  std::map<std::string, base::Value*> this_prefs;
+  std::map<std::string, base::Value*> other_prefs;
+  for (const auto& pair : prefs_)
+    this_prefs[pair.first] = pair.second.get();
+  for (const auto& pair : other->prefs_)
+    other_prefs[pair.first] = pair.second.get();
 
   // Walk over the maps in lockstep, adding everything that is different.
-  auto this_pref(this_prefs.begin());
-  auto other_pref(other_prefs.begin());
+  auto this_pref = this_prefs.begin();
+  auto other_pref = other_prefs.begin();
   while (this_pref != this_prefs.end() && other_pref != other_prefs.end()) {
     const int diff = this_pref->first.compare(other_pref->first);
     if (diff == 0) {

components/prefs/pref_value_map.h

@@ -7,9 +7,9 @@
 
 #include <memory>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
-#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "components/prefs/base_prefs_export.h"
 
@@ -20,7 +20,7 @@ class Value;
 // A generic string to value map used by the PrefStore implementations.
 class COMPONENTS_PREFS_EXPORT PrefValueMap {
  public:
-  using Map = base::ScopedPtrHashMap<std::string, std::unique_ptr<base::Value>>;
+  using Map = std::unordered_map<std::string, std::unique_ptr<base::Value>>;
   using iterator = Map::iterator;
   using const_iterator = Map::const_iterator;