Update usages of std::map to use ScopedPtrMap.

components/gcm_driver/instance_id/instance_id.h

 // 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.
 
 #ifndef COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_H_
 #define COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_H_
 
 #include <map>
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 
 namespace gcm {
 class GCMDriver;
 }  // namespace gcm
 
 namespace instance_id {
 
 // Encapsulates Instance ID functionalities that need to be implemented for
 // different platform. One instance is created per application. Life of
@@ skipping 27 matching lines @@
                               Result result)> GetTokenCallback;
   typedef base::Callback<void(Result result)> DeleteTokenCallback;
   typedef base::Callback<void(Result result)> DeleteIDCallback;
 
   static const int kInstanceIDByteLength = 8;
 
   // Creator.
   // |app_id|: identifies the application that uses the Instance ID.
   // |gcm_driver|: driver to access the GCM functionalities needed to support
   //               Instance ID.
-  static InstanceID* Create(const std::string& app_id,
-                            gcm::GCMDriver* gcm_driver);
+  static scoped_ptr<InstanceID> Create(const std::string& app_id,
+                                       gcm::GCMDriver* gcm_driver);
 
   virtual ~InstanceID();
 
   // Sets the callback that will be invoked when the token refresh event needs
   // to be triggered.
   void SetTokenRefreshCallback(const TokenRefreshCallback& callback);
 
   // Returns the Instance ID.
   virtual void GetID(const GetIDCallback& callback) = 0;
 
@@ skipping 40 matching lines @@
  private:
   std::string app_id_;
   TokenRefreshCallback token_refresh_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(InstanceID);
 };
 
 }  // namespace instance_id
 
 #endif  // COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_H_