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

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

Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge 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 2431224771c80f0de1723ad89655c22125378f6f..129ecc13b99b8beceeca6a462ddb6f2e28a8f6de 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -18,7 +18,6 @@
#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"
@@ -370,10 +369,15 @@ void TestingProfile::CreateBookmarkModel(bool delete_file) {
}
void TestingProfile::CreateProtocolHandlerRegistry() {
- protocol_handler_registry_ = new ProtocolHandlerRegistry(this,
+ 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();

Powered by Google App Engine
This is Rietveld 408576698