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

Unified Diff: content/browser/service_worker/service_worker_url_request_job_unittest.cc

Issue 1295523006: Using scoped_ptr for URLRequestJobFactoryImpl::SetProtocolHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing un-modified file Created 5 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/service_worker_url_request_job_unittest.cc
diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
index 149c524e7435ff456ec21f97d7853a80878eb02f..a4ba903ef4b2981026a521797d01d496e7395733 100644
--- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
@@ -100,12 +100,13 @@ class MockHttpProtocolHandler
// Returns a BlobProtocolHandler that uses |blob_storage_context|. Caller owns
// the memory.
-storage::BlobProtocolHandler* CreateMockBlobProtocolHandler(
+scoped_ptr<storage::BlobProtocolHandler> CreateMockBlobProtocolHandler(
storage::BlobStorageContext* blob_storage_context) {
// The FileSystemContext and task runner are not actually used but a
// task runner is needed to avoid a DCHECK in BlobURLRequestJob ctor.
- return new storage::BlobProtocolHandler(
- blob_storage_context, nullptr, base::ThreadTaskRunnerHandle::Get().get());
+ return make_scoped_ptr(new storage::BlobProtocolHandler(
+ blob_storage_context, nullptr,
+ base::ThreadTaskRunnerHandle::Get().get()));
}
} // namespace
@@ -183,9 +184,9 @@ class ServiceWorkerURLRequestJobTest : public testing::Test {
url_request_job_factory_.reset(new net::URLRequestJobFactoryImpl);
url_request_job_factory_->SetProtocolHandler(
"http",
- new MockHttpProtocolHandler(provider_host->AsWeakPtr(),
- browser_context_->GetResourceContext(),
- blob_storage_context->AsWeakPtr()));
+ make_scoped_ptr(new MockHttpProtocolHandler(
+ provider_host->AsWeakPtr(), browser_context_->GetResourceContext(),
+ blob_storage_context->AsWeakPtr())));
url_request_job_factory_->SetProtocolHandler(
"blob", CreateMockBlobProtocolHandler(blob_storage_context));
url_request_context_.set_job_factory(url_request_job_factory_.get());

Powered by Google App Engine
This is Rietveld 408576698