Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(502)

Unified Diff: remoting/host/setup/service_client.cc

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/setup/me2me_native_messaging_host_unittest.cc ('k') | remoting/host/setup/start_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() &&
« no previous file with comments | « remoting/host/setup/me2me_native_messaging_host_unittest.cc ('k') | remoting/host/setup/start_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698