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

Side by Side Diff: chrome/browser/chromeos/policy/system_log_uploader_unittest.cc

Issue 2257103002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/policy/system_log_uploader.h" 5 #include "chrome/browser/chromeos/policy/system_log_uploader.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 class MockSystemLogDelegate : public SystemLogUploader::Delegate { 113 class MockSystemLogDelegate : public SystemLogUploader::Delegate {
114 public: 114 public:
115 MockSystemLogDelegate(bool is_upload_error, 115 MockSystemLogDelegate(bool is_upload_error,
116 const SystemLogUploader::SystemLogs& system_logs) 116 const SystemLogUploader::SystemLogs& system_logs)
117 : is_upload_error_(is_upload_error), system_logs_(system_logs) {} 117 : is_upload_error_(is_upload_error), system_logs_(system_logs) {}
118 ~MockSystemLogDelegate() override {} 118 ~MockSystemLogDelegate() override {}
119 119
120 void LoadSystemLogs(const LogUploadCallback& upload_callback) override { 120 void LoadSystemLogs(const LogUploadCallback& upload_callback) override {
121 EXPECT_TRUE(is_upload_allowed_); 121 EXPECT_TRUE(is_upload_allowed_);
122 upload_callback.Run( 122 upload_callback.Run(
123 base::WrapUnique(new SystemLogUploader::SystemLogs(system_logs_))); 123 base::MakeUnique<SystemLogUploader::SystemLogs>(system_logs_));
124 } 124 }
125 125
126 std::unique_ptr<UploadJob> CreateUploadJob( 126 std::unique_ptr<UploadJob> CreateUploadJob(
127 const GURL& url, 127 const GURL& url,
128 UploadJob::Delegate* delegate) override { 128 UploadJob::Delegate* delegate) override {
129 return base::WrapUnique(new MockUploadJob(url, delegate, is_upload_error_, 129 return base::MakeUnique<MockUploadJob>(url, delegate, is_upload_error_,
130 system_logs_.size())); 130 system_logs_.size());
131 } 131 }
132 132
133 void set_upload_allowed(bool is_upload_allowed) { 133 void set_upload_allowed(bool is_upload_allowed) {
134 is_upload_allowed_ = is_upload_allowed; 134 is_upload_allowed_ = is_upload_allowed;
135 } 135 }
136 136
137 private: 137 private:
138 bool is_upload_allowed_; 138 bool is_upload_allowed_;
139 bool is_upload_error_; 139 bool is_upload_error_;
140 SystemLogUploader::SystemLogs system_logs_; 140 SystemLogUploader::SystemLogs system_logs_;
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 "<IPv4: 1>55\n" 311 "<IPv4: 1>55\n"
312 "aaaa<IPv4: 2>aaa\n" 312 "aaaa<IPv4: 2>aaa\n"
313 "11:11;<IPv6: 1>\n" 313 "11:11;<IPv6: 1>\n"
314 "<IPv6: 1>\n" 314 "<IPv6: 1>\n"
315 "11:11:abcdef:0:0:0:0:0\n" 315 "11:11:abcdef:0:0:0:0:0\n"
316 "aa:aa:aa:00:00:01"; 316 "aa:aa:aa:00:00:01";
317 EXPECT_EQ(result, SystemLogUploader::RemoveSensitiveData(&anonymizer, data)); 317 EXPECT_EQ(result, SystemLogUploader::RemoveSensitiveData(&anonymizer, data));
318 } 318 }
319 319
320 } // namespace policy 320 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/policy/system_log_uploader.cc ('k') | chrome/browser/chromeos/policy/upload_job_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698