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

chrome_frame/bind_status_callback_impl.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/bind_status_callback_impl.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/threading/platform_thread.h"
 
@@ skipping 46 matching lines @@
 
   Release();
 
   return hr;
 }
 
 // IServiceProvider
 HRESULT BSCBImpl::QueryService(REFGUID service, REFIID iid, void** object) {
   HRESULT hr = E_NOINTERFACE;
   if (delegate_) {
-    ScopedComPtr<IServiceProvider> svc;
+    base::win::ScopedComPtr<IServiceProvider> svc;
     svc.QueryFrom(delegate_);
     if (svc) {
       hr = svc->QueryService(service, iid, object);
     }
   }
   return hr;
 }
 
 // IBindStatusCallback
 HRESULT BSCBImpl::OnStartBinding(DWORD reserved, IBinding* binding) {
@@ skipping 73 matching lines @@
   return hr;
 }
 
 // IBindStatusCallbackEx
 HRESULT BSCBImpl::GetBindInfoEx(DWORD* bindf, BINDINFO* bind_info,
                                 DWORD* bindf2, DWORD* reserved) {
   DVLOG(1) << __FUNCTION__ << me()
            << base::StringPrintf(" tid=%i", base::PlatformThread::CurrentId());
   HRESULT hr = S_OK;
   if (delegate_) {
-    ScopedComPtr<IBindStatusCallbackEx> bscbex;
+    base::win::ScopedComPtr<IBindStatusCallbackEx> bscbex;
     bscbex.QueryFrom(delegate_);
     if (bscbex)
       hr = bscbex->GetBindInfoEx(bindf, bind_info, bindf2, reserved);
   }
   return hr;
 }
 
 HRESULT BSCBImpl::BeginningTransaction(LPCWSTR url, LPCWSTR headers,
                                        DWORD reserved,
                                        LPWSTR* additional_headers) {
   DVLOG(1) << __FUNCTION__ << me()
            << base::StringPrintf(" tid=%i", base::PlatformThread::CurrentId());
 
   HRESULT hr = S_OK;
   if (delegate_) {
-    ScopedComPtr<IHttpNegotiate> http_negotiate;
+    base::win::ScopedComPtr<IHttpNegotiate> http_negotiate;
     http_negotiate.QueryFrom(delegate_);
     if (http_negotiate) {
       hr = http_negotiate->BeginningTransaction(url, headers, reserved,
                                                 additional_headers);
     }
   }
 
   DLOG_IF(ERROR, FAILED(hr)) << __FUNCTION__;
   return hr;
 }
 
 HRESULT BSCBImpl::OnResponse(DWORD response_code, LPCWSTR response_headers,
                              LPCWSTR request_headers,
                              LPWSTR* additional_headers) {
   DVLOG(1) << __FUNCTION__ << me()
            << base::StringPrintf(" tid=%i", base::PlatformThread::CurrentId());
 
   HRESULT hr = S_OK;
   if (delegate_) {
-    ScopedComPtr<IHttpNegotiate> http_negotiate;
+    base::win::ScopedComPtr<IHttpNegotiate> http_negotiate;
     http_negotiate.QueryFrom(delegate_);
     if (http_negotiate) {
       hr = http_negotiate->OnResponse(response_code, response_headers,
                                       request_headers, additional_headers);
     }
   }
   return hr;
 }
 
 HRESULT BSCBImpl::GetRootSecurityId(BYTE* security_id, DWORD* security_id_size,
                                     DWORD_PTR reserved) {
   HRESULT hr = S_OK;
   if (delegate_) {
-    ScopedComPtr<IHttpNegotiate2> http_negotiate;
+    base::win::ScopedComPtr<IHttpNegotiate2> http_negotiate;
     http_negotiate.QueryFrom(delegate_);
     if (http_negotiate) {
       hr = http_negotiate->GetRootSecurityId(security_id, security_id_size,
                                              reserved);
     }
   }
   return hr;
 }
 
 HRESULT BSCBImpl::GetSerializedClientCertContext(BYTE** cert,
                                                  DWORD* cert_size) {
   HRESULT hr = S_OK;
   if (delegate_) {
-    ScopedComPtr<IHttpNegotiate3> http_negotiate;
+    base::win::ScopedComPtr<IHttpNegotiate3> http_negotiate;
     http_negotiate.QueryFrom(delegate_);
     if (http_negotiate) {
       return http_negotiate->GetSerializedClientCertContext(cert, cert_size);
     }
   }
   return hr;
 }