Revert 144957 - Bring up a content settings icon for ungestured registerProtocolHandler call.
[email protected]
BUG=122020
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10584042
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10690051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144966 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 65603b59..c69447f 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
+#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_special_storage_policy.h"
#include "chrome/browser/extensions/extension_system.h"
@@ -357,15 +358,10 @@
}
void TestingProfile::CreateProtocolHandlerRegistry() {
- CreateProtocolHandlerRegistry(
+ protocol_handler_registry_ = new ProtocolHandlerRegistry(this,
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();
