Fix for the ChromeFrame DownloadFromForm test failures on the IE9 builder. Th...

chrome_frame/utils.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/utils.h"
 
 #include <htiframe.h>
 #include <mshtml.h>
 #include <shlobj.h>
 
@@ skipping 829 matching lines @@
           reinterpret_cast<void**>(browser_priv2.Receive()));
     }
 
     DCHECK(browser_priv2);
 
     if (browser_priv2) {
       ScopedComPtr<IUri> uri_obj;
       uri_container->GetIUri(uri_obj.Receive());
       DCHECK(uri_obj);
 
-      hr = browser_priv2->NavigateWithBindCtx2(uri_obj, NULL, NULL, NULL,
-                                               headers_var.AsInput(), bind_ctx,
-                                               const_cast<wchar_t*>(fragment));
+      if (GetIEVersion() < IE_9) {
+        hr = browser_priv2->NavigateWithBindCtx2(
+            uri_obj, NULL, NULL, NULL, headers_var.AsInput(), bind_ctx,
+            const_cast<wchar_t*>(fragment));
+      } else {
+        IWebBrowserPriv2CommonIE9* browser_priv2_ie9 =
+            reinterpret_cast<IWebBrowserPriv2CommonIE9*>(browser_priv2.get());
+        hr = browser_priv2_ie9->NavigateWithBindCtx2(
+            uri_obj, NULL, NULL, NULL, headers_var.AsInput(), bind_ctx,
+            const_cast<wchar_t*>(fragment), 0);
+      }
       DLOG_IF(WARNING, FAILED(hr))
           << base::StringPrintf(L"NavigateWithBindCtx2 0x%08X", hr);
     }
   } else {
     // IE6
     LPOLESTR url = NULL;
     if (SUCCEEDED(hr = moniker->GetDisplayName(bind_ctx, NULL, &url))) {
       DVLOG(1) << __FUNCTION__ << " " << url;
       ScopedComPtr<IWebBrowserPriv> browser_priv;
       if (SUCCEEDED(hr = browser_priv.QueryFrom(web_browser2))) {
@@ skipping 702 matching lines @@
     ++url_list;
   }
 }
 
 std::wstring GetCurrentModuleVersion() {
   scoped_ptr<FileVersionInfo> module_version_info(
       FileVersionInfo::CreateFileVersionInfoForCurrentModule());
   DCHECK(module_version_info.get() != NULL);
   return module_version_info->file_version();
 }