ceee: Include base/win/scope_comptr.h instead of base/scoped_comptr_win.h

ceee/ie/plugin/bho/http_negotiate.cc

Index: ceee/ie/plugin/bho/http_negotiate.cc
diff --git a/ceee/ie/plugin/bho/http_negotiate.cc b/ceee/ie/plugin/bho/http_negotiate.cc
index ac39ba3298e5722d1434ed7a102a78ecaf3fede5..20035382b6688ae9a8fbc3999179bf68c4b4643b 100644
--- a/ceee/ie/plugin/bho/http_negotiate.cc
+++ b/ceee/ie/plugin/bho/http_negotiate.cc
@@ -13,11 +13,10 @@
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/time.h"
-
+#include "base/win/scoped_comptr.h"
 #include "ceee/ie/plugin/bho/cookie_accountant.h"
 #include "chrome_frame/vtable_patch_manager.h"
 #include "chrome_frame/utils.h"
-#include "base/scoped_comptr_win.h"
 
 static const int kHttpNegotiateBeginningTransactionIndex = 3;
 static const int kHttpNegotiateOnResponseIndex = 4;
@@ -102,12 +101,12 @@ bool HttpNegotiatePatch::Initialize() {
   // Use our SimpleBindStatusCallback class as we need a temporary object that
   // implements IBindStatusCallback.
   CComObjectStackEx<SimpleBindStatusCallback> request;
-  ScopedComPtr<IBindCtx> bind_ctx;
+  base::win::ScopedComPtr<IBindCtx> bind_ctx;
   HRESULT hr = ::CreateAsyncBindCtx(0, &request, NULL, bind_ctx.Receive());
 
   DCHECK(SUCCEEDED(hr)) << "CreateAsyncBindCtx";
   if (bind_ctx) {
-    ScopedComPtr<IUnknown> bscb_holder;
+    base::win::ScopedComPtr<IUnknown> bscb_holder;
     bind_ctx->GetObjectParam(L"_BSCB_Holder_", bscb_holder.Receive());
     if (bscb_holder) {
       hr = PatchHttpNegotiate(bscb_holder);
@@ -136,7 +135,7 @@ HRESULT HttpNegotiatePatch::PatchHttpNegotiate(IUnknown* to_patch) {
   DCHECK(to_patch);
   DCHECK_IS_NOT_PATCHED(IHttpNegotiate);
 
-  ScopedComPtr<IHttpNegotiate> http;
+  base::win::ScopedComPtr<IHttpNegotiate> http;
   HRESULT hr = http.QueryFrom(to_patch);
   if (FAILED(hr)) {
     hr = DoQueryService(IID_IHttpNegotiate, to_patch, http.Receive());