Update usages of std::map to use ScopedPtrMap.

chromeos/dbus/shill_profile_client.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 "chromeos/dbus/shill_profile_client.h"
 
 #include "base/bind.h"
+#include "base/containers/scoped_ptr_map.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "base/stl_util.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_property_changed_observer.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/values_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
@@ skipping 29 matching lines @@
                    const std::string& entry_path,
                    const base::Closure& callback,
                    const ErrorCallback& error_callback) override;
 
   TestInterface* GetTestInterface() override { return NULL; }
 
  protected:
   void Init(dbus::Bus* bus) override { bus_ = bus; }
 
  private:
-  typedef std::map<std::string, ShillClientHelper*> HelperMap;
+  typedef base::ScopedPtrMap<std::string, scoped_ptr<ShillClientHelper>>
+      HelperMap;
 
   // Returns the corresponding ShillClientHelper for the profile.
   ShillClientHelper* GetHelper(const dbus::ObjectPath& profile_path);
 
   dbus::Bus* bus_;
   HelperMap helpers_;
-  STLValueDeleter<HelperMap> helpers_deleter_;
 
   DISALLOW_COPY_AND_ASSIGN(ShillProfileClientImpl);
 };
 
-ShillProfileClientImpl::ShillProfileClientImpl()
-    : bus_(NULL),
-      helpers_deleter_(&helpers_) {
+ShillProfileClientImpl::ShillProfileClientImpl() : bus_(NULL) {
 }
 
 ShillClientHelper* ShillProfileClientImpl::GetHelper(
     const dbus::ObjectPath& profile_path) {
-  HelperMap::iterator it = helpers_.find(profile_path.value());
+  HelperMap::const_iterator it = helpers_.find(profile_path.value());
   if (it != helpers_.end())
     return it->second;
 
   // There is no helper for the profile, create it.
   dbus::ObjectProxy* object_proxy =
       bus_->GetObjectProxy(shill::kFlimflamServiceName, profile_path);
-  ShillClientHelper* helper = new ShillClientHelper(object_proxy);
+  scoped_ptr<ShillClientHelper> helper(new ShillClientHelper(object_proxy));
   helper->MonitorPropertyChanged(shill::kFlimflamProfileInterface);
-  helpers_.insert(HelperMap::value_type(profile_path.value(), helper));
-  return helper;
+  ShillClientHelper* helper_ptr = helper.get();
+  helpers_.insert(profile_path.value(), helper.Pass());
+  return helper_ptr;
 }
 
 void ShillProfileClientImpl::GetProperties(
     const dbus::ObjectPath& profile_path,
     const DictionaryValueCallbackWithoutStatus& callback,
     const ErrorCallback& error_callback) {
   dbus::MethodCall method_call(shill::kFlimflamProfileInterface,
                                shill::kGetPropertiesFunction);
   GetHelper(profile_path)->CallDictionaryValueMethodWithErrorCallback(
       &method_call, callback, error_callback);
@@ skipping 35 matching lines @@
 ShillProfileClient* ShillProfileClient::Create() {
   return new ShillProfileClientImpl();
 }
 
 // static
 std::string ShillProfileClient::GetSharedProfilePath() {
   return std::string(kSharedProfilePath);
 }
 
 }  // namespace chromeos