Update usages of std::map to use ScopedPtrMap.

components/gcm_driver/gcm_client_impl.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_GCM_DRIVER_GCM_CLIENT_IMPL_H_
 #define COMPONENTS_GCM_DRIVER_GCM_CLIENT_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
+#include "base/containers/scoped_ptr_map.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/stl_util.h"
 #include "components/gcm_driver/gcm_client.h"
 #include "components/gcm_driver/gcm_stats_recorder_impl.h"
 #include "google_apis/gcm/base/mcs_message.h"
 #include "google_apis/gcm/engine/gcm_store.h"
 #include "google_apis/gcm/engine/gservices_settings.h"
 #include "google_apis/gcm/engine/mcs_client.h"
 #include "google_apis/gcm/engine/registration_request.h"
 #include "google_apis/gcm/engine/unregistration_request.h"
 #include "google_apis/gcm/protocol/android_checkin.pb.h"
 #include "google_apis/gcm/protocol/checkin.pb.h"
@@ skipping 137 matching lines @@
     // Map of account email addresses and OAuth2 tokens that will be sent to the
     // checkin server on a next checkin.
     std::map<std::string, std::string> account_tokens;
     // As set of accounts last checkin was completed with.
     std::set<std::string> last_checkin_accounts;
   };
 
   // Collection of pending registration requests. Keys are RegistrationInfo
   // instance, while values are pending registration requests to obtain a
   // registration ID for requesting application.
-  typedef std::map<linked_ptr<RegistrationInfo>,
-                   RegistrationRequest*,
-                   RegistrationInfoComparer> PendingRegistrationRequests;
+  typedef base::ScopedPtrMap<linked_ptr<RegistrationInfo>,
+                             scoped_ptr<RegistrationRequest>,
+                             RegistrationInfoComparer>
+      PendingRegistrationRequests;
 
   // Collection of pending unregistration requests. Keys are RegistrationInfo
   // instance, while values are pending unregistration requests to disable the
   // registration ID currently assigned to the application.
-  typedef std::map<linked_ptr<RegistrationInfo>,
-                   UnregistrationRequest*,
-                   RegistrationInfoComparer> PendingUnregistrationRequests;
+  typedef base::ScopedPtrMap<linked_ptr<RegistrationInfo>,
+                             scoped_ptr<UnregistrationRequest>,
+                             RegistrationInfoComparer>
+      PendingUnregistrationRequests;
 
   friend class GCMClientImplTest;
   friend class GCMClientInstanceIDTest;
 
   // Returns text representation of the enum State.
   std::string GetStateString() const;
 
   // Callbacks for the MCSClient.
   // Receives messages and dispatches them to relevant user delegates.
   void OnMessageReceivedFromMCS(const gcm::MCSMessage& message);
@@ skipping 147 matching lines @@
   scoped_ptr<MCSClient> mcs_client_;
 
   scoped_ptr<CheckinRequest> checkin_request_;
 
   // Cached registration info.
   RegistrationInfoMap registrations_;
 
   // Currently pending registration requests. GCMClientImpl owns the
   // RegistrationRequests.
   PendingRegistrationRequests pending_registration_requests_;
-  STLValueDeleter<PendingRegistrationRequests>
-      pending_registration_requests_deleter_;
 
   // Currently pending unregistration requests. GCMClientImpl owns the
   // UnregistrationRequests.
   PendingUnregistrationRequests pending_unregistration_requests_;
-  STLValueDeleter<PendingUnregistrationRequests>
-      pending_unregistration_requests_deleter_;
 
   // G-services settings that were provided by MCS.
   GServicesSettings gservices_settings_;
 
   // Time of the last successful checkin.
   base::Time last_checkin_time_;
 
   // Cached instance ID data, key is app ID and value is pair of instance ID
   // and extra data.
   std::map<std::string, std::pair<std::string, std::string>> instance_id_data_;
 
   // Factory for creating references when scheduling periodic checkin.
   base::WeakPtrFactory<GCMClientImpl> periodic_checkin_ptr_factory_;
 
   // Factory for wiping out GCM store.
   base::WeakPtrFactory<GCMClientImpl> destroying_gcm_store_ptr_factory_;
 
   // Factory for creating references in callbacks.
   base::WeakPtrFactory<GCMClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMClientImpl);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_CLIENT_IMPL_H_