Committing http://codereview.chromium.org/3420004/show for grt@...

chrome_frame/bho.cc

 // Copyright (c) 2009 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/bho.h"
 
 #include <shlguid.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 284 matching lines @@
 #ifndef NDEBUG
   // This check must already have been made.
   VARIANT_BOOL is_top_level = VARIANT_FALSE;
   browser->get_TopLevelContainer(&is_top_level);
   DCHECK(is_top_level);
 #endif
 
   std::wstring current_url(url, SysStringLen(url));
   if (IsValidUrlScheme(GURL(current_url), false)) {
     bool cf_protocol = StartsWith(current_url, kChromeProtocolPrefix, false);
-    if (!cf_protocol && IsOptInUrl(current_url.c_str())) {
+    if (!cf_protocol && IsChrome(RendererTypeForUrl(current_url))) {
       DLOG(INFO) << "Opt-in URL. Switching to cf.";
       ScopedComPtr<IBrowserService> browser_service;
       DoQueryService(SID_SShellBrowser, browser, browser_service.Receive());
       DCHECK(browser_service) << "DoQueryService - SID_SShellBrowser failed.";
       MarkBrowserOnThreadForCFNavigation(browser_service);
     }
   }
 }
 
 bool PatchHelper::InitializeAndPatchProtocolsIfNeeded() {
@@ skipping 38 matching lines @@
   } else if (state_ == PATCH_IBROWSER) {
     vtable_patch::UnpatchInterfaceMethods(IBrowserService_PatchInfo);
     MonikerPatch::Uninitialize();
     HttpNegotiatePatch::Uninitialize();
   } else {
     HttpNegotiatePatch::Uninitialize();
   }
 
   state_ = UNKNOWN;
 }