Convert ProtocolHandlerRegistry to be a ProfileKeyedService.

BUG=129200
TEST=protocol_handler_registry_browsertest.cc,protocol_handler_registry_unittest.cc

willchan@ -> profile_io changes
+bauerb -> content_settings changes


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=147597

Review URL: https://chromiumcodereview.appspot.com/10546083

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147745 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 11 deletions

diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 487dffa..27a2dcc 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -369,16 +369,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,7 @@ base::Time TestingProfile::GetStartTime() const {
 }
 
 ProtocolHandlerRegistry* TestingProfile::GetProtocolHandlerRegistry() {
-  return protocol_handler_registry_.get();
+  return NULL;
 }
 
 FilePath TestingProfile::last_selected_directory() {