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

Unified Diff: content/browser/loader/redirect_to_file_resource_handler.cc

Issue 1545243002: Convert Pass()→std::move() in //content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/loader/redirect_to_file_resource_handler.cc
diff --git a/content/browser/loader/redirect_to_file_resource_handler.cc b/content/browser/loader/redirect_to_file_resource_handler.cc
index 57f0df627b27067a0173578e56c1d10bc41095d7..670b3343d305d2cce1a7000d2e404ca181ead5e5 100644
--- a/content/browser/loader/redirect_to_file_resource_handler.cc
+++ b/content/browser/loader/redirect_to_file_resource_handler.cc
@@ -4,6 +4,8 @@
#include "content/browser/loader/redirect_to_file_resource_handler.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/logging.h"
#include "base/macros.h"
@@ -62,7 +64,7 @@ class RedirectToFileResourceHandler::Writer {
scoped_ptr<net::FileStream> file_stream,
ShareableFileReference* deletable_file)
: handler_(handler),
- file_stream_(file_stream.Pass()),
+ file_stream_(std::move(file_stream)),
is_writing_(false),
deletable_file_(deletable_file) {
DCHECK(!deletable_file_->path().empty());
@@ -130,7 +132,7 @@ class RedirectToFileResourceHandler::Writer {
RedirectToFileResourceHandler::RedirectToFileResourceHandler(
scoped_ptr<ResourceHandler> next_handler,
net::URLRequest* request)
- : LayeredResourceHandler(request, next_handler.Pass()),
+ : LayeredResourceHandler(request, std::move(next_handler)),
buf_(new net::GrowableIOBuffer()),
buf_write_pending_(false),
write_cursor_(0),
@@ -138,8 +140,7 @@ RedirectToFileResourceHandler::RedirectToFileResourceHandler(
next_buffer_size_(kInitialReadBufSize),
did_defer_(false),
completed_during_write_(false),
- weak_factory_(this) {
-}
+ weak_factory_(this) {}
RedirectToFileResourceHandler::~RedirectToFileResourceHandler() {
// Orphan the writer to asynchronously close and release the temporary file.
@@ -250,7 +251,7 @@ void RedirectToFileResourceHandler::DidCreateTemporaryFile(
return;
}
- writer_ = new Writer(this, file_stream.Pass(), deletable_file);
+ writer_ = new Writer(this, std::move(file_stream), deletable_file);
// Resume the request.
DCHECK(did_defer_);

Powered by Google App Engine
This is Rietveld 408576698