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

Side by Side Diff: chrome/browser/chromeos/policy/system_log_uploader.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 <utility> 5 #include <utility>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/chromeos/logging.h" 9 #include "base/chromeos/logging.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 260
261 GURL upload_url(GetUploadUrl()); 261 GURL upload_url(GetUploadUrl());
262 DCHECK(upload_url.is_valid()); 262 DCHECK(upload_url.is_valid());
263 upload_job_ = syslog_delegate_->CreateUploadJob(upload_url, this); 263 upload_job_ = syslog_delegate_->CreateUploadJob(upload_url, this);
264 264
265 // Start a system log upload. 265 // Start a system log upload.
266 int file_number = 1; 266 int file_number = 1;
267 for (const auto& syslog_entry : *system_logs) { 267 for (const auto& syslog_entry : *system_logs) {
268 std::map<std::string, std::string> header_fields; 268 std::map<std::string, std::string> header_fields;
269 std::unique_ptr<std::string> data = 269 std::unique_ptr<std::string> data =
270 base::WrapUnique(new std::string(syslog_entry.second)); 270 base::MakeUnique<std::string>(syslog_entry.second);
271 header_fields.insert(std::make_pair(kFileTypeHeaderName, kFileTypeLogFile)); 271 header_fields.insert(std::make_pair(kFileTypeHeaderName, kFileTypeLogFile));
272 header_fields.insert(std::make_pair(net::HttpRequestHeaders::kContentType, 272 header_fields.insert(std::make_pair(net::HttpRequestHeaders::kContentType,
273 kContentTypePlainText)); 273 kContentTypePlainText));
274 upload_job_->AddDataSegment( 274 upload_job_->AddDataSegment(
275 base::StringPrintf(kNameFieldTemplate, file_number), syslog_entry.first, 275 base::StringPrintf(kNameFieldTemplate, file_number), syslog_entry.first,
276 header_fields, std::move(data)); 276 header_fields, std::move(data));
277 ++file_number; 277 ++file_number;
278 } 278 }
279 upload_job_->Start(); 279 upload_job_->Start();
280 } 280 }
(...skipping 20 matching lines...) Expand all
301 base::TimeDelta()); 301 base::TimeDelta());
302 // Ensure that we never have more than one pending delayed task. 302 // Ensure that we never have more than one pending delayed task.
303 weak_factory_.InvalidateWeakPtrs(); 303 weak_factory_.InvalidateWeakPtrs();
304 task_runner_->PostDelayedTask(FROM_HERE, 304 task_runner_->PostDelayedTask(FROM_HERE,
305 base::Bind(&SystemLogUploader::StartLogUpload, 305 base::Bind(&SystemLogUploader::StartLogUpload,
306 weak_factory_.GetWeakPtr()), 306 weak_factory_.GetWeakPtr()),
307 delay); 307 delay);
308 } 308 }
309 309
310 } // namespace policy 310 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698