Convert Pass()→std::move() in //components/[a-m]*

BUG=557422
R=avi@chromium.org
TBR=jochen@chromium.org

Review URL: https://codereview.chromium.org/1548193002

Cr-Commit-Position: refs/heads/master@{#366906}

12 files changed, 57 insertions, 57 deletions

diff --git a/components/domain_reliability/beacon.cc b/components/domain_reliability/beacon.cc
index 1742158..fb176cb 100644
--- a/components/domain_reliability/beacon.cc
+++ b/components/domain_reliability/beacon.cc
@@ -4,6 +4,8 @@
 
 #include "components/domain_reliability/beacon.h"
 
+#include <utility>
+
 #include "base/values.h"
 #include "components/domain_reliability/util.h"
 #include "net/base/net_errors.h"
@@ -47,7 +49,7 @@ scoped_ptr<Value> DomainReliabilityBeacon::ToValue(
   bool network_changed = last_network_change_time > start_time;
   beacon_value->SetBoolean("network_changed", network_changed);
   beacon_value->SetDouble("sample_rate", sample_rate);
-  return beacon_value.Pass();
+  return std::move(beacon_value);
 }
 
 }  // namespace domain_reliability
diff --git a/components/domain_reliability/config.cc b/components/domain_reliability/config.cc
index dc47345..c5715e0 100644
--- a/components/domain_reliability/config.cc
+++ b/components/domain_reliability/config.cc
@@ -10,6 +10,7 @@
 #include "components/domain_reliability/config.h"
 
 #include <stdint.h>
+#include <utility>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_value_converter.h"
@@ -57,7 +58,7 @@ scoped_ptr<const DomainReliabilityConfig> DomainReliabilityConfig::FromJSON(
 
   // If we can parse and convert the JSON into a valid config, return that.
   if (value && converter.Convert(*value, config.get()) && config->IsValid())
-    return config.Pass();
+    return std::move(config);
   return scoped_ptr<const DomainReliabilityConfig>();
 }
 
diff --git a/components/domain_reliability/config_unittest.cc b/components/domain_reliability/config_unittest.cc
index ca4904c..8af3258 100644
--- a/components/domain_reliability/config_unittest.cc
+++ b/components/domain_reliability/config_unittest.cc
@@ -29,7 +29,7 @@ scoped_ptr<DomainReliabilityConfig> MakeSampleConfig() {
   config->path_prefixes.push_back(new std::string("/css/"));
   config->path_prefixes.push_back(new std::string("/js/"));
   EXPECT_TRUE(config->IsValid());
-  return config.Pass();
+  return config;
 }
 
 class DomainReliabilityConfigTest : public testing::Test { };
diff --git a/components/domain_reliability/context.cc b/components/domain_reliability/context.cc
index 0615259..3dc324d 100644
--- a/components/domain_reliability/context.cc
+++ b/components/domain_reliability/context.cc
@@ -5,6 +5,7 @@
 #include "components/domain_reliability/context.h"
 
 #include <algorithm>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
@@ -48,7 +49,7 @@ DomainReliabilityContext::DomainReliabilityContext(
     DomainReliabilityDispatcher* dispatcher,
     DomainReliabilityUploader* uploader,
     scoped_ptr<const DomainReliabilityConfig> config)
