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

Unified Diff: google_apis/gcm/engine/connection_factory_impl.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/connection_factory_impl.h
diff --git a/google_apis/gcm/engine/connection_factory_impl.h b/google_apis/gcm/engine/connection_factory_impl.h
index 26bc1de29724b66e5e9991b555341d126021d86f..2815337b6d892d7b06b5a4fc11124537eea08020 100644
--- a/google_apis/gcm/engine/connection_factory_impl.h
+++ b/google_apis/gcm/engine/connection_factory_impl.h
@@ -90,12 +90,12 @@ class GCM_EXPORT ConnectionFactoryImpl :
// Helper method for creating a backoff entry.
// Virtual for testing.
- virtual scoped_ptr<net::BackoffEntry> CreateBackoffEntry(
+ virtual std::unique_ptr<net::BackoffEntry> CreateBackoffEntry(
const net::BackoffEntry::Policy* const policy);
// Helper method for creating the connection handler.
// Virtual for testing.
- virtual scoped_ptr<ConnectionHandler> CreateConnectionHandler(
+ virtual std::unique_ptr<ConnectionHandler> CreateConnectionHandler(
base::TimeDelta read_timeout,
const ConnectionHandler::ProtoReceivedCallback& read_callback,
const ConnectionHandler::ProtoSentCallback& write_callback,
@@ -154,10 +154,10 @@ class GCM_EXPORT ConnectionFactoryImpl :
// The handle to the socket for the current connection, if one exists.
net::ClientSocketHandle socket_handle_;
// Current backoff entry.
- scoped_ptr<net::BackoffEntry> backoff_entry_;
+ std::unique_ptr<net::BackoffEntry> backoff_entry_;
// Backoff entry from previous connection attempt. Updated on each login
// completion.
- scoped_ptr<net::BackoffEntry> previous_backoff_;
+ std::unique_ptr<net::BackoffEntry> previous_backoff_;
// Whether a connection attempt is currently actively in progress.
bool connecting_;
@@ -187,7 +187,7 @@ class GCM_EXPORT ConnectionFactoryImpl :
ConnectionHandler::ProtoSentCallback write_callback_;
// The current connection handler, if one exists.
- scoped_ptr<ConnectionHandler> connection_handler_;
+ std::unique_ptr<ConnectionHandler> connection_handler_;
// Builder for generating new login requests.
BuildLoginRequestCallback request_builder_;

Powered by Google App Engine
This is Rietveld 408576698