| Index: components/gcm_driver/instance_id/instance_id_driver.h
|
| diff --git a/components/gcm_driver/instance_id/instance_id_driver.h b/components/gcm_driver/instance_id/instance_id_driver.h
|
| index d2d9a4ffc4d4690c68ca133a90d87d40fc31e902..b7df4fce21e25d05f6cc6a730542793b81c8ec06 100644
|
| --- a/components/gcm_driver/instance_id/instance_id_driver.h
|
| +++ b/components/gcm_driver/instance_id/instance_id_driver.h
|
| @@ -5,9 +5,9 @@
|
| #ifndef COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_DRIVER_H_
|
| #define COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_DRIVER_H_
|
|
|
| +#include <map>
|
| #include <string>
|
|
|
| -#include "base/containers/scoped_ptr_map.h"
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
|
|
| @@ -43,7 +43,7 @@ class InstanceIDDriver {
|
|
|
| private:
|
| gcm::GCMDriver* gcm_driver_; // Not owned.
|
| - base::ScopedPtrMap<std::string, scoped_ptr<InstanceID>> instance_id_map_;
|
| + std::map<std::string, scoped_ptr<InstanceID>> instance_id_map_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(InstanceIDDriver);
|
| };
|
|
|