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

chrome_frame/urlmon_moniker.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/urlmon_moniker.h"
 
 #include <shlguid.h>
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/bind_context_info.h"
+#include "chrome_frame/chrome_active_document.h"
 #include "chrome_frame/exception_barrier.h"
-#include "chrome_frame/chrome_active_document.h"
 #include "chrome_frame/urlmon_bind_status_callback.h"
 #include "chrome_frame/utils.h"
 #include "chrome_frame/vtable_patch_manager.h"
 #include "net/http/http_util.h"
 
 static const int kMonikerBindToObject = 8;
 static const int kMonikerBindToStorage = kMonikerBindToObject + 1;
 
 base::LazyInstance<base::ThreadLocalPointer<NavigationManager> >
     NavigationManager::thread_singleton_(base::LINKER_INITIALIZED);
 
 BEGIN_VTABLE_PATCHES(IMoniker)
   VTABLE_PATCH_ENTRY(kMonikerBindToObject, MonikerPatch::BindToObject)
   VTABLE_PATCH_ENTRY(kMonikerBindToStorage, MonikerPatch::BindToStorage)
 END_VTABLE_PATCHES()
 
 ////////////////////////////
 
 HRESULT NavigationManager::NavigateToCurrentUrlInCF(IBrowserService* browser) {
   DCHECK(browser);
   DVLOG(1) << __FUNCTION__ << " " << url();
 
   MarkBrowserOnThreadForCFNavigation(browser);
 
   HRESULT hr = S_OK;
-  ScopedComPtr<IShellBrowser> shell_browser;
-  ScopedComPtr<IBindCtx> bind_context;
+  base::win::ScopedComPtr<IShellBrowser> shell_browser;
+  base::win::ScopedComPtr<IBindCtx> bind_context;
   hr = ::CreateAsyncBindCtxEx(NULL, 0, NULL, NULL, bind_context.Receive(), 0);
 
-  ScopedComPtr<IMoniker> moniker;
+  base::win::ScopedComPtr<IMoniker> moniker;
   DCHECK(bind_context);
   if (SUCCEEDED(hr) &&
       SUCCEEDED(hr = ::CreateURLMonikerEx(NULL, url_.c_str(), moniker.Receive(),
                                           URL_MK_UNIFORM))) {
     if (SUCCEEDED(hr)) {
       // If there's a referrer, preserve it.
       std::wstring headers;
       if (!referrer_.empty()) {
         headers = base::StringPrintf(L"Referer: %ls\r\n\r\n",
             ASCIIToWide(referrer_).c_str());
@@ skipping 37 matching lines @@
 
 /////////////////////////////////////////
 
 // static
 bool MonikerPatch::Initialize() {
   if (IS_PATCHED(IMoniker)) {
     DLOG(WARNING) << __FUNCTION__ << " called more than once.";
     return true;
   }
 
-  ScopedComPtr<IMoniker> moniker;
+  base::win::ScopedComPtr<IMoniker> moniker;
   HRESULT hr = ::CreateURLMoniker(NULL, L"http://localhost/",
                                   moniker.Receive());
   DCHECK(SUCCEEDED(hr));
   if (SUCCEEDED(hr)) {
     hr = vtable_patch::PatchInterfaceMethods(moniker, IMoniker_PatchInfo);
     DLOG_IF(ERROR, FAILED(hr)) << base::StringPrintf(
         "patch failed 0x%08X", hr);
   }
 
   return SUCCEEDED(hr);
@@ skipping 12 matching lines @@
              << base::StringPrintf(" GetDisplayName failed. Error: 0x%x", hr);
     return false;
   }
 
   if (!IsEqualIID(IID_IStream, iid)) {
     DVLOG(1) << __FUNCTION__ << " Url: " << url
              << " Not wrapping: IID is not IStream.";
     return false;
   }
 
-  ScopedComPtr<BindContextInfo> info;
+  base::win::ScopedComPtr<BindContextInfo> info;
   BindContextInfo::FromBindContext(bind_context, info.Receive());
   DCHECK(info);
   if (info && info->chrome_request()) {
     DVLOG(1) << __FUNCTION__ << " Url: " << url
              << " Not wrapping: request from chrome frame.";
     return false;
   }
 
   NavigationManager* mgr = NavigationManager::GetThreadInstance();
   if (!mgr) {
     DVLOG(1) << __FUNCTION__ << " Url: " << url
              << " No navigation manager to wrap";
     return false;
   }
 
   // Check whether request comes from MSHTML by checking for IInternetBindInfo.
   // We prefer to avoid wrapping if BindToStorage is called from AcroPDF.dll
   // (as a result of OnObjectAvailable)
-  ScopedComPtr<IUnknown> bscb_holder;
+  base::win::ScopedComPtr<IUnknown> bscb_holder;
   if (S_OK == bind_context->GetObjectParam(L"_BSCB_Holder_",
                                            bscb_holder.Receive())) {
-    ScopedComPtr<IBindStatusCallback> bscb;
+    base::win::ScopedComPtr<IBindStatusCallback> bscb;
     if (S_OK != DoQueryService(IID_IBindStatusCallback, bscb_holder,
                                bscb.Receive()))
       return false;
 
     if (!bscb.get())
       return false;
 
-    ScopedComPtr<IInternetBindInfo> bind_info;
+    base::win::ScopedComPtr<IInternetBindInfo> bind_info;
     if (S_OK != bind_info.QueryFrom(bscb))
       return false;
   }
 
   // TODO(ananta)
   // Use the IsSubFrameRequest function to determine if a request is a top
   // level request. Something like this.
-  // ScopedComPtr<IUnknown> bscb_holder;
+  // base::win::ScopedComPtr<IUnknown> bscb_holder;
   // bind_context->GetObjectParam(L"_BSCB_Holder_", bscb_holder.Receive());
   // if (bscb_holder) {
-  //   ScopedComPtr<IHttpNegotiate> http_negotiate;
+  //   base::win::ScopedComPtr<IHttpNegotiate> http_negotiate;
   //   http_negotiate.QueryFrom(bscb_holder);
   //   if (http_negotiate && !IsSubFrameRequest(http_negotiate))
   //     return true;
   //  }
   // There are some cases where the IsSubFrameRequest function can return
   // incorrect results.
   bool should_wrap = mgr->IsTopLevelUrl(url);
   if (!should_wrap) {
     DVLOG(1) << __FUNCTION__ << " Url: " << url
              << " Not wrapping: Not top level url.";
   }
   return should_wrap;
 }
 
 // static
 HRESULT MonikerPatch::BindToObject(IMoniker_BindToObject_Fn original,
                                    IMoniker* me, IBindCtx* bind_ctx,
                                    IMoniker* to_left, REFIID iid, void** obj) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(to_left == NULL);
 
   ExceptionBarrierReportOnlyModule barrier;
 
   HRESULT hr = S_OK;
   // Bind context is marked for switch when we sniff data in BSCBStorageBind
   // and determine that the renderer to be used is Chrome.
-  ScopedComPtr<BindContextInfo> info;
+  base::win::ScopedComPtr<BindContextInfo> info;
   BindContextInfo::FromBindContext(bind_ctx, info.Receive());
   DCHECK(info);
   if (info) {
     if (info->is_switching()) {
       // We could implement the BindToObject ourselves here but instead we
       // simply register Chrome Frame ActiveDoc as a handler for 'text/html'
       // in this bind context.  This makes urlmon instantiate CF Active doc
       // instead of mshtml.
       const char* media_types[] = { "text/html" };
       CLSID classes[] = { CLSID_ChromeActiveDocument };
@@ skipping 34 matching lines @@
 
   // If the binding terminates before the data could be played back
   // now is the chance. Sometimes OnStopBinding happens after this returns
   // and then it's too late.
   if ((S_OK == hr) && callback)
     callback->MayPlayBack(BSCF_LASTDATANOTIFICATION);
 
   return hr;
 }