Remove base::ScopedPtrHashMap from components/prefs/.

chrome/browser/chromeos/settings/device_settings_provider.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/chromeos/settings/device_settings_provider.h"
 
 #include <memory.h>
 #include <stddef.h>
 #include <utility>
 
@@ skipping 717 matching lines @@
   DecodeReportingPolicies(settings, &new_values_cache);
   DecodeHeartbeatPolicies(settings, &new_values_cache);
   DecodeGenericPolicies(settings, &new_values_cache);
   DecodeLogUploadPolicies(settings, &new_values_cache);
   DecodeDeviceState(policy_data, &new_values_cache);
 
   // Collect all notifications but send them only after we have swapped the
   // 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);
     }
   }
   // Now check for values that have been removed from the policy blob.
   for (iter = values_cache_.begin(); iter != values_cache_.end(); ++iter) {
     const base::Value* value;
     if (!new_values_cache.GetValue(iter->first, &value))
       notifications.push_back(iter->first);
   }
   // Swap and notify.
@@ skipping 118 matching lines @@
   // Notify the observers we are done.
   std::vector<base::Closure> callbacks;
   callbacks.swap(callbacks_);
   for (size_t i = 0; i < callbacks.size(); ++i)
     callbacks[i].Run();
 
   return settings_loaded;
 }
 
 }  // namespace chromeos