Update usages of std::map to use ScopedPtrMap.

chromeos/dbus/gsm_sms_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/gsm_sms_client.h"
 
-#include <map>
 #include <utility>
 #include <vector>
 
 #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/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
 #include "dbus/values_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
@@ skipping 130 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<SMSProxy> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SMSProxy);
 };
 
 // The GsmSMSClient implementation.
 class GsmSMSClientImpl : public GsmSMSClient {
  public:
-  GsmSMSClientImpl() : bus_(NULL), proxies_deleter_(&proxies_) {}
+  GsmSMSClientImpl() : bus_(NULL) {}
 
   // GsmSMSClient override.
   void SetSmsReceivedHandler(const std::string& service_name,
                              const dbus::ObjectPath& object_path,
                              const SmsReceivedHandler& handler) override {
     GetProxy(service_name, object_path)->SetSmsReceivedHandler(handler);
   }
 
   // GsmSMSClient override.
   void ResetSmsReceivedHandler(const std::string& service_name,
@@ skipping 25 matching lines @@
   }
 
   // GsmSMSClient override.
   void RequestUpdate(const std::string& service_name,
                      const dbus::ObjectPath& object_path) override {}
 
  protected:
   void Init(dbus::Bus* bus) override { bus_ = bus; }
 
  private:
-  typedef std::map<std::pair<std::string, std::string>, SMSProxy*> ProxyMap;
+  typedef ScopedPtrMap<std::pair<std::string, std::string>,
+                       scoped_ptr<SMSProxy>> ProxyMap;
 
   // Returns a SMSProxy for the given service name and object path.
   SMSProxy* GetProxy(const std::string& service_name,
                      const dbus::ObjectPath& object_path) {
     const ProxyMap::key_type key(service_name, object_path.value());
-    ProxyMap::iterator it = proxies_.find(key);
+    ProxyMap::const_iterator it = proxies_.find(key);
     if (it != proxies_.end())
       return it->second;

[stevenjb, 2015/06/18 15:32:02]

Does this compile? It seems like this would now return a scoped_ptr?

[Matt Giuca, 2015/06/22 05:40:41]

Missed this earlier.

It actually returns a SMSProxy*. Unfortunately, this will break when we move to
an actual std::map<..., scoped_ptr<...>>, because then it will return a
scoped_ptr.

(This is one of the unfortunate consequences of ScopedPtrMap "faking" a map of
scoped_ptrs; we can't make iterators behave correctly so it's slightly
incompatible at this point.)

[stevenjb, 2015/06/23 17:01:03]

For the record, "EW". I see now how ScopedPtrMap::insert has to take a
scoped_ptr<> and ScopedPtrMap::iterator.second has to be a raw pointer, but...
EW.

[Matt Giuca, 2015/06/24 05:21:34]

Yeah, it can't really be solved until we get real scoped_ptrs in there. But this
is a step in the right direction.

 
     // There is no proxy for the service_name and object_path, create it.
-    SMSProxy* proxy = new SMSProxy(bus_, service_name, object_path);
-    proxies_.insert(ProxyMap::value_type(key, proxy));
-    return proxy;
+    scoped_ptr<SMSProxy> proxy(new SMSProxy(bus_, service_name, object_path));
+    SMSProxy* proxy_ptr = proxy.get();
+    proxies_.insert(key, proxy.Pass());
+    return proxy_ptr;
   }
 
   dbus::Bus* bus_;
   ProxyMap proxies_;
-  STLValueDeleter<ProxyMap> proxies_deleter_;
 
   DISALLOW_COPY_AND_ASSIGN(GsmSMSClientImpl);
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // GsmSMSClient
 
 GsmSMSClient::GsmSMSClient() {}
 
 GsmSMSClient::~GsmSMSClient() {}
 
 // static
 GsmSMSClient* GsmSMSClient::Create() {
   return new GsmSMSClientImpl();
 }
 
 }  // namespace chromeos