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

Side by Side Diff: chrome/test/base/testing_profile.cc

Issue 12386009: Remove the chrome:// protocol interceptor since it's not used anymore now that the chrome job facto… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/base/testing_profile.h ('k') | content/browser/storage_partition_impl_map.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/test/base/testing_profile.h" 5 #include "chrome/test/base/testing_profile.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 net::URLRequestContextGetter* TestingProfile::GetRequestContext() { 582 net::URLRequestContextGetter* TestingProfile::GetRequestContext() {
583 return request_context_.get(); 583 return request_context_.get();
584 } 584 }
585 585
586 net::URLRequestContextGetter* TestingProfile::CreateRequestContext( 586 net::URLRequestContextGetter* TestingProfile::CreateRequestContext(
587 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 587 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
588 blob_protocol_handler, 588 blob_protocol_handler,
589 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 589 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
590 file_system_protocol_handler, 590 file_system_protocol_handler,
591 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 591 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
592 developer_protocol_handler,
593 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
594 chrome_protocol_handler, 592 chrome_protocol_handler,
595 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 593 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
596 chrome_devtools_protocol_handler) { 594 chrome_devtools_protocol_handler) {
597 return request_context_.get(); 595 return request_context_.get();
598 } 596 }
599 597
600 net::URLRequestContextGetter* TestingProfile::GetRequestContextForRenderProcess( 598 net::URLRequestContextGetter* TestingProfile::GetRequestContextForRenderProcess(
601 int renderer_child_id) { 599 int renderer_child_id) {
602 content::RenderProcessHost* rph = content::RenderProcessHost::FromID( 600 content::RenderProcessHost* rph = content::RenderProcessHost::FromID(
603 renderer_child_id); 601 renderer_child_id);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 648
651 net::URLRequestContextGetter* 649 net::URLRequestContextGetter*
652 TestingProfile::CreateRequestContextForStoragePartition( 650 TestingProfile::CreateRequestContextForStoragePartition(
653 const base::FilePath& partition_path, 651 const base::FilePath& partition_path,
654 bool in_memory, 652 bool in_memory,
655 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 653 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
656 blob_protocol_handler, 654 blob_protocol_handler,
657 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 655 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
658 file_system_protocol_handler, 656 file_system_protocol_handler,
659 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 657 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
660 developer_protocol_handler,
661 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
662 chrome_protocol_handler, 658 chrome_protocol_handler,
663 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 659 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
664 chrome_devtools_protocol_handler) { 660 chrome_devtools_protocol_handler) {
665 // We don't test storage partitions here yet, so returning the same dummy 661 // We don't test storage partitions here yet, so returning the same dummy
666 // context is sufficient for now. 662 // context is sufficient for now.
667 return GetRequestContext(); 663 return GetRequestContext();
668 } 664 }
669 665
670 content::ResourceContext* TestingProfile::GetResourceContext() { 666 content::ResourceContext* TestingProfile::GetResourceContext() {
671 if (!resource_context_.get()) 667 if (!resource_context_.get())
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 806
811 scoped_ptr<TestingProfile> TestingProfile::Builder::Build() { 807 scoped_ptr<TestingProfile> TestingProfile::Builder::Build() {
812 DCHECK(!build_called_); 808 DCHECK(!build_called_);
813 build_called_ = true; 809 build_called_ = true;
814 return scoped_ptr<TestingProfile>(new TestingProfile( 810 return scoped_ptr<TestingProfile>(new TestingProfile(
815 path_, 811 path_,
816 delegate_, 812 delegate_,
817 extension_policy_, 813 extension_policy_,
818 pref_service_.Pass())); 814 pref_service_.Pass()));
819 } 815 }
OLDNEW
« no previous file with comments | « chrome/test/base/testing_profile.h ('k') | content/browser/storage_partition_impl_map.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698