-    : config_(config.Pass()),
+    : config_(std::move(config)),
       time_(time),
       upload_reporter_string_(upload_reporter_string),
       scheduler_(time,
@@ -60,8 +61,7 @@ DomainReliabilityContext::DomainReliabilityContext(
       uploader_(uploader),
       uploading_beacons_size_(0),
       last_network_change_time_(last_network_change_time),
-      weak_factory_(this) {
-}
+      weak_factory_(this) {}
 
 DomainReliabilityContext::~DomainReliabilityContext() {
   ClearBeacons();
@@ -216,7 +216,7 @@ scoped_ptr<const Value> DomainReliabilityContext::CreateReport(
   report_value->Set("entries", beacons_value.release());
 
   *max_upload_depth_out = max_upload_depth;
-  return report_value.Pass();
+  return std::move(report_value);
 }
 
 void DomainReliabilityContext::MarkUpload() {
diff --git a/components/domain_reliability/context_manager.cc b/components/domain_reliability/context_manager.cc
index 4328f66..98fe6a9 100644
--- a/components/domain_reliability/context_manager.cc
+++ b/components/domain_reliability/context_manager.cc
@@ -4,6 +4,8 @@
 
 #include "components/domain_reliability/context_manager.h"
 
+#include <utility>
+
 namespace domain_reliability {
 
 DomainReliabilityContextManager::DomainReliabilityContextManager(
@@ -21,7 +23,7 @@ void DomainReliabilityContextManager::RouteBeacon(
   if (!context)
     return;
 
-  context->OnBeacon(beacon.Pass());
+  context->OnBeacon(std::move(beacon));
 }
 
 void DomainReliabilityContextManager::ClearBeaconsInAllContexts() {
@@ -39,7 +41,7 @@ DomainReliabilityContext* DomainReliabilityContextManager::AddContextForConfig(
 
   std::string domain = wildcard_prefix + config->origin.host();
   scoped_ptr<DomainReliabilityContext> context =
-      context_factory_->CreateContextForConfig(config.Pass());
+      context_factory_->CreateContextForConfig(std::move(config));
   DomainReliabilityContext** entry = &contexts_[domain];
   if (*entry)
     delete *entry;
@@ -57,7 +59,7 @@ scoped_ptr<base::Value> DomainReliabilityContextManager::GetWebUIData() const {
   scoped_ptr<base::ListValue> contexts_value(new base::ListValue());
   for (const auto& context_entry : contexts_)
     contexts_value->Append(context_entry.second->GetWebUIData().release());
-  return contexts_value.Pass();
+  return std::move(contexts_value);
 }
 
 DomainReliabilityContext* DomainReliabilityContextManager::GetContextForHost(
diff --git a/components/domain_reliability/context_unittest.cc b/components/domain_reliability/context_unittest.cc
index 6789e10..3c83b35 100644
--- a/components/domain_reliability/context_unittest.cc
+++ b/components/domain_reliability/context_unittest.cc
@@ -5,9 +5,9 @@
 #include "components/domain_reliability/context.h"
 
 #include <stddef.h>
-
 #include <map>
 #include <string>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
@@ -48,7 +48,7 @@ scoped_ptr<DomainReliabilityBeacon> MakeCustomizedBeacon(
   beacon->start_time = time->NowTicks() - beacon->elapsed;
   beacon->upload_depth = 0;
   beacon->sample_rate = 1.0;
-  return beacon.Pass();
+  return beacon;
 }
 
 scoped_ptr<DomainReliabilityBeacon> MakeBeacon(MockableTime* time) {
@@ -105,13 +105,8 @@ class DomainReliabilityContextTest : public testing::Test {
 
   void InitContext(scoped_ptr<const DomainReliabilityConfig> config) {
     context_.reset(new DomainReliabilityContext(
-        &time_,
-        params_,
-        upload_reporter_string_,
-        &last_network_change_time_,
-        &dispatcher_,
-        &uploader_,
-        config.Pass()));
+        &time_, params_, upload_reporter_string_, &last_network_change_time_,
+        &dispatcher_, &uploader_, std::move(config)));
   }
 
   TimeDelta min_delay() const { return params_.minimum_upload_delay; }
@@ -196,7 +191,7 @@ TEST_F(DomainReliabilityContextTest, MaxNestedBeaconSchedules) {
   GURL url("http://example/always_report");
   scoped_ptr<DomainReliabilityBeacon> beacon = MakeBeacon(&time_);
   beacon->upload_depth = DomainReliabilityContext::kMaxUploadDepthToSchedule;
-  context_->OnBeacon(beacon.Pass());
+  context_->OnBeacon(std::move(beacon));
 
   BeaconVector beacons;
   context_->GetQueuedBeaconsForTesting(&beacons);
@@ -212,7 +207,7 @@ TEST_F(DomainReliabilityContextTest, OverlyNestedBeaconDoesNotSchedule) {
   scoped_ptr<DomainReliabilityBeacon> beacon = MakeBeacon(&time_);
   beacon->upload_depth =
       DomainReliabilityContext::kMaxUploadDepthToSchedule + 1;
-  context_->OnBeacon(beacon.Pass());
+  context_->OnBeacon(std::move(beacon));
 
   BeaconVector beacons;
   context_->GetQueuedBeaconsForTesting(&beacons);
@@ -229,7 +224,7 @@ TEST_F(DomainReliabilityContextTest,
   scoped_ptr<DomainReliabilityBeacon> beacon = MakeBeacon(&time_);
   beacon->upload_depth =
       DomainReliabilityContext::kMaxUploadDepthToSchedule + 1;
-  context_->OnBeacon(beacon.Pass());
+  context_->OnBeacon(std::move(beacon));
 
   BeaconVector beacons;
   context_->GetQueuedBeaconsForTesting(&beacons);
@@ -242,7 +237,7 @@ TEST_F(DomainReliabilityContextTest,
   // doesn't schedule until the deadline.
   beacon = MakeBeacon(&time_);
   beacon->upload_depth = DomainReliabilityContext::kMaxUploadDepthToSchedule;
-  context_->OnBeacon(beacon.Pass());
+  context_->OnBeacon(std::move(beacon));
 
   context_->GetQueuedBeaconsForTesting(&beacons);
   EXPECT_EQ(2u, beacons.size());
@@ -417,7 +412,7 @@ TEST_F(DomainReliabilityContextTest,
 TEST_F(DomainReliabilityContextTest, ZeroSampleRate) {
   scoped_ptr<DomainReliabilityConfig> config(MakeTestConfig());
   config->failure_sample_rate = 0.0;
-  InitContext(config.Pass());
+  InitContext(std::move(config));
 
   BeaconVector beacons;
   for (int i = 0; i < 100; i++) {
@@ -429,7 +424,7 @@ TEST_F(DomainReliabilityContextTest, ZeroSampleRate) {
 TEST_F(DomainReliabilityContextTest, FractionalSampleRate) {
   scoped_ptr<DomainReliabilityConfig> config(MakeTestConfig());
   config->failure_sample_rate = 0.5;
-  InitContext(config.Pass());
+  InitContext(std::move(config));
 
   BeaconVector beacons;
   do {
@@ -459,7 +454,7 @@ TEST_F(DomainReliabilityContextTest, FailureSampleOnly) {
   scoped_ptr<DomainReliabilityConfig> config(MakeTestConfig());
   config->success_sample_rate = 0.0;
   config->failure_sample_rate = 1.0;
-  InitContext(config.Pass());
+  InitContext(std::move(config));
 
   BeaconVector beacons;
 
@@ -470,7 +465,7 @@ TEST_F(DomainReliabilityContextTest, FailureSampleOnly) {
   scoped_ptr<DomainReliabilityBeacon> beacon(MakeBeacon(&time_));
   beacon->status = "ok";
   beacon->chrome_error = net::OK;
-  context_->OnBeacon(beacon.Pass());
+  context_->OnBeacon(std::move(beacon));
   context_->GetQueuedBeaconsForTesting(&beacons);
   EXPECT_EQ(1u, beacons.size());
 }
@@ -479,7 +474,7 @@ TEST_F(DomainReliabilityContextTest, SuccessSampleOnly) {
   scoped_ptr<DomainReliabilityConfig> config(MakeTestConfig());
   config->success_sample_rate = 1.0;
   config->failure_sample_rate = 0.0;
-  InitContext(config.Pass());
+  InitContext(std::move(config));
 
   BeaconVector beacons;
 
@@ -490,7 +485,7 @@ TEST_F(DomainReliabilityContextTest, SuccessSampleOnly) {
   scoped_ptr<DomainReliabilityBeacon> beacon(MakeBeacon(&time_));
   beacon->status = "ok";
   beacon->chrome_error = net::OK;
-  context_->OnBeacon(beacon.Pass());
+  context_->OnBeacon(std::move(beacon));
   context_->GetQueuedBeaconsForTesting(&beacons);
   EXPECT_EQ(1u, beacons.size());
 }
@@ -499,7 +494,7 @@ TEST_F(DomainReliabilityContextTest, SampleAllBeacons) {
   scoped_ptr<DomainReliabilityConfig> config(MakeTestConfig());
   config->success_sample_rate = 1.0;
   config->failure_sample_rate = 1.0;
-  InitContext(config.Pass());
+  InitContext(std::move(config));
 
   BeaconVector beacons;
 
@@ -510,7 +505,7 @@ TEST_F(DomainReliabilityContextTest, SampleAllBeacons) {
   scoped_ptr<DomainReliabilityBeacon> beacon(MakeBeacon(&time_));
   beacon->status = "ok";
   beacon->chrome_error = net::OK;
-  context_->OnBeacon(beacon.Pass());
+  context_->OnBeacon(std::move(beacon));
   context_->GetQueuedBeaconsForTesting(&beacons);
   EXPECT_EQ(2u, beacons.size());
 }
@@ -519,7 +514,7 @@ TEST_F(DomainReliabilityContextTest, SampleNoBeacons) {
   scoped_ptr<DomainReliabilityConfig> config(MakeTestConfig());
   config->success_sample_rate = 0.0;
   config->failure_sample_rate = 0.0;
-  InitContext(config.Pass());
+  InitContext(std::move(config));
 
   BeaconVector beacons;
 
@@ -530,7 +525,7 @@ TEST_F(DomainReliabilityContextTest, SampleNoBeacons) {
   scoped_ptr<DomainReliabilityBeacon> beacon(MakeBeacon(&time_));
   beacon->status = "ok";
   beacon->chrome_error = net::OK;
-  context_->OnBeacon(beacon.Pass());
+  context_->OnBeacon(std::move(beacon));
   context_->GetQueuedBeaconsForTesting(&beacons);
   EXPECT_EQ(0u, beacons.size());
 }
diff --git a/components/domain_reliability/dispatcher.cc b/components/domain_reliability/dispatcher.cc
index 6b631c2d..5d0ed1e 100644
--- a/components/domain_reliability/dispatcher.cc
+++ b/components/domain_reliability/dispatcher.cc
@@ -4,6 +4,8 @@
 
 #include "components/domain_reliability/dispatcher.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
@@ -32,7 +34,7 @@ DomainReliabilityDispatcher::Task::Task(const base::Closure& closure,
                                         base::TimeDelta min_delay,
                                         base::TimeDelta max_delay)
     : closure(closure),
-      timer(timer.Pass()),
+      timer(std::move(timer)),
       min_delay(min_delay),
       max_delay(max_delay),
       eligible(false) {}
diff --git a/components/domain_reliability/google_configs.cc b/components/domain_reliability/google_configs.cc
index 7a4457f..6582a08 100644
--- a/components/domain_reliability/google_configs.cc
+++ b/components/domain_reliability/google_configs.cc
@@ -521,7 +521,7 @@ CreateGoogleConfig(const GoogleConfigParams& params, bool is_www) {
   config->success_sample_rate = 0.05;
   config->failure_sample_rate = 1.00;
   config->path_prefixes.clear();
-  return config.Pass();
+  return config;
 }
 
 }  // namespace
diff --git a/components/domain_reliability/monitor.cc b/components/domain_reliability/monitor.cc
index e4f1cb9..b6337ef 100644
--- a/components/domain_reliability/monitor.cc
+++ b/components/domain_reliability/monitor.cc
@@ -4,6 +4,8 @@
 
 #include "components/domain_reliability/monitor.h"
 
+#include <utility>
+
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/profiler/scoped_tracker.h"
@@ -63,7 +65,7 @@ scoped_ptr<DomainReliabilityBeacon> CreateBeaconFromAttempt(
     beacon->server_ip = attempt.endpoint.ToString();
   else
     beacon->server_ip = "";
-  return beacon.Pass();
+  return beacon;
 }
 
 }  // namespace
@@ -92,7 +94,7 @@ DomainReliabilityMonitor::DomainReliabilityMonitor(
     const scoped_refptr<base::SingleThreadTaskRunner>& pref_thread,
     const scoped_refptr<base::SingleThreadTaskRunner>& network_thread,
     scoped_ptr<MockableTime> time)
-    : time_(time.Pass()),
+    : time_(std::move(time)),
       upload_reporter_string_(upload_reporter_string),
       scheduler_params_(
           DomainReliabilityScheduler::Params::GetFromFieldTrialsOrDefaults()),
@@ -162,7 +164,7 @@ void DomainReliabilityMonitor::AddBakedInConfigs() {
                     << json;
       continue;
     }
-    context_manager_.AddContextForConfig(config.Pass());
+    context_manager_.AddContextForConfig(std::move(config));
   }
 
   std::vector<DomainReliabilityConfig*> google_configs;
@@ -231,14 +233,14 @@ scoped_ptr<base::Value> DomainReliabilityMonitor::GetWebUIData() const {
 
   scoped_ptr<base::DictionaryValue> data_value(new base::DictionaryValue());
   data_value->Set("contexts", context_manager_.GetWebUIData());
-  return data_value.Pass();
+  return std::move(data_value);
 }
 
 DomainReliabilityContext* DomainReliabilityMonitor::AddContextForTesting(
     scoped_ptr<const DomainReliabilityConfig> config) {
   DCHECK(OnNetworkThread());
 
-  return context_manager_.AddContextForConfig(config.Pass());
+  return context_manager_.AddContextForConfig(std::move(config));
 }
 
 scoped_ptr<DomainReliabilityContext>
@@ -249,13 +251,9 @@ DomainReliabilityMonitor::CreateContextForConfig(
   DCHECK(config->IsValid());
 
   return make_scoped_ptr(new DomainReliabilityContext(
-      time_.get(),
-      scheduler_params_,
-      upload_reporter_string_,
-      &last_network_change_time_,
-      &dispatcher_,
-      uploader_.get(),
-      config.Pass()));
+      time_.get(), scheduler_params_, upload_reporter_string_,
+      &last_network_change_time_, &dispatcher_, uploader_.get(),
+      std::move(config)));
 }
 
 DomainReliabilityMonitor::RequestInfo::RequestInfo() {}
@@ -339,7 +337,7 @@ void DomainReliabilityMonitor::OnRequestLegComplete(
     scoped_ptr<DomainReliabilityBeacon> beacon =
         CreateBeaconFromAttempt(beacon_template, attempt);
     if (beacon)
-      context_manager_.RouteBeacon(beacon.Pass());
+      context_manager_.RouteBeacon(std::move(beacon));
   }
 
   if (url_request_attempt_is_duplicate)
@@ -348,7 +346,7 @@ void DomainReliabilityMonitor::OnRequestLegComplete(
   scoped_ptr<DomainReliabilityBeacon> beacon =
       CreateBeaconFromAttempt(beacon_template, url_request_attempt);
   if (beacon)
-    context_manager_.RouteBeacon(beacon.Pass());
+    context_manager_.RouteBeacon(std::move(beacon));
 }
 
 base::WeakPtr<DomainReliabilityMonitor>
diff --git a/components/domain_reliability/monitor_unittest.cc b/components/domain_reliability/monitor_unittest.cc
index 56b0f58..27eaea0 100644
--- a/components/domain_reliability/monitor_unittest.cc
+++ b/components/domain_reliability/monitor_unittest.cc
@@ -5,9 +5,9 @@
 #include "components/domain_reliability/monitor.h"
 
 #include <stddef.h>
-
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ -95,7 +95,7 @@ class DomainReliabilityMonitorTest : public testing::Test {
     scoped_ptr<DomainReliabilityConfig> config(
         MakeTestConfigWithOrigin(origin));
     config->include_subdomains = wildcard;
-    return monitor_.AddContextForTesting(config.Pass());
+    return monitor_.AddContextForTesting(std::move(config));
   }
 
   scoped_refptr<base::TestSimpleTaskRunner> pref_task_runner_;
@@ -207,7 +207,7 @@ TEST_F(DomainReliabilityMonitorTest,
   scoped_ptr<DomainReliabilityConfig> config = MakeTestConfig();
   config->success_sample_rate = 1.0;
   DomainReliabilityContext* context =
-      monitor_.AddContextForTesting(config.Pass());
+      monitor_.AddContextForTesting(std::move(config));
 
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/");
diff --git a/components/domain_reliability/scheduler.cc b/components/domain_reliability/scheduler.cc
index 44d5cfb..79ed191 100644
--- a/components/domain_reliability/scheduler.cc
+++ b/components/domain_reliability/scheduler.cc
@@ -5,8 +5,8 @@
 #include "components/domain_reliability/scheduler.h"
 
 #include <stdint.h>
-
 #include <algorithm>
+#include <utility>
 
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
@@ -180,7 +180,7 @@ scoped_ptr<base::Value> DomainReliabilityScheduler::GetWebUIData() const {
     last->SetInteger("collector_index",
         static_cast<int>(last_upload_collector_index_));
     last->SetBoolean("success", last_upload_success_);
-    data->Set("last_upload", last.Pass());
+    data->Set("last_upload", std::move(last));
   }
 
   scoped_ptr<base::ListValue> collectors_value(new base::ListValue());
@@ -192,9 +192,9 @@ scoped_ptr<base::Value> DomainReliabilityScheduler::GetWebUIData() const {
     // Using release instead of Pass because Pass can't implicitly upcast.
     collectors_value->Append(value.release());
   }
-  data->Set("collectors", collectors_value.Pass());
+  data->Set("collectors", std::move(collectors_value));
 
-  return data.Pass();
+  return std::move(data);
 }
 
 void DomainReliabilityScheduler::MakeDeterministicForTesting() {
diff --git a/components/domain_reliability/service.cc b/components/domain_reliability/service.cc
index 4253f45..1d44453 100644
--- a/components/domain_reliability/service.cc
+++ b/components/domain_reliability/service.cc
@@ -52,7 +52,7 @@ class DomainReliabilityServiceImpl : public DomainReliabilityService {
     monitor_ = monitor->MakeWeakPtr();
     network_task_runner_ = network_task_runner;
 
-    return monitor.Pass();
+    return monitor;
   }
 
   void ClearBrowsingData(DomainReliabilityClearMode clear_mode,