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

chromeos/dbus/modem_messaging_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/modem_messaging_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/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
@@ skipping 136 matching lines @@
   void List(const std::string& service_name,
             const dbus::ObjectPath& object_path,
             const ListCallback& callback) override {
     GetProxy(service_name, object_path)->List(callback);
   }
 
  protected:
   void Init(dbus::Bus* bus) override { bus_ = bus; };
 
  private:
-  typedef base::ScopedPtrMap<std::pair<std::string, std::string>,
-                             scoped_ptr<ModemMessagingProxy>> ProxyMap;
+  using ProxyMap = std::map<std::pair<std::string, std::string>,
+                            scoped_ptr<ModemMessagingProxy>>;
 
   // Returns a SMSProxy for the given service name and object path.
   ModemMessagingProxy* GetProxy(const std::string& service_name,
                                 const dbus::ObjectPath& object_path) {
     const ProxyMap::key_type key(service_name, object_path.value());
     ProxyMap::const_iterator it = proxies_.find(key);
     if (it != proxies_.end())
-      return it->second;
+      return it->second.get();
 
     // There is no proxy for the service_name and object_path, create it.
     scoped_ptr<ModemMessagingProxy> proxy(
         new ModemMessagingProxy(bus_, service_name, object_path));
     ModemMessagingProxy* proxy_ptr = proxy.get();
-    proxies_.insert(key, proxy.Pass());
+    proxies_[key] = std::move(proxy);
     return proxy_ptr;
   }
 
   dbus::Bus* bus_;
   ProxyMap proxies_;
 
   DISALLOW_COPY_AND_ASSIGN(ModemMessagingClientImpl);
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // ModemMessagingClient
 
 ModemMessagingClient::ModemMessagingClient() {}
 
 ModemMessagingClient::~ModemMessagingClient() {}
 
 
 // static
 ModemMessagingClient* ModemMessagingClient::Create() {
   return new ModemMessagingClientImpl();
 }
 
 
 }  // namespace chromeos