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

Unified Diff: remoting/test/app_remoting_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/app_remoting_test_driver_environment.cc
diff --git a/remoting/test/app_remoting_test_driver_environment.cc b/remoting/test/app_remoting_test_driver_environment.cc
index 9e8b2f59285bd3e41769b7a7d28a3cb253f6c2e3..1ef1b9c338620503b20daad2525e3008fc216344 100644
--- a/remoting/test/app_remoting_test_driver_environment.cc
+++ b/remoting/test/app_remoting_test_driver_environment.cc
@@ -59,7 +59,7 @@ bool AppRemotingTestDriverEnvironment::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 =
@@ -118,7 +118,7 @@ bool AppRemotingTestDriverEnvironment::GetRemoteHostInfoForApplicationId(
// If a unit test has set |test_remote_host_info_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<RemoteHostInfoFetcher> temporary_remote_host_info_fetcher;
+ std::unique_ptr<RemoteHostInfoFetcher> temporary_remote_host_info_fetcher;
RemoteHostInfoFetcher* remote_host_info_fetcher =
test_remote_host_info_fetcher_;
if (!remote_host_info_fetcher) {
@@ -228,7 +228,7 @@ void AppRemotingTestDriverEnvironment::TearDown() {
// If a unit test has set |test_app_remoting_report_issue_request_| 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<AppRemotingReportIssueRequest> temporary_report_issue_request;
+ std::unique_ptr<AppRemotingReportIssueRequest> temporary_report_issue_request;
AppRemotingReportIssueRequest* report_issue_request =
test_app_remoting_report_issue_request_;
if (!report_issue_request) {
@@ -279,7 +279,7 @@ bool AppRemotingTestDriverEnvironment::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());
@@ -307,7 +307,7 @@ bool AppRemotingTestDriverEnvironment::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 =
« no previous file with comments | « remoting/test/app_remoting_test_driver_environment.h ('k') | remoting/test/app_remoting_test_driver_environment_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698