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

chrome_frame/bind_status_callback_impl.h

-// 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.
 
 #ifndef CHROME_FRAME_BIND_STATUS_CALLBACK_IMPL_H_
 #define CHROME_FRAME_BIND_STATUS_CALLBACK_IMPL_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <string>
 #include <urlmon.h>
 
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 #include "chrome_frame/utils.h"
 
 // A generic base class for IBindStatus callback implementation.
 // If initialized with delegate, it will hand over all the calls
 // to the delegate. This can also be used as a base class to
 // provide the base implementation by not providing any delegate.
 class BSCBImpl
   : public CComObjectRootEx<CComMultiThreadModel>,
     public IBindStatusCallbackEx,
     public IHttpNegotiate3,
@@ skipping 57 matching lines @@
   STDMETHOD(GetRootSecurityId)(BYTE* security_id, DWORD* security_id_size,
                                DWORD_PTR reserved);
 
   // IHttpNegotiate3
   STDMETHOD(GetSerializedClientCertContext)(BYTE** cert, DWORD* cert_size);
 
  protected:
   // used for logging.
   std::string me();
 
-  ScopedComPtr<IBindStatusCallback> delegate_;
-  ScopedComPtr<IBindCtx> bind_ctx_;
+  base::win::ScopedComPtr<IBindStatusCallback> delegate_;
+  base::win::ScopedComPtr<IBindCtx> bind_ctx_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BSCBImpl);
 };
 
 #endif  // CHROME_FRAME_BIND_STATUS_CALLBACK_IMPL_H_