diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
| commit | 8ee65baac4ab9e3beb67674adbc6a210e2708604 (patch) | |
| tree | 44400d118d7813a8d7e16a67f074c6696f8868b3 /chrome_frame/http_negotiate.cc | |
| parent | f1094b0275c82ead4b9aabbda24f5c2b3e8b4a1b (diff) | |
| download | chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.zip chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.gz chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.bz2 | |
Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.
Fix up all the callers to use the new location and namespace.
Also, delete the stub file since it isn't included by anyone more.
(Note: This was a TODO for brettw).
BUG=None
TEST=None
R=brettw@chromium.org
Review URL: http://codereview.chromium.org/6825055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/http_negotiate.cc')
| -rw-r--r-- | chrome_frame/http_negotiate.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/http_negotiate.cc b/chrome_frame/http_negotiate.cc index 0bff64b..7ca3cea 100644 --- a/chrome_frame/http_negotiate.cc +++ b/chrome_frame/http_negotiate.cc @@ -16,8 +16,8 @@ #include "chrome_frame/bho.h" #include "chrome_frame/exception_barrier.h" #include "chrome_frame/html_utils.h" -#include "chrome_frame/urlmon_url_request.h" #include "chrome_frame/urlmon_moniker.h" +#include "chrome_frame/urlmon_url_request.h" #include "chrome_frame/utils.h" #include "chrome_frame/vtable_patch_manager.h" #include "net/http/http_response_headers.h" @@ -172,11 +172,11 @@ 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); @@ -200,7 +200,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()); |