summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 12:01:15 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 12:01:15 +0000
commit3ce02419d4f7b3cd1fc062f87fb63a78072b5483 (patch)
tree6bdbb2cc363827fe8fb6186d5cbf5787f5aaf29d /chrome/test
parentaf3f286560a8fadb4eb6cb51c7ba2cb0f8e17a66 (diff)
downloadchromium_src-3ce02419d4f7b3cd1fc062f87fb63a78072b5483.zip
chromium_src-3ce02419d4f7b3cd1fc062f87fb63a78072b5483.tar.gz
chromium_src-3ce02419d4f7b3cd1fc062f87fb63a78072b5483.tar.bz2
Make the ChromeNetworkDelegate use the ExtensionEventRouterForwarder
BUG=73903 TEST=tests for proxy and webrequest API should still work Review URL: http://codereview.chromium.org/6598002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/testing_browser_process.cc5
-rw-r--r--chrome/test/testing_browser_process.h2
-rw-r--r--chrome/test/testing_profile.cc4
-rw-r--r--chrome/test/testing_profile.h1
4 files changed, 7 insertions, 5 deletions
diff --git a/chrome/test/testing_browser_process.cc b/chrome/test/testing_browser_process.cc
index f6af58f..adb2b10 100644
--- a/chrome/test/testing_browser_process.cc
+++ b/chrome/test/testing_browser_process.cc
@@ -117,6 +117,11 @@ ui::Clipboard* TestingBrowserProcess::clipboard() {
return clipboard_.get();
}
+ExtensionEventRouterForwarder*
+TestingBrowserProcess::extension_event_router_forwarder() {
+ return NULL;
+}
+
NotificationUIManager* TestingBrowserProcess::notification_ui_manager() {
return NULL;
}
diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h
index d544f82..f302458 100644
--- a/chrome/test/testing_browser_process.h
+++ b/chrome/test/testing_browser_process.h
@@ -79,6 +79,8 @@ class TestingBrowserProcess : public BrowserProcess {
virtual ui::Clipboard* clipboard();
+ virtual ExtensionEventRouterForwarder* extension_event_router_forwarder();
+
virtual NotificationUIManager* notification_ui_manager();
virtual GoogleURLTracker* google_url_tracker();
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 1458d4a..479cf70 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -432,10 +432,6 @@ ExtensionEventRouter* TestingProfile::GetExtensionEventRouter() {
return NULL;
}
-ExtensionIOEventRouter* TestingProfile::GetExtensionIOEventRouter() {
- return NULL;
-}
-
ExtensionSpecialStoragePolicy*
TestingProfile::GetExtensionSpecialStoragePolicy() {
if (!extension_special_storage_policy_)
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 5517553..53bcb89 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -153,7 +153,6 @@ class TestingProfile : public Profile {
virtual ExtensionProcessManager* GetExtensionProcessManager();
virtual ExtensionMessageService* GetExtensionMessageService();
virtual ExtensionEventRouter* GetExtensionEventRouter();
- virtual ExtensionIOEventRouter* GetExtensionIOEventRouter();
virtual ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy();
virtual SSLHostState* GetSSLHostState();
virtual net::TransportSecurityState* GetTransportSecurityState();