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

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

Issue 663563002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
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 099a98ccdf924c48c43cf48dee2fec703915072f..50e1835463f874eed17d41fa64d1796e85555f6b 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -304,7 +304,7 @@ class ResourceLoaderTest : public testing::Test,
virtual scoped_ptr<ResourceHandler> WrapResourceHandler(
scoped_ptr<ResourceHandlerStub> leaf_handler,
net::URLRequest* request) {
- return leaf_handler.PassAs<ResourceHandler>();
+ return leaf_handler.Pass();
}
virtual void SetUp() override {
@@ -377,8 +377,7 @@ TEST_F(ResourceLoaderTest, ClientCertStoreLookup) {
// Ownership of the |test_store| is about to be turned over to ResourceLoader.
// We need to keep raw pointer copies to access these objects later.
ClientCertStoreStub* raw_ptr_to_store = test_store.get();
- resource_context_.SetClientCertStore(
- test_store.PassAs<net::ClientCertStore>());
+ resource_context_.SetClientCertStore(test_store.Pass());
// Prepare a dummy certificate request.
scoped_refptr<net::SSLCertRequestInfo> cert_request_info(
@@ -523,14 +522,13 @@ class ResourceLoaderRedirectToFileTest : public ResourceLoaderTest {
// Inject them into the handler.
scoped_ptr<RedirectToFileResourceHandler> handler(
- new RedirectToFileResourceHandler(
- leaf_handler.PassAs<ResourceHandler>(), request));
+ new RedirectToFileResourceHandler(leaf_handler.Pass(), request));
redirect_to_file_resource_handler_ = handler.get();
handler->SetCreateTemporaryFileStreamFunctionForTesting(
base::Bind(&ResourceLoaderRedirectToFileTest::PostCallback,
base::Unretained(this),
- base::Passed(file_stream.PassAs<net::FileStream>())));
- return handler.PassAs<ResourceHandler>();
+ base::Passed(&file_stream)));
+ return handler.Pass();
}
private:
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.cc ('k') | content/browser/loader/resource_scheduler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698