Play better with C++11 library features from /chromeos

chromeos/dbus/shill_ipconfig_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_ipconfig_client.h"
 
+#include <map>
+#include <utility>
+
 #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/values.h"
 #include "chromeos/dbus/shill_property_changed_observer.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "dbus/values_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
@@ skipping 32 matching lines @@
                      const std::string& name,
                      const VoidDBusMethodCallback& callback) override;
   void Remove(const dbus::ObjectPath& ipconfig_path,
               const VoidDBusMethodCallback& callback) override;
   ShillIPConfigClient::TestInterface* GetTestInterface() override;
 
  protected:
   void Init(dbus::Bus* bus) override { bus_ = bus; }
 
  private:
-  typedef base::ScopedPtrMap<std::string, scoped_ptr<ShillClientHelper>>
-      HelperMap;
+  using HelperMap = std::map<std::string, scoped_ptr<ShillClientHelper>>;
 
   // Returns the corresponding ShillClientHelper for the profile.
   ShillClientHelper* GetHelper(const dbus::ObjectPath& ipconfig_path) {
     HelperMap::const_iterator it = helpers_.find(ipconfig_path.value());
     if (it != helpers_.end())
-      return it->second;
+      return it->second.get();
 
     // There is no helper for the profile, create it.
     dbus::ObjectProxy* object_proxy =
         bus_->GetObjectProxy(shill::kFlimflamServiceName, ipconfig_path);
     scoped_ptr<ShillClientHelper> helper(new ShillClientHelper(object_proxy));
     helper->MonitorPropertyChanged(shill::kFlimflamIPConfigInterface);
     ShillClientHelper* helper_ptr = helper.get();
-    helpers_.insert(ipconfig_path.value(), helper.Pass());
+    helpers_[ipconfig_path.value()] = std::move(helper);
     return helper_ptr;
   }
 
   dbus::Bus* bus_;
   HelperMap helpers_;
 
   DISALLOW_COPY_AND_ASSIGN(ShillIPConfigClientImpl);
 };
 
 ShillIPConfigClientImpl::ShillIPConfigClientImpl() : bus_(NULL) {
@@ skipping 86 matching lines @@
 ShillIPConfigClient::ShillIPConfigClient() {}
 
 ShillIPConfigClient::~ShillIPConfigClient() {}
 
 // static
 ShillIPConfigClient* ShillIPConfigClient::Create() {
   return new ShillIPConfigClientImpl();
 }
 
 }  // namespace chromeos