Also switching the default of the tests to default to the moniker patch....

chrome_frame/test/test_with_web_server.cc

 // Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include "chrome_frame/test/test_with_web_server.h"
 
 #include "base/file_version_info.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome_frame/utils.h"
@@ skipping 681 matching lines @@
 }
 
 const wchar_t kReferrerMainTest[] = L"files/referrer_main.html";
 
 // TODO(tommi): Still failing intermittently on the build bot.
 TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_ReferrerTest) {
   // At the moment the moniker patch is only enabled if the below
   // 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;
   }
 
   SimpleBrowserTest(IE, kReferrerMainTest, L"FullTab_ReferrerTest");
 }
 
 const wchar_t kSubFrameTestPage[] = L"files/full_tab_sub_frame_main.html";
 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_SubFrame) {
@@ skipping 75 matching lines @@
   ASSERT_TRUE(CheckResultFile(L"FullTab_AnchorURLNavigateTest", "OK"));
 }
 
 // Test whether POST-ing a form from an mshtml page to a CF page will cause
 // the request to get reissued.  It should not.
 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestPostReissue) {
   // At the moment the moniker patch is only enabled if the below
   // 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;
   }
 
   MessageLoopForUI loop;  // must come before the server.
 
   // The order of pages in this array is assumed to be mshtml, cf, script.
   const wchar_t* kPages[] = {
     L"full_tab_post_mshtml.html",
@@ skipping 20 matching lines @@
   }
 }
 
 // Test whether following a link from an mshtml page to a CF page will cause
 // multiple network requests.  It should not.
 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestMultipleGet) {
   // At the moment the moniker patch is only enabled if the below
   // 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;
   }
 
   MessageLoopForUI loop;  // must come before the server.
 
   // The order of pages in this array is assumed to be mshtml, cf, script.
   const wchar_t* kPages[] = {
     L"full_tab_get_mshtml.html",
@@ skipping 13 matching lines @@
   EXPECT_EQ("OK", r.arguments());
 
   if (r.arguments().compare("OK") == 0) {
     // Check how many requests we got for the cf page and check that it was
     // a GET.
     int requests = server.GetRequestCountForPage(kPages[1], "GET");
     EXPECT_EQ(1, requests);
   }
 }