Merge 80497 - A change in the way User Agent is modified caused Chrome Frame to mistakenly disabl...

chrome_frame/bho.cc

 // Copyright (c) 2011 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 66 matching lines @@
  public:
   ReadyModeDelegateImpl() {}
 
   // ready_mode::Delegate implementation
   virtual void DisableChromeFrame();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ReadyModeDelegateImpl);
 };  // class ReadyModeDelegateImpl
 
-void SynchronizeEnablementState() {
-  std::string user_agent(http_utils::GetDefaultUserAgent());
-  bool enabled = user_agent.find("chromeframe") != std::string::npos;
-  ProtocolSinkWrap::set_ignore_xua(!enabled);
-}
-
 void ReadyModeDelegateImpl::DisableChromeFrame() {
-  if (GetIEVersion() != IE_9) {
-    SynchronizeEnablementState();
-  } else {
-    HttpNegotiatePatch::set_modify_user_agent(false);
-    ProtocolSinkWrap::set_ignore_xua(true);
-  }
+  HttpNegotiatePatch::set_modify_user_agent(false);
+  ProtocolSinkWrap::set_ignore_xua(true);
 }
 
 }  // namespace
 
 STDMETHODIMP Bho::SetSite(IUnknown* site) {
   HRESULT hr = S_OK;
   if (site) {
     ScopedComPtr<IWebBrowser2> web_browser2;
     web_browser2.QueryFrom(site);
     if (web_browser2) {
       hr = DispEventAdvise(web_browser2, &DIID_DWebBrowserEvents2);
       DCHECK(SUCCEEDED(hr)) << "DispEventAdvise failed. Error: " << hr;
 
       ready_mode::Configure(new ReadyModeDelegateImpl(), web_browser2);
-
-      // At this time, the user agent has been updated to reflect the Ready Mode
-      // state. We should make sure to modify our recognition of meta tags
-      // accordingly. On IE 9, another method is used to manage meta tags.
-      if (GetIEVersion() != IE_9) {
-        SynchronizeEnablementState();
-      }
     }
 
     if (g_patch_helper.state() == PatchHelper::PATCH_IBROWSER) {
       ScopedComPtr<IBrowserService> browser_service;
       hr = DoQueryService(SID_SShellBrowser, site, browser_service.Receive());
       DCHECK(browser_service) << "DoQueryService - SID_SShellBrowser failed."
           << " Site: " << site << " Error: " << hr;
       if (browser_service) {
         g_patch_helper.PatchBrowserService(browser_service);
         DCHECK(SUCCEEDED(hr)) << "vtable_patch::PatchInterfaceMethods failed."
@@ skipping 259 matching lines @@
   }
 }
 
 void PatchHelper::UnpatchIfNeeded() {
   if (state_ == PATCH_PROTOCOL) {
     g_trans_hooks.RevertHooks();
     HttpNegotiatePatch::Uninitialize();
   }
   state_ = UNKNOWN;
 }