Index: google_apis/gcm/engine/connection_handler.h |
diff --git a/google_apis/gcm/engine/connection_handler.h b/google_apis/gcm/engine/connection_handler.h |
index b719ac762609fe6d3eef2728769ce3efd06afa5b..da12722daf19dfefaea48fbafa44894005f849d2 100644 |
--- a/google_apis/gcm/engine/connection_handler.h |
+++ b/google_apis/gcm/engine/connection_handler.h |
@@ -5,8 +5,9 @@ |
#ifndef GOOGLE_APIS_GCM_ENGINE_CONNECTION_HANDLER_H_ |
#define GOOGLE_APIS_GCM_ENGINE_CONNECTION_HANDLER_H_ |
+#include <memory> |
+ |
#include "base/callback.h" |
-#include "base/memory/scoped_ptr.h" |
#include "google_apis/gcm/base/gcm_export.h" |
namespace net{ |
@@ -35,7 +36,7 @@ class SocketOutputStream; |
// messages can be sent/received again. |
class GCM_EXPORT ConnectionHandler { |
public: |
- typedef base::Callback<void(scoped_ptr<google::protobuf::MessageLite>)> |
+ typedef base::Callback<void(std::unique_ptr<google::protobuf::MessageLite>)> |
ProtoReceivedCallback; |
typedef base::Closure ProtoSentCallback; |
typedef base::Callback<void(int)> ConnectionChangedCallback; |