Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.

chrome_frame/urlmon_url_request_private.h

 // 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.
 
 #ifndef CHROME_FRAME_URLMON_URL_REQUEST_PRIVATE_H_
 #define CHROME_FRAME_URLMON_URL_REQUEST_PRIVATE_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <string>
@@ skipping 210 matching lines @@
       result_.set_os_error(HresultToNetError(hr));
     }
 
    private:
     Redirection redirect_;
     State state_;
     net::URLRequestStatus result_;
   };
 
   Status status_;
-  ScopedComPtr<IBinding> binding_;
-  ScopedComPtr<IMoniker> moniker_;
-  ScopedComPtr<IBindCtx> bind_context_;
-  ScopedComPtr<IStream> cache_;
-  ScopedComPtr<IStream> pending_data_;
+  base::win::ScopedComPtr<IBinding> binding_;
+  base::win::ScopedComPtr<IMoniker> moniker_;
+  base::win::ScopedComPtr<IBindCtx> bind_context_;
+  base::win::ScopedComPtr<IStream> cache_;
+  base::win::ScopedComPtr<IStream> pending_data_;
 
   size_t pending_read_size_;
   base::PlatformThreadId thread_;
   HWND parent_window_;
   bool headers_received_;
   int calling_delegate_;  // re-entrancy protection.
   // Set to true if the ChromeFrame instance is running in privileged mode.
   bool privileged_mode_;
   bool pending_;
   scoped_ptr<TerminateBindCallback> terminate_bind_callback_;
   std::string response_headers_;
   // Defaults to true and indicates whether we want to keep the original
   // transaction alive when we receive the last data notification from
   // urlmon.
   bool is_expecting_download_;
   // Set to true if the Urlmon transaction object needs to be cleaned up
   // when this object is destroyed. Happens if we return
   // INET_E_TERMINATE_BIND from OnDataAvailable in the last data notification.
   bool cleanup_transaction_;
   // Copy of the request headers.
   std::string request_headers_;
 
   DISALLOW_COPY_AND_ASSIGN(UrlmonUrlRequest);
 };
 
 #endif  // CHROME_FRAME_URLMON_URL_REQUEST_PRIVATE_H_