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

Unified Diff: google_apis/gcm/engine/registration_request.h

Issue 1873663002: Convert //google_apis from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: google_apis/gcm/engine/registration_request.h
diff --git a/google_apis/gcm/engine/registration_request.h b/google_apis/gcm/engine/registration_request.h
index 14427a70626b8c25b6fea2ff92492872d2bbc55a..cb45c974a6664372c4bfe581ba8ed1b7dc67212e 100644
--- a/google_apis/gcm/engine/registration_request.h
+++ b/google_apis/gcm/engine/registration_request.h
@@ -8,13 +8,13 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <string>
#include <vector>
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "google_apis/gcm/base/gcm_export.h"
@@ -99,7 +99,7 @@ class GCM_EXPORT RegistrationRequest : public net::URLFetcherDelegate {
RegistrationRequest(
const GURL& registration_url,
const RequestInfo& request_info,
- scoped_ptr<CustomRequestHandler> custom_request_handler,
+ std::unique_ptr<CustomRequestHandler> custom_request_handler,
const net::BackoffEntry::Policy& backoff_policy,
const RegistrationCallback& callback,
int max_retry_count,
@@ -126,12 +126,12 @@ class GCM_EXPORT RegistrationRequest : public net::URLFetcherDelegate {
RegistrationCallback callback_;
RequestInfo request_info_;
- scoped_ptr<CustomRequestHandler> custom_request_handler_;
+ std::unique_ptr<CustomRequestHandler> custom_request_handler_;
GURL registration_url_;
net::BackoffEntry backoff_entry_;
scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
- scoped_ptr<net::URLFetcher> url_fetcher_;
+ std::unique_ptr<net::URLFetcher> url_fetcher_;
int retries_left_;
base::TimeTicks request_start_time_;

Powered by Google App Engine
This is Rietveld 408576698