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

Unified Diff: components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc

Issue 1902633006: Convert //components/policy from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and use namespace alias 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: components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc
diff --git a/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc b/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc
index 3d93f8f3da1c1be90e3c693c4d807639e44f77c6..2905615315eb31f3e1ec978dd733b7ab82d4ed1a 100644
--- a/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc
+++ b/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc
@@ -48,21 +48,21 @@ class ExternalPolicyDataFetcherTest : public testing::Test {
void OnJobFinished(int job_index,
ExternalPolicyDataFetcher::Result result,
- scoped_ptr<std::string> data);
+ std::unique_ptr<std::string> data);
int GetAndResetCallbackCount();
net::TestURLFetcherFactory fetcher_factory_;
scoped_refptr<base::TestSimpleTaskRunner> owner_task_runner_;
scoped_refptr<base::TestSimpleTaskRunner> io_task_runner_;
- scoped_ptr<ExternalPolicyDataFetcherBackend> fetcher_backend_;
- scoped_ptr<ExternalPolicyDataFetcher> fetcher_;
+ std::unique_ptr<ExternalPolicyDataFetcherBackend> fetcher_backend_;
+ std::unique_ptr<ExternalPolicyDataFetcher> fetcher_;
std::map<int, ExternalPolicyDataFetcher::Job*> jobs_; // Not owned.
int callback_count_;
int callback_job_index_;
ExternalPolicyDataFetcher::Result callback_result_;
- scoped_ptr<std::string> callback_data_;
+ std::unique_ptr<std::string> callback_data_;
private:
DISALLOW_COPY_AND_ASSIGN(ExternalPolicyDataFetcherTest);
@@ -107,7 +107,7 @@ void ExternalPolicyDataFetcherTest::CancelJob(int index) {
void ExternalPolicyDataFetcherTest::OnJobFinished(
int job_index,
ExternalPolicyDataFetcher::Result result,
- scoped_ptr<std::string> data) {
+ std::unique_ptr<std::string> data) {
++callback_count_;
callback_job_index_ = job_index;
callback_result_ = result;

Powered by Google App Engine
This is Rietveld 408576698