| Index: google_apis/gaia/gaia_oauth_client_unittest.cc
|
| diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc
|
| index ac2968bca55c56e0ed76626a1d834b4321f4db0f..695ed94e017301f9e28030f77e9dae24dc38f597 100644
|
| --- a/google_apis/gaia/gaia_oauth_client_unittest.cc
|
| +++ b/google_apis/gaia/gaia_oauth_client_unittest.cc
|
| @@ -89,7 +89,7 @@ class MockOAuthFetcherFactory : public net::URLFetcherFactory,
|
| complete_immediately_(true) {
|
| }
|
| ~MockOAuthFetcherFactory() override {}
|
| - scoped_ptr<net::URLFetcher> CreateURLFetcher(
|
| + std::unique_ptr<net::URLFetcher> CreateURLFetcher(
|
| int id,
|
| const GURL& url,
|
| net::URLFetcher::RequestType request_type,
|
| @@ -102,7 +102,7 @@ class MockOAuthFetcherFactory : public net::URLFetcherFactory,
|
| results_,
|
| request_type,
|
| d);
|
| - return scoped_ptr<net::URLFetcher>(url_fetcher_);
|
| + return std::unique_ptr<net::URLFetcher>(url_fetcher_);
|
| }
|
| void set_response_code(int response_code) {
|
| response_code_ = response_code;
|
| @@ -221,21 +221,21 @@ class MockGaiaOAuthClientDelegate : public gaia::GaiaOAuthClient::Delegate {
|
| MOCK_METHOD1(OnGetUserInfoResponsePtr,
|
| void(const base::DictionaryValue* user_info));
|
| void OnGetUserInfoResponse(
|
| - scoped_ptr<base::DictionaryValue> user_info) override {
|
| + std::unique_ptr<base::DictionaryValue> user_info) override {
|
| user_info_.reset(user_info.release());
|
| OnGetUserInfoResponsePtr(user_info_.get());
|
| }
|
| MOCK_METHOD1(OnGetTokenInfoResponsePtr,
|
| void(const base::DictionaryValue* token_info));
|
| void OnGetTokenInfoResponse(
|
| - scoped_ptr<base::DictionaryValue> token_info) override {
|
| + std::unique_ptr<base::DictionaryValue> token_info) override {
|
| token_info_.reset(token_info.release());
|
| OnGetTokenInfoResponsePtr(token_info_.get());
|
| }
|
|
|
| private:
|
| - scoped_ptr<base::DictionaryValue> user_info_;
|
| - scoped_ptr<base::DictionaryValue> token_info_;
|
| + std::unique_ptr<base::DictionaryValue> user_info_;
|
| + std::unique_ptr<base::DictionaryValue> token_info_;
|
| DISALLOW_COPY_AND_ASSIGN(MockGaiaOAuthClientDelegate);
|
| };
|
|
|
| @@ -368,7 +368,7 @@ TEST_F(GaiaOAuthClientTest, GetUserInfo) {
|
| GaiaOAuthClient auth(GetRequestContext());
|
| auth.GetUserInfo("access_token", 1, &delegate);
|
|
|
| - scoped_ptr<base::Value> value =
|
| + std::unique_ptr<base::Value> value =
|
| base::JSONReader::Read(kDummyFullUserInfoResult);
|
| DCHECK(value);
|
| ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY));
|
|
|