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

chrome_frame/http_negotiate.cc

 // 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/http_negotiate.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <htiframe.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/exception_barrier.h"
 #include "chrome_frame/html_utils.h"
+#include "chrome_frame/urlmon_moniker.h"
 #include "chrome_frame/urlmon_url_request.h"
-#include "chrome_frame/urlmon_moniker.h"
 #include "chrome_frame/utils.h"
 #include "chrome_frame/vtable_patch_manager.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 
 bool HttpNegotiatePatch::modify_user_agent_ = true;
 const char kUACompatibleHttpHeader[] = "x-ua-compatible";
 const char kLowerCaseUserAgent[] = "user-agent";
 
 // From the latest urlmon.h. Symbol name prepended with LOCAL_ to
@@ skipping 134 matching lines @@
 
 // static
 bool HttpNegotiatePatch::Initialize() {
   if (IS_PATCHED(IHttpNegotiate)) {
     DLOG(WARNING) << __FUNCTION__ << " called more than once.";
     return true;
   }
   // 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);
     } else {
       NOTREACHED() << "Failed to get _BSCB_Holder_";
       hr = E_UNEXPECTED;
     }
     bind_ctx.Release();
   }
 
   return SUCCEEDED(hr);
 }
 
 // static
 void HttpNegotiatePatch::Uninitialize() {
   vtable_patch::UnpatchInterfaceMethods(IHttpNegotiate_PatchInfo);
 }
 
 // static
 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());
   }
 
   if (http) {
     hr = vtable_patch::PatchInterfaceMethods(http, IHttpNegotiate_PatchInfo);
     DLOG_IF(ERROR, FAILED(hr))
         << base::StringPrintf("HttpNegotiate patch failed 0x%08X", hr);
   } else {
@@ skipping 28 matching lines @@
     *additional_headers = reinterpret_cast<wchar_t*>(::CoTaskMemRealloc(
         *additional_headers,
         (updated_headers.length() + 1) * sizeof(wchar_t)));
     lstrcpyW(*additional_headers, ASCIIToWide(updated_headers).c_str());
   } else {
     // TODO(erikwright): Remove the user agent if it is present (i.e., because
     // of PostPlatform setting in the registry).
   }
   return S_OK;
 }