Index: google_apis/gaia/gaia_oauth_client.cc |
diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc |
index 618ecd4052d04ff59f7064bf090b2bca0763a19b..5fe761055c76de25703a82d160bf7589b1872071 100644 |
--- a/google_apis/gaia/gaia_oauth_client.cc |
+++ b/google_apis/gaia/gaia_oauth_client.cc |
@@ -4,11 +4,11 @@ |
#include "google_apis/gaia/gaia_oauth_client.h" |
+#include <memory> |
#include <utility> |
#include "base/json/json_reader.h" |
#include "base/logging.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/strings/string_util.h" |
#include "base/values.h" |
#include "google_apis/gaia/gaia_urls.h" |
@@ -98,7 +98,7 @@ class GaiaOAuthClient::Core |
int num_retries_; |
scoped_refptr<net::URLRequestContextGetter> request_context_getter_; |
GaiaOAuthClient::Delegate* delegate_; |
- scoped_ptr<net::URLFetcher> request_; |
+ std::unique_ptr<net::URLFetcher> request_; |
RequestType request_type_; |
}; |
@@ -252,7 +252,7 @@ void GaiaOAuthClient::Core::HandleResponse( |
// Move ownership of the request fetcher into a local scoped_ptr which |
// will be nuked when we're done handling the request, unless we need |
// to retry, in which case ownership will be returned to request_. |
- scoped_ptr<net::URLFetcher> old_request = std::move(request_); |
+ std::unique_ptr<net::URLFetcher> old_request = std::move(request_); |
DCHECK_EQ(source, old_request.get()); |
// HTTP_BAD_REQUEST means the arguments are invalid. HTTP_UNAUTHORIZED means |
@@ -265,11 +265,11 @@ void GaiaOAuthClient::Core::HandleResponse( |
return; |
} |
- scoped_ptr<base::DictionaryValue> response_dict; |
+ std::unique_ptr<base::DictionaryValue> response_dict; |
if (source->GetResponseCode() == net::HTTP_OK) { |
std::string data; |
source->GetResponseAsString(&data); |
- scoped_ptr<base::Value> message_value = base::JSONReader::Read(data); |
+ std::unique_ptr<base::Value> message_value = base::JSONReader::Read(data); |
if (message_value.get() && |
message_value->IsType(base::Value::TYPE_DICTIONARY)) { |
response_dict.reset( |