Index: remoting/host/gcd_rest_client.h |
diff --git a/remoting/host/gcd_rest_client.h b/remoting/host/gcd_rest_client.h |
index 40c6d0be89174686a595afaae3830dcfcbd14d90..5a9f41e8e9601c0a213d511998745135106560f4 100644 |
--- a/remoting/host/gcd_rest_client.h |
+++ b/remoting/host/gcd_rest_client.h |
@@ -5,11 +5,11 @@ |
#ifndef REMOTING_HOST_GCD_REST_CLIENT_H_ |
#define REMOTING_HOST_GCD_REST_CLIENT_H_ |
+#include <memory> |
#include <queue> |
#include "base/callback.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/time/clock.h" |
#include "net/url_request/url_fetcher_delegate.h" |
#include "remoting/base/url_request_context_getter.h" |
@@ -50,10 +50,10 @@ class GcdRestClient : public net::URLFetcherDelegate { |
// Sends a 'patchState' request to the GCD API. Constructs and |
// sends an appropriate JSON message M where |patch_details| becomes |
// the value of M.patches[0].patch. |
- void PatchState(scoped_ptr<base::DictionaryValue> patch_details, |
+ void PatchState(std::unique_ptr<base::DictionaryValue> patch_details, |
const GcdRestClient::ResultCallback& callback); |
- void SetClockForTest(scoped_ptr<base::Clock> clock); |
+ void SetClockForTest(std::unique_ptr<base::Clock> clock); |
private: |
void OnTokenReceived(OAuthTokenGetter::Status status, |
@@ -68,8 +68,8 @@ class GcdRestClient : public net::URLFetcherDelegate { |
std::string gcd_device_id_; |
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_; |
OAuthTokenGetter* token_getter_; |
- scoped_ptr<base::Clock> clock_; |
- scoped_ptr<net::URLFetcher> url_fetcher_; |
+ std::unique_ptr<base::Clock> clock_; |
+ std::unique_ptr<net::URLFetcher> url_fetcher_; |
ResultCallback callback_; |
DISALLOW_COPY_AND_ASSIGN(GcdRestClient); |