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

Unified Diff: chrome/test/base/testing_profile.cc

Issue 10546083: Convert ProtocolHandlerRegistry to be a ProfileKeyedService. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update content_setting_bubble_model tests to use injected ProtocolHandlerRegistry (integrating Greg… Created 8 years, 5 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: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 129ecc13b99b8beceeca6a462ddb6f2e28a8f6de..5e8f30ccb2beb4bdfeaf213faf5ea62c7c6404ee 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -368,16 +368,6 @@ void TestingProfile::CreateBookmarkModel(bool delete_file) {
}
}
-void TestingProfile::CreateProtocolHandlerRegistry() {
- CreateProtocolHandlerRegistry(
- new ProtocolHandlerRegistry::Delegate());
-}
-
-void TestingProfile::CreateProtocolHandlerRegistry(
- ProtocolHandlerRegistry::Delegate* delegate) {
- protocol_handler_registry_ = new ProtocolHandlerRegistry(this, delegate);
-}
-
static scoped_refptr<RefcountedProfileKeyedService> BuildWebDataService(
Profile* profile) {
WebDataService* web_data_service = new WebDataService();
@@ -688,7 +678,8 @@ base::Time TestingProfile::GetStartTime() const {
}
ProtocolHandlerRegistry* TestingProfile::GetProtocolHandlerRegistry() {
- return protocol_handler_registry_.get();
+ NOTREACHED() << "ProtocolHandlerRegistry not available via testing profile.";
+ return NULL;
}
FilePath TestingProfile::last_selected_directory() {

Powered by Google App Engine
This is Rietveld 408576698