Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr

chrome/browser/chromeos/policy/system_log_uploader_unittest.cc

Index: chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
diff --git a/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc b/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
index d5bbe14dbc6f4f789805978eda9982ab2d722616..e2cd081c83e79b914675048e1833a60367d34dae 100644
--- a/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
+++ b/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/time/time.h"
@@ -46,7 +47,7 @@ class MockUploadJob : public UploadJob {
   void AddDataSegment(const std::string& name,
                       const std::string& filename,
                       const std::map<std::string, std::string>& header_entries,
-                      scoped_ptr<std::string> data) override;
+                      std::unique_ptr<std::string> data) override;
   void Start() override;
 
  protected:
@@ -71,7 +72,7 @@ void MockUploadJob::AddDataSegment(
     const std::string& name,
     const std::string& filename,
     const std::map<std::string, std::string>& header_entries,
-    scoped_ptr<std::string> data) {
+    std::unique_ptr<std::string> data) {
   // Test all fields to upload.
   EXPECT_LT(file_index_, max_files_);
   EXPECT_GE(file_index_, 0);
@@ -119,14 +120,14 @@ class MockSystemLogDelegate : public SystemLogUploader::Delegate {
   void LoadSystemLogs(const LogUploadCallback& upload_callback) override {
     EXPECT_TRUE(is_upload_allowed_);
     upload_callback.Run(
-        make_scoped_ptr(new SystemLogUploader::SystemLogs(system_logs_)));
+        base::WrapUnique(new SystemLogUploader::SystemLogs(system_logs_)));
   }
 
-  scoped_ptr<UploadJob> CreateUploadJob(
+  std::unique_ptr<UploadJob> CreateUploadJob(
       const GURL& url,
       UploadJob::Delegate* delegate) override {
-    return make_scoped_ptr(new MockUploadJob(url, delegate, is_upload_error_,
-                                             system_logs_.size()));
+    return base::WrapUnique(new MockUploadJob(url, delegate, is_upload_error_,
+                                              system_logs_.size()));
   }
 
   void set_upload_allowed(bool is_upload_allowed) {
@@ -188,7 +189,7 @@ class SystemLogUploaderTest : public testing::Test {
 TEST_F(SystemLogUploaderTest, Basic) {
   EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
 
-  scoped_ptr<MockSystemLogDelegate> syslog_delegate(
+  std::unique_ptr<MockSystemLogDelegate> syslog_delegate(
       new MockSystemLogDelegate(false, SystemLogUploader::SystemLogs()));
   syslog_delegate->set_upload_allowed(false);
   SystemLogUploader uploader(std::move(syslog_delegate), task_runner_);
@@ -200,7 +201,7 @@ TEST_F(SystemLogUploaderTest, Basic) {
 TEST_F(SystemLogUploaderTest, SuccessTest) {
   EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
 
-  scoped_ptr<MockSystemLogDelegate> syslog_delegate(
+  std::unique_ptr<MockSystemLogDelegate> syslog_delegate(
       new MockSystemLogDelegate(false, SystemLogUploader::SystemLogs()));
   syslog_delegate->set_upload_allowed(true);
   settings_helper_.SetBoolean(chromeos::kSystemLogUploadEnabled, true);
@@ -217,7 +218,7 @@ TEST_F(SystemLogUploaderTest, SuccessTest) {
 TEST_F(SystemLogUploaderTest, ThreeFailureTest) {
   EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
 
-  scoped_ptr<MockSystemLogDelegate> syslog_delegate(
+  std::unique_ptr<MockSystemLogDelegate> syslog_delegate(
       new MockSystemLogDelegate(true, SystemLogUploader::SystemLogs()));
   syslog_delegate->set_upload_allowed(true);
   settings_helper_.SetBoolean(chromeos::kSystemLogUploadEnabled, true);
@@ -244,7 +245,7 @@ TEST_F(SystemLogUploaderTest, CheckHeaders) {
   EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
 
   SystemLogUploader::SystemLogs system_logs = GenerateTestSystemLogFiles();
-  scoped_ptr<MockSystemLogDelegate> syslog_delegate(
+  std::unique_ptr<MockSystemLogDelegate> syslog_delegate(
       new MockSystemLogDelegate(false, system_logs));
   syslog_delegate->set_upload_allowed(true);
   settings_helper_.SetBoolean(chromeos::kSystemLogUploadEnabled, true);
@@ -261,7 +262,7 @@ TEST_F(SystemLogUploaderTest, CheckHeaders) {
 TEST_F(SystemLogUploaderTest, DisableLogUpload) {
   EXPECT_TRUE(task_runner_->GetPendingTasks().empty());
 
-  scoped_ptr<MockSystemLogDelegate> syslog_delegate(
+  std::unique_ptr<MockSystemLogDelegate> syslog_delegate(
       new MockSystemLogDelegate(true, SystemLogUploader::SystemLogs()));
   MockSystemLogDelegate* mock_delegate = syslog_delegate.get();
   settings_helper_.SetBoolean(chromeos::kSystemLogUploadEnabled, true);