summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/test_with_web_server.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 23:28:52 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 23:28:52 +0000
commit830005dd23868ae6a4fe75dab08c08ee04831ca2 (patch)
treedb98eda277bb2a78e00b4424116f22e76f624d40 /chrome_frame/test/test_with_web_server.cc
parent29c32f903806efbc167a417c170b896dfeecc33f (diff)
downloadchromium_src-830005dd23868ae6a4fe75dab08c08ee04831ca2.zip
chromium_src-830005dd23868ae6a4fe75dab08c08ee04831ca2.tar.gz
chromium_src-830005dd23868ae6a4fe75dab08c08ee04831ca2.tar.bz2
In ChromeFrame with the moniker patch enabled we should not process optin urls in the BHO.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=42155 Bug=42155 Review URL: http://codereview.chromium.org/1706003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/test_with_web_server.cc')
-rw-r--r--chrome_frame/test/test_with_web_server.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index 2248089..9e9e14f2 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -16,15 +16,6 @@ const int kShortWaitTimeout = 25 * 1000;
const int kChromeFrameLaunchDelay = 5;
const int kChromeFrameLongNavigationTimeoutInSeconds = 10;
-bool MonikerPatchEnabled() {
- ProtocolPatchMethod patch_method =
- static_cast<ProtocolPatchMethod>(
- GetConfigInt(PATCH_METHOD_MONIKER, kPatchProtocols));
- LOG_IF(ERROR, patch_method != PATCH_METHOD_MONIKER)
- << "Not running test. Moniker patch not enabled.";
- return patch_method == PATCH_METHOD_MONIKER;
-}
-
class ChromeFrameTestEnvironment: public testing::Environment {
public:
~ChromeFrameTestEnvironment() {}