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

chrome_frame/test/test_with_web_server.cc

Index: chrome_frame/test/test_with_web_server.cc
===================================================================
--- chrome_frame/test/test_with_web_server.cc	(revision 42250)
+++ chrome_frame/test/test_with_web_server.cc	(working copy)
@@ -699,7 +699,7 @@
   // 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 @@
   // 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 @@
   // 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;