| Index: chrome/test/base/testing_profile.cc
|
| diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
|
| index 561c0f00f23318de4ad038509c3eb39a5dd6f110..a10f39a81cf2d97573dee41e4dcd87c65b36a1d2 100644
|
| --- a/chrome/test/base/testing_profile.cc
|
| +++ b/chrome/test/base/testing_profile.cc
|
| @@ -591,16 +591,7 @@ net::URLRequestContextGetter* TestingProfile::GetRequestContext() {
|
| }
|
|
|
| net::URLRequestContextGetter* TestingProfile::CreateRequestContext(
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - blob_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - file_system_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - developer_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_devtools_protocol_handler) {
|
| + content::ProtocolHandlerMap* protocol_handlers) {
|
| return request_context_.get();
|
| }
|
|
|
| @@ -659,16 +650,7 @@ net::URLRequestContextGetter*
|
| TestingProfile::CreateRequestContextForStoragePartition(
|
| const base::FilePath& partition_path,
|
| bool in_memory,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - blob_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - file_system_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - developer_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_devtools_protocol_handler) {
|
| + content::ProtocolHandlerMap* protocol_handlers) {
|
| // We don't test storage partitions here yet, so returning the same dummy
|
| // context is sufficient for now.
|
| return GetRequestContext();
|
|
|