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

chrome_frame/http_negotiate.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_HTTP_NEGOTIATE_H_
 #define CHROME_FRAME_HTTP_NEGOTIATE_H_
 
 #include <shdeprecated.h>
 #include <urlmon.h>
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 
 // Typedefs for IHttpNegotiate methods.
 typedef HRESULT (STDMETHODCALLTYPE* IHttpNegotiate_BeginningTransaction_Fn)(
     IHttpNegotiate* me, LPCWSTR url, LPCWSTR headers, DWORD reserved,
     LPWSTR* additional_headers);
 typedef HRESULT (STDMETHODCALLTYPE* IHttpNegotiate_OnResponse_Fn)(
     IHttpNegotiate* me, DWORD response_code, LPCWSTR response_header,
     LPCWSTR request_header, LPWSTR* additional_request_headers);
 
 // Typedefs for IBindStatusCallback methods.
@@ skipping 57 matching lines @@
 // when |headers| contains an User-Agent string.
 std::string AppendCFUserAgentString(LPCWSTR headers,
                                     LPCWSTR additional_headers);
 
 // Adds or replaces the User-Agent header in a set of HTTP headers.
 // Arguments are the same as with AppendCFUserAgentString.
 std::string ReplaceOrAddUserAgent(LPCWSTR headers,
                                   const std::string& user_agent_value);
 
 #endif  // CHROME_FRAME_HTTP_NEGOTIATE_H_