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

chrome_frame/urlmon_bind_status_callback.cc

 // Copyright (c) 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/urlmon_bind_status_callback.h"
 
 #include <mshtml.h>
 #include <shlguid.h>
 
 #include "base/logging.h"
@@ skipping 153 matching lines @@
   cache_.Release();
   return hr;
 }
 
 // Scan the buffer or OptIn URL list and decide if the renderer is
 // to be switched.  Last chance means there's no more data.
 void SniffData::DetermineRendererType(bool last_chance) {
   if (is_undetermined()) {
     if (last_chance)
       renderer_type_ = OTHER;
-    if (IsOptInUrl(url_.c_str())) {
+    if (IsChrome(RendererTypeForUrl(url_.c_str()))) {
       renderer_type_ = CHROME;
     } else {
       if (is_cache_valid() && cache_) {
         HGLOBAL memory = NULL;
         GetHGlobalFromStream(cache_, &memory);
         const char* buffer = reinterpret_cast<const char*>(GlobalLock(memory));
 
         std::wstring html_contents;
         // TODO(joshia): detect and handle different content encodings
         if (buffer && size_) {
@@ skipping 237 matching lines @@
       case BINDSTATUS_SERVER_MIMETYPEAVAILABLE:
         return true;
       default:
         break;
     }
   }
 
   return false;
 }