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

Unified Diff: remoting/test/chromoting_test_driver_environment.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
Index: remoting/test/chromoting_test_driver_environment.cc
diff --git a/remoting/test/chromoting_test_driver_environment.cc b/remoting/test/chromoting_test_driver_environment.cc
index 8a9c3ada35d188995e3ba62d456301192e9bcdbc..0744b23c5026c6be1f09fddbc38ae426a0026e24 100644
--- a/remoting/test/chromoting_test_driver_environment.cc
+++ b/remoting/test/chromoting_test_driver_environment.cc
@@ -56,7 +56,7 @@ bool ChromotingTestDriverEnvironment::Initialize(
// If a unit test has set |test_refresh_token_store_| then we should use it
// below. Note that we do not want to destroy the test object.
- scoped_ptr<RefreshTokenStore> temporary_refresh_token_store;
+ std::unique_ptr<RefreshTokenStore> temporary_refresh_token_store;
RefreshTokenStore* refresh_token_store = test_refresh_token_store_;
if (!refresh_token_store) {
temporary_refresh_token_store =
@@ -199,7 +199,7 @@ bool ChromotingTestDriverEnvironment::RetrieveAccessToken(
// If a unit test has set |test_access_token_fetcher_| then we should use it
// below. Note that we do not want to destroy the test object at the end of
// the function which is why we have the dance below.
- scoped_ptr<AccessTokenFetcher> temporary_access_token_fetcher;
+ std::unique_ptr<AccessTokenFetcher> temporary_access_token_fetcher;
AccessTokenFetcher* access_token_fetcher = test_access_token_fetcher_;
if (!access_token_fetcher) {
temporary_access_token_fetcher.reset(new AccessTokenFetcher());
@@ -227,7 +227,7 @@ bool ChromotingTestDriverEnvironment::RetrieveAccessToken(
if (!refresh_token_.empty()) {
// If a unit test has set |test_refresh_token_store_| then we should use
// it below. Note that we do not want to destroy the test object.
- scoped_ptr<RefreshTokenStore> temporary_refresh_token_store;
+ std::unique_ptr<RefreshTokenStore> temporary_refresh_token_store;
RefreshTokenStore* refresh_token_store = test_refresh_token_store_;
if (!refresh_token_store) {
temporary_refresh_token_store =
@@ -283,7 +283,7 @@ bool ChromotingTestDriverEnvironment::RetrieveHostList() {
// If a unit test has set |test_host_list_fetcher_| then we should use it
// below. Note that we do not want to destroy the test object at the end of
// the function which is why we have the dance below.
- scoped_ptr<HostListFetcher> temporary_host_list_fetcher;
+ std::unique_ptr<HostListFetcher> temporary_host_list_fetcher;
HostListFetcher* host_list_fetcher = test_host_list_fetcher_;
if (!host_list_fetcher) {
temporary_host_list_fetcher.reset(new HostListFetcher());
« no previous file with comments | « remoting/test/chromoting_test_driver_environment.h ('k') | remoting/test/chromoting_test_driver_environment_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698