Convert Pass()→std::move() in //net

net/http/http_cache.cc

 // Copyright (c) 2012 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 "net/http/http_cache.h"
 
 #include <algorithm>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_util.h"
 #include "base/format_macros.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 276 matching lines @@
 
  private:
   HttpCache* const http_cache_;
 };
 
 //-----------------------------------------------------------------------------
 HttpCache::HttpCache(HttpNetworkSession* session,
                      scoped_ptr<BackendFactory> backend_factory,
                      bool set_up_quic_server_info)
     : HttpCache(make_scoped_ptr(new HttpNetworkLayer(session)),
-                backend_factory.Pass(),
+                std::move(backend_factory),
                 set_up_quic_server_info) {}
 
 HttpCache::HttpCache(scoped_ptr<HttpTransactionFactory> network_layer,
                      scoped_ptr<BackendFactory> backend_factory,
                      bool set_up_quic_server_info)
     : net_log_(nullptr),
-      backend_factory_(backend_factory.Pass()),
+      backend_factory_(std::move(backend_factory)),
       building_backend_(false),
       bypass_lock_for_test_(false),
       fail_conditionalization_for_test_(false),
       mode_(NORMAL),
-      network_layer_(network_layer.Pass()),
+      network_layer_(std::move(network_layer)),
       clock_(new base::DefaultClock()),
       weak_factory_(this) {
   HttpNetworkSession* session = network_layer_->GetSession();
   // Session may be NULL in unittests.
   // TODO(mmenke): Seems like tests could be changed to provide a session,
   // rather than having logic only used in unit tests here.
   if (session) {
     net_log_ = session->net_log();
     if (set_up_quic_server_info &&
         !session->quic_stream_factory()->has_quic_server_info_factory()) {
@@ skipping 146 matching lines @@
   return this;
 }
 
 HttpNetworkSession* HttpCache::GetSession() {
   return network_layer_->GetSession();
 }
 
 scoped_ptr<HttpTransactionFactory>
 HttpCache::SetHttpNetworkTransactionFactoryForTesting(
     scoped_ptr<HttpTransactionFactory> new_network_layer) {
-  scoped_ptr<HttpTransactionFactory> old_network_layer(network_layer_.Pass());
-  network_layer_ = new_network_layer.Pass();
-  return old_network_layer.Pass();
+  scoped_ptr<HttpTransactionFactory> old_network_layer(
+      std::move(network_layer_));
+  network_layer_ = std::move(new_network_layer);
+  return old_network_layer;
 }
 
 //-----------------------------------------------------------------------------
 
 int HttpCache::CreateBackend(disk_cache::Backend** backend,
                              const CompletionCallback& callback) {
   if (!backend_factory_.get())
     return ERR_FAILED;
 
   building_backend_ = true;
@@ skipping 638 matching lines @@
 
   // We don't need the callback anymore.
   pending_op->callback.Reset();
 
   if (backend_factory_.get()) {
     // We may end up calling OnBackendCreated multiple times if we have pending
     // work items. The first call saves the backend and releases the factory,
     // and the last call clears building_backend_.
     backend_factory_.reset();  // Reclaim memory.
     if (result == OK) {
-      disk_cache_ = pending_op->backend.Pass();
+      disk_cache_ = std::move(pending_op->backend);
       if (UseCertCache())
         cert_cache_.reset(new DiskBasedCertCache(disk_cache_.get()));
     }
   }
 
   if (!pending_op->pending_queue.empty()) {
     WorkItem* pending_item = pending_op->pending_queue.front();
     pending_op->pending_queue.pop_front();
     DCHECK_EQ(WI_CREATE_BACKEND, pending_item->operation());
 
     // We want to process a single callback at a time, because the cache may
     // go away from the callback.
     pending_op->writer = pending_item;
 
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&HttpCache::OnBackendCreated, GetWeakPtr(),
                               result, pending_op));
   } else {
     building_backend_ = false;
     DeletePendingOp(pending_op);
   }
 
   // The cache may be gone when we return from the callback.
   if (!item->DoCallback(result, disk_cache_.get()))
     item->NotifyTransaction(result, NULL);
 }
 
 }  // namespace net