Switch renderer in 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"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 
 const wchar_t kDocRoot[] = L"chrome_frame\\test\\data";
 const int kLongWaitTimeout = 60 * 1000;
 const int kShortWaitTimeout = 25 * 1000;
 const int kChromeFrameLaunchDelay = 5;
 const int kChromeFrameLongNavigationTimeoutInSeconds = 10;
 
 bool MonikerPatchEnabled() {
   ProtocolPatchMethod patch_method =
       static_cast<ProtocolPatchMethod>(
           GetConfigInt(PATCH_METHOD_IBROWSER, kPatchProtocols));
-  LOG_IF(ERROR, patch_method != PATCH_METHOD_IBROWSER_AND_MONIKER)
+  LOG_IF(ERROR, patch_method != PATCH_METHOD_MONIKER)
       << "Not running test. Moniker patch not enabled.";
-  return patch_method == PATCH_METHOD_IBROWSER_AND_MONIKER;
+  return patch_method == PATCH_METHOD_MONIKER;
 }
 
 class ChromeFrameTestEnvironment: public testing::Environment {
  public:
   ~ChromeFrameTestEnvironment() {}
   void SetUp() {
     ScopedChromeFrameRegistrar::RegisterDefaults();
   }
   void TearDown() {}
 };
@@ skipping 811 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);
   }
 }