Convert //components/[o-t]* from scoped_ptr to std::unique_ptr

components/rappor/test_rappor_service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/rappor/test_rappor_service.h"
 
 #include <utility>
 
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "components/rappor/byte_vector_utils.h"
 #include "components/rappor/proto/rappor_metric.pb.h"
 #include "components/rappor/rappor_parameters.h"
 #include "components/rappor/rappor_prefs.h"
 #include "components/rappor/test_log_uploader.h"
 
 namespace rappor {
 
 namespace {
 
@@ skipping 30 matching lines @@
 }
 
 TestSample::Shadow::~Shadow() {}
 
 TestRapporService::TestRapporService()
     : RapporService(&test_prefs_, base::Bind(&MockIsIncognito, &is_incognito_)),
       next_rotation_(base::TimeDelta()),
       is_incognito_(false) {
   RegisterPrefs(test_prefs_.registry());
   test_uploader_ = new TestLogUploader();
-  InitializeInternal(make_scoped_ptr(test_uploader_),
-                     0,
+  InitializeInternal(base::WrapUnique(test_uploader_), 0,
                      HmacByteVectorGenerator::GenerateEntropyInput());
   Update(UMA_RAPPOR_GROUP | SAFEBROWSING_RAPPOR_GROUP, true);
 }
 
 TestRapporService::~TestRapporService() {}
 
-scoped_ptr<Sample> TestRapporService::CreateSample(RapporType type) {
-  scoped_ptr<TestSample> test_sample(new TestSample(type));
+std::unique_ptr<Sample> TestRapporService::CreateSample(RapporType type) {
+  std::unique_ptr<TestSample> test_sample(new TestSample(type));
   return std::move(test_sample);
 }
 
 // Intercepts the sample being recorded and saves it in a test structure.
 void TestRapporService::RecordSampleObj(const std::string& metric_name,
-                                        scoped_ptr<Sample> sample) {
+                                        std::unique_ptr<Sample> sample) {
   TestSample* test_sample = static_cast<TestSample*>(sample.get());
   // Erase the previous sample if we logged one.
   shadows_.erase(metric_name);
   shadows_.insert(std::pair<std::string, TestSample::Shadow>(
       metric_name, test_sample->GetShadow()));
   // Original version is still called.
   RapporService::RecordSampleObj(metric_name, std::move(sample));
 }
 
 void TestRapporService::RecordSample(const std::string& metric_name,
@@ skipping 42 matching lines @@
 void TestRapporService::CancelNextLogRotation() {
   next_rotation_ = base::TimeDelta();
 }
 
 // Schedule the next call to OnLogInterval.
 void TestRapporService::ScheduleNextLogRotation(base::TimeDelta interval) {
   next_rotation_ = interval;
 }
 
 }  // namespace rappor