| Index: google_apis/gcm/base/mcs_message_unittest.cc
|
| diff --git a/google_apis/gcm/base/mcs_message_unittest.cc b/google_apis/gcm/base/mcs_message_unittest.cc
|
| index acbf334207ed6972d0e22c826d668501eab94e1d..f96bab59984be27f76863059bf909a5ca88c115b 100644
|
| --- a/google_apis/gcm/base/mcs_message_unittest.cc
|
| +++ b/google_apis/gcm/base/mcs_message_unittest.cc
|
| @@ -43,9 +43,9 @@ TEST_F(MCSMessageTest, Invalid) {
|
| }
|
|
|
| TEST_F(MCSMessageTest, InitInferTag) {
|
| - scoped_ptr<mcs_proto::LoginRequest> login_request(
|
| + std::unique_ptr<mcs_proto::LoginRequest> login_request(
|
| BuildLoginRequest(kAndroidId, kSecret, ""));
|
| - scoped_ptr<google::protobuf::MessageLite> login_copy(
|
| + std::unique_ptr<google::protobuf::MessageLite> login_copy(
|
| new mcs_proto::LoginRequest(*login_request));
|
| MCSMessage message(*login_copy);
|
| login_copy.reset();
|
| @@ -61,9 +61,9 @@ TEST_F(MCSMessageTest, InitInferTag) {
|
| }
|
|
|
| TEST_F(MCSMessageTest, InitWithTag) {
|
| - scoped_ptr<mcs_proto::LoginRequest> login_request(
|
| + std::unique_ptr<mcs_proto::LoginRequest> login_request(
|
| BuildLoginRequest(kAndroidId, kSecret, ""));
|
| - scoped_ptr<google::protobuf::MessageLite> login_copy(
|
| + std::unique_ptr<google::protobuf::MessageLite> login_copy(
|
| new mcs_proto::LoginRequest(*login_request));
|
| MCSMessage message(kLoginRequestTag, *login_copy);
|
| login_copy.reset();
|
| @@ -79,9 +79,9 @@ TEST_F(MCSMessageTest, InitWithTag) {
|
| }
|
|
|
| TEST_F(MCSMessageTest, InitPassOwnership) {
|
| - scoped_ptr<mcs_proto::LoginRequest> login_request(
|
| + std::unique_ptr<mcs_proto::LoginRequest> login_request(
|
| BuildLoginRequest(kAndroidId, kSecret, ""));
|
| - scoped_ptr<google::protobuf::MessageLite> login_copy(
|
| + std::unique_ptr<google::protobuf::MessageLite> login_copy(
|
| new mcs_proto::LoginRequest(*login_request));
|
| MCSMessage message(kLoginRequestTag, std::move(login_copy));
|
| EXPECT_FALSE(login_copy.get());
|
|
|