Update usages of std::map to use ScopedPtrMap.

components/gcm_driver/instance_id/instance_id_impl.cc

 // Copyright 2015 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 "components/gcm_driver/instance_id/instance_id_impl.h"
 
 #include <algorithm>
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/gcm_driver/gcm_driver_desktop.h"
 #include "crypto/random.h"
 
 namespace instance_id {
 
 namespace {
 
 InstanceID::Result GCMClientResultToInstanceIDResult(
@@ skipping 16 matching lines @@
     default:
       NOTREACHED() << "Unexpected value of result cannot be converted: "
                    << result;
   }
   return InstanceID::UNKNOWN_ERROR;
 }
 
 }  // namespace
 
 // static
-InstanceID* InstanceID::Create(const std::string& app_id,
-                               gcm::GCMDriver* gcm_driver) {
-  return new InstanceIDImpl(app_id, gcm_driver);
+scoped_ptr<InstanceID> InstanceID::Create(const std::string& app_id,
+                                          gcm::GCMDriver* gcm_driver) {
+  return make_scoped_ptr(new InstanceIDImpl(app_id, gcm_driver));
 }
 
 InstanceIDImpl::InstanceIDImpl(const std::string& app_id,
                                gcm::GCMDriver* gcm_driver)
     : InstanceID(app_id),
       gcm_driver_(gcm_driver),
       load_from_store_(false),
       weak_ptr_factory_(this) {
   GetInstanceIDHandler()->GetInstanceIDData(
       app_id,
@@ skipping 219 matching lines @@
   creation_time_ = base::Time::Now();
 
   // Save to the persistent store.
   GetInstanceIDHandler()->AddInstanceIDData(
       app_id(),
       id_,
       base::Int64ToString(creation_time_.ToInternalValue()));
 }
 
 }  // namespace instance_id