| Index: google_apis/gaia/google_service_auth_error_unittest.cc
|
| diff --git a/google_apis/gaia/google_service_auth_error_unittest.cc b/google_apis/gaia/google_service_auth_error_unittest.cc
|
| index 8e221cc631a2113ca772b751d735b65798b2b7b8..2fec3ead4d093d029684e3893e3ac3d79a31d751 100644
|
| --- a/google_apis/gaia/google_service_auth_error_unittest.cc
|
| +++ b/google_apis/gaia/google_service_auth_error_unittest.cc
|
| @@ -4,9 +4,9 @@
|
|
|
| #include "google_apis/gaia/google_service_auth_error.h"
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/test/values_test_util.h"
|
| #include "base/values.h"
|
| #include "net/base/net_errors.h"
|
| @@ -20,7 +20,7 @@ class GoogleServiceAuthErrorTest : public testing::Test {};
|
|
|
| void TestSimpleState(GoogleServiceAuthError::State state) {
|
| GoogleServiceAuthError error(state);
|
| - scoped_ptr<base::DictionaryValue> value(error.ToValue());
|
| + std::unique_ptr<base::DictionaryValue> value(error.ToValue());
|
| EXPECT_EQ(1u, value->size());
|
| std::string state_str;
|
| EXPECT_TRUE(value->GetString("state", &state_str));
|
| @@ -38,7 +38,7 @@ TEST_F(GoogleServiceAuthErrorTest, SimpleToValue) {
|
|
|
| TEST_F(GoogleServiceAuthErrorTest, None) {
|
| GoogleServiceAuthError error(GoogleServiceAuthError::AuthErrorNone());
|
| - scoped_ptr<base::DictionaryValue> value(error.ToValue());
|
| + std::unique_ptr<base::DictionaryValue> value(error.ToValue());
|
| EXPECT_EQ(1u, value->size());
|
| ExpectDictStringValue("NONE", *value, "state");
|
| }
|
| @@ -46,7 +46,7 @@ TEST_F(GoogleServiceAuthErrorTest, None) {
|
| TEST_F(GoogleServiceAuthErrorTest, ConnectionFailed) {
|
| GoogleServiceAuthError error(
|
| GoogleServiceAuthError::FromConnectionError(net::OK));
|
| - scoped_ptr<base::DictionaryValue> value(error.ToValue());
|
| + std::unique_ptr<base::DictionaryValue> value(error.ToValue());
|
| EXPECT_EQ(2u, value->size());
|
| ExpectDictStringValue("CONNECTION_FAILED", *value, "state");
|
| ExpectDictStringValue("net::OK", *value, "networkError");
|
|
|