summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-23 03:45:53 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-23 03:45:53 +0000
commit685ee3378b45f9da9f506cb370a7c5c13b2aaa0e (patch)
tree5d8ad5221dfd8cd16661d5c1034894d7b3764e3c /chrome_frame
parentfea45336e484410b790467bfc0314cd4218f39f0 (diff)
downloadchromium_src-685ee3378b45f9da9f506cb370a7c5c13b2aaa0e.zip
chromium_src-685ee3378b45f9da9f506cb370a7c5c13b2aaa0e.tar.gz
chromium_src-685ee3378b45f9da9f506cb370a7c5c13b2aaa0e.tar.bz2
Also switching the default of the tests to default to the moniker patch.
TEST=Switches tests to default PatchProtocols=2. BUG=none TBR=amit Review URL: http://codereview.chromium.org/1147008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/test_with_web_server.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index 13d28b5..24946aa 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -699,7 +699,7 @@ TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_ReferrerTest) {
// registry config value is set to PATCH_METHOD_IBROWSER_AND_MONIKER.
ProtocolPatchMethod patch_method =
static_cast<ProtocolPatchMethod>(
- GetConfigInt(PATCH_METHOD_IBROWSER, kPatchProtocols));
+ GetConfigInt(PATCH_METHOD_IBROWSER_AND_MONIKER, kPatchProtocols));
if (patch_method != PATCH_METHOD_IBROWSER_AND_MONIKER) {
LOG(ERROR) << "Not running test. Moniker patch not enabled.";
return;
@@ -795,7 +795,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestPostReissue) {
// registry config value is set to PATCH_METHOD_IBROWSER_AND_MONIKER.
ProtocolPatchMethod patch_method =
static_cast<ProtocolPatchMethod>(
- GetConfigInt(PATCH_METHOD_IBROWSER, kPatchProtocols));
+ GetConfigInt(PATCH_METHOD_IBROWSER_AND_MONIKER, kPatchProtocols));
if (patch_method != PATCH_METHOD_IBROWSER_AND_MONIKER) {
LOG(ERROR) << "Not running test. Moniker patch not enabled.";
return;
@@ -836,7 +836,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestMultipleGet) {
// registry config value is set to PATCH_METHOD_IBROWSER_AND_MONIKER.
ProtocolPatchMethod patch_method =
static_cast<ProtocolPatchMethod>(
- GetConfigInt(PATCH_METHOD_IBROWSER, kPatchProtocols));
+ GetConfigInt(PATCH_METHOD_IBROWSER_AND_MONIKER, kPatchProtocols));
if (patch_method != PATCH_METHOD_IBROWSER_AND_MONIKER) {
LOG(ERROR) << "Not running test. Moniker patch not enabled.";
return;