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

chrome_frame/http_negotiate.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/http_negotiate.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <htiframe.h>
 
@@ skipping 425 matching lines @@
                                                   DWORD reserved,
                                                   LPWSTR* additional_headers) {
   HRESULT hr = S_OK;
   if (delegate_) {
     hr = delegate_->BeginningTransaction(url, headers, reserved,
                                          additional_headers);
   }
 
   if (hr == S_OK) {
     std::string updated_headers;
-    if (IsGcfDefaultRenderer() && IsOptInUrl(url)) {
+    if (IsGcfDefaultRenderer() &&
+        RENDERER_TYPE_CHROME_DEFAULT_RENDERER == RendererTypeForUrl(url)) {
       // Replace the user-agent header with Chrome's.
       updated_headers = ReplaceOrAddUserAgent(*additional_headers,
                                               http_utils::GetChromeUserAgent());
     } else {
       // Add "chromeframe" user-agent string.
       updated_headers = AppendCFUserAgentString(headers, *additional_headers);
     }
 
     *additional_headers = reinterpret_cast<wchar_t*>(::CoTaskMemRealloc(
         *additional_headers, (updated_headers.length() + 1) * sizeof(wchar_t)));
     lstrcpyW(*additional_headers, ASCIIToWide(updated_headers).c_str());
   }
   return hr;
 }
 
 STDMETHODIMP UserAgentAddOn::OnResponse(DWORD response_code,
     LPCWSTR response_headers, LPCWSTR request_headers,
     LPWSTR* additional_headers) {
   HRESULT hr = S_OK;
   if (delegate_) {
     hr = delegate_->OnResponse(response_code, response_headers, request_headers,
                                additional_headers);
   }
   return hr;
 }