| Index: content/browser/loader/resource_loader_unittest.cc
|
| diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc
|
| index 2ff4738297b5f2d3f39f7ac0bb4e33f6b29b99d9..05ed7fc4efb871db613b047f0af2cc02375f3214 100644
|
| --- a/content/browser/loader/resource_loader_unittest.cc
|
| +++ b/content/browser/loader/resource_loader_unittest.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| +#include <utility>
|
|
|
| #include "base/files/file.h"
|
| #include "base/files/file_util.h"
|
| @@ -450,7 +451,7 @@ class SelectCertificateBrowserClient : public TestContentBrowserClient {
|
|
|
| ++call_count_;
|
| passed_certs_ = cert_request_info->client_certs;
|
| - delegate_ = delegate.Pass();
|
| + delegate_ = std::move(delegate);
|
| select_certificate_run_loop_.Quit();
|
| }
|
|
|
| @@ -480,11 +481,11 @@ class ResourceContextStub : public MockResourceContext {
|
| : MockResourceContext(test_request_context) {}
|
|
|
| scoped_ptr<net::ClientCertStore> CreateClientCertStore() override {
|
| - return dummy_cert_store_.Pass();
|
| + return std::move(dummy_cert_store_);
|
| }
|
|
|
| void SetClientCertStore(scoped_ptr<net::ClientCertStore> store) {
|
| - dummy_cert_store_ = store.Pass();
|
| + dummy_cert_store_ = std::move(store);
|
| }
|
|
|
| private:
|
| @@ -561,7 +562,7 @@ class ResourceLoaderTest : public testing::Test,
|
| virtual scoped_ptr<ResourceHandler> WrapResourceHandler(
|
| scoped_ptr<ResourceHandlerStub> leaf_handler,
|
| net::URLRequest* request) {
|
| - return leaf_handler.Pass();
|
| + return std::move(leaf_handler);
|
| }
|
|
|
| // Replaces loader_ with a new one for |request|.
|
| @@ -579,8 +580,8 @@ class ResourceLoaderTest : public testing::Test,
|
| new ResourceHandlerStub(request.get()));
|
| raw_ptr_resource_handler_ = resource_handler.get();
|
| loader_.reset(new ResourceLoader(
|
| - request.Pass(),
|
| - WrapResourceHandler(resource_handler.Pass(), raw_ptr_to_request_),
|
| + std::move(request),
|
| + WrapResourceHandler(std::move(resource_handler), raw_ptr_to_request_),
|
| this));
|
| }
|
|
|
| @@ -598,7 +599,7 @@ class ResourceLoaderTest : public testing::Test,
|
| test_url(),
|
| net::DEFAULT_PRIORITY,
|
| nullptr /* delegate */));
|
| - SetUpResourceLoader(request.Pass());
|
| + SetUpResourceLoader(std::move(request));
|
| }
|
|
|
| void TearDown() override {
|
| @@ -693,7 +694,7 @@ TEST_F(ClientCertResourceLoaderTest, WithStoreLookup) {
|
| new net::X509Certificate("test", "test", base::Time(), base::Time())));
|
| scoped_ptr<ClientCertStoreStub> test_store(new ClientCertStoreStub(
|
| dummy_certs, &store_request_count, &store_requested_authorities));
|
| - resource_context_.SetClientCertStore(test_store.Pass());
|
| + resource_context_.SetClientCertStore(std::move(test_store));
|
|
|
| // Plug in test content browser client.
|
| SelectCertificateBrowserClient test_client;
|
| @@ -893,7 +894,7 @@ class ResourceLoaderRedirectToFileTest : public ResourceLoaderTest {
|
|
|
| // Create mock file streams and a ShareableFileReference.
|
| scoped_ptr<net::testing::MockFileStream> file_stream(
|
| - new net::testing::MockFileStream(file.Pass(),
|
| + new net::testing::MockFileStream(std::move(file),
|
| base::ThreadTaskRunnerHandle::Get()));
|
| file_stream_ = file_stream.get();
|
| deletable_file_ = ShareableFileReference::GetOrCreate(
|
| @@ -904,13 +905,13 @@ class ResourceLoaderRedirectToFileTest : public ResourceLoaderTest {
|
|
|
| // Inject them into the handler.
|
| scoped_ptr<RedirectToFileResourceHandler> handler(
|
| - new RedirectToFileResourceHandler(leaf_handler.Pass(), request));
|
| + new RedirectToFileResourceHandler(std::move(leaf_handler), request));
|
| redirect_to_file_resource_handler_ = handler.get();
|
| handler->SetCreateTemporaryFileStreamFunctionForTesting(
|
| base::Bind(&ResourceLoaderRedirectToFileTest::PostCallback,
|
| base::Unretained(this),
|
| base::Passed(&file_stream)));
|
| - return handler.Pass();
|
| + return std::move(handler);
|
| }
|
|
|
| private:
|
| @@ -1081,7 +1082,7 @@ TEST_F(HTTPSSecurityInfoResourceLoaderTest, SecurityInfoOnHTTPSResource) {
|
| scoped_ptr<net::URLRequest> request(
|
| resource_context_.GetRequestContext()->CreateRequest(
|
| test_https_url(), net::DEFAULT_PRIORITY, nullptr /* delegate */));
|
| - SetUpResourceLoader(request.Pass());
|
| + SetUpResourceLoader(std::move(request));
|
|
|
| // Send the request and wait until it completes.
|
| loader_->StartRequest();
|
| @@ -1120,7 +1121,7 @@ TEST_F(HTTPSSecurityInfoResourceLoaderTest,
|
| resource_context_.GetRequestContext()->CreateRequest(
|
| test_https_redirect_url(), net::DEFAULT_PRIORITY,
|
| nullptr /* delegate */));
|
| - SetUpResourceLoader(request.Pass());
|
| + SetUpResourceLoader(std::move(request));
|
|
|
| // Send the request and wait until it completes.
|
| loader_->StartRequest();
|
|
|