Merge 77732 - Fix the flakiness with download requests routed by ChromeFrame ...

chrome_frame/utils.h

 // 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.
 
 #ifndef CHROME_FRAME_UTILS_H_
 #define CHROME_FRAME_UTILS_H_
 
 #include <OAidl.h>
 #include <objidl.h>
 #include <windows.h>
@@ skipping 443 matching lines @@
 // Sent (not posted) when a request needs to be downloaded in the host browser
 // instead of Chrome.  WPARAM is 0 and LPARAM is a pointer to an IMoniker
 // object.
 // NOTE: Since the message is sent synchronously, the handler should only
 // start asynchronous operations in order to not block the sender unnecessarily.
 #define WM_DOWNLOAD_IN_HOST (WM_APP + 2)
 
 // This structure contains the parameters sent over to initiate a download
 // request in the host browser.
 struct DownloadInHostParams {
-  IBindCtx* bind_ctx;
-  IMoniker* moniker;
-  IStream* post_data;
+  base::win::ScopedComPtr<IBindCtx> bind_ctx;
+  base::win::ScopedComPtr<IMoniker> moniker;
+  base::win::ScopedComPtr<IStream> post_data;
   std::string request_headers;
 };
 
 // Maps the InternetCookieState enum to the corresponding CookieAction values
 // used for IE privacy stuff.
 int32 MapCookieStateToCookieAction(InternetCookieState cookie_state);
 
 // Parses the url passed in and returns a GURL instance without the fragment.
 GURL GetUrlWithoutFragment(const wchar_t* url);
 
@@ skipping 142 matching lines @@
 //
 // The string is first interpreted using ';' as a delimiter. It is reevaluated
 // using ',' iff no valid 'chrome=' value is found.
 bool CheckXUaCompatibleDirective(const std::string& directive,
                                  int ie_major_version);
 
 // Returns the version of the current module as a string.
 std::wstring GetCurrentModuleVersion();
 
 #endif  // CHROME_FRAME_UTILS_H_