Index: remoting/host/setup/service_client.cc |
diff --git a/remoting/host/setup/service_client.cc b/remoting/host/setup/service_client.cc |
index ba42825c76cdc5930c68e02d7e5604a0feeda52e..7c107af50ce855c7cfc3ad4ee76fb78f4174fa26 100644 |
--- a/remoting/host/setup/service_client.cc |
+++ b/remoting/host/setup/service_client.cc |
@@ -4,9 +4,10 @@ |
#include "remoting/host/setup/service_client.h" |
+#include <memory> |
+ |
#include "base/json/json_reader.h" |
#include "base/json/json_writer.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/values.h" |
#include "net/http/http_status_code.h" |
#include "net/url_request/url_fetcher.h" |
@@ -61,7 +62,7 @@ class ServiceClient::Core |
scoped_refptr<net::URLRequestContextGetter> request_context_getter_; |
ServiceClient::Delegate* delegate_; |
- scoped_ptr<net::URLFetcher> request_; |
+ std::unique_ptr<net::URLFetcher> request_; |
PendingRequestType pending_request_type_; |
std::string chromoting_hosts_url_; |
}; |
@@ -145,7 +146,8 @@ void ServiceClient::Core::HandleResponse(const net::URLFetcher* source) { |
{ |
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); |
base::DictionaryValue *dict; |
std::string code; |
if (message_value.get() && |