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

chrome_frame/bho.cc

Index: chrome_frame/bho.cc
diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc
index 5ac26f429ce3880c01a1e0ae34537cf252bb81d8..f6b87a44cf44c3b7fb3332e0e9115d9df864f871 100644
--- a/chrome_frame/bho.cc
+++ b/chrome_frame/bho.cc
@@ -94,7 +94,7 @@ void ReadyModeDelegateImpl::DisableChromeFrame() {
 STDMETHODIMP Bho::SetSite(IUnknown* site) {
   HRESULT hr = S_OK;
   if (site) {
-    ScopedComPtr<IWebBrowser2> web_browser2;
+    base::win::ScopedComPtr<IWebBrowser2> web_browser2;
     web_browser2.QueryFrom(site);
     if (web_browser2) {
       hr = DispEventAdvise(web_browser2, &DIID_DWebBrowserEvents2);
@@ -104,7 +104,7 @@ STDMETHODIMP Bho::SetSite(IUnknown* site) {
     }
 
     if (g_patch_helper.state() == PatchHelper::PATCH_IBROWSER) {
-      ScopedComPtr<IBrowserService> browser_service;
+      base::win::ScopedComPtr<IBrowserService> browser_service;
       hr = DoQueryService(SID_SShellBrowser, site, browser_service.Receive());
       DCHECK(browser_service) << "DoQueryService - SID_SShellBrowser failed."
           << " Site: " << site << " Error: " << hr;
@@ -128,7 +128,7 @@ STDMETHODIMP Bho::SetSite(IUnknown* site) {
   } else {
     UnregisterThreadInstance();
     buggy_bho::BuggyBhoTls::DestroyInstance();
-    ScopedComPtr<IWebBrowser2> web_browser2;
+    base::win::ScopedComPtr<IWebBrowser2> web_browser2;
     web_browser2.QueryFrom(m_spUnkSite);
     DispEventUnadvise(web_browser2, &DIID_DWebBrowserEvents2);
     Release();
@@ -145,7 +145,7 @@ STDMETHODIMP Bho::BeforeNavigate2(IDispatch* dispatch, VARIANT* url,
     return S_OK;
   }
 
-  ScopedComPtr<IWebBrowser2> web_browser2;
+  base::win::ScopedComPtr<IWebBrowser2> web_browser2;
   if (dispatch)
     web_browser2.QueryFrom(dispatch);
 
@@ -156,7 +156,7 @@ STDMETHODIMP Bho::BeforeNavigate2(IDispatch* dispatch, VARIANT* url,
 
   DVLOG(1) << "BeforeNavigate2: " << url->bstrVal;
 
-  ScopedComPtr<IBrowserService> browser_service;
+  base::win::ScopedComPtr<IBrowserService> browser_service;
   DoQueryService(SID_SShellBrowser, web_browser2, browser_service.Receive());
   if (!browser_service || !CheckForCFNavigation(browser_service, false)) {
     // TODO(tommi): Remove? Isn't this done below by calling set_referrer("")?
@@ -181,7 +181,7 @@ STDMETHODIMP_(void) Bho::NavigateComplete2(IDispatch* dispatch, VARIANT* url) {
 STDMETHODIMP_(void) Bho::DocumentComplete(IDispatch* dispatch, VARIANT* url) {
   DVLOG(1) << __FUNCTION__;
 
-  ScopedComPtr<IWebBrowser2> web_browser2;
+  base::win::ScopedComPtr<IWebBrowser2> web_browser2;
   if (dispatch)
     web_browser2.QueryFrom(dispatch);
 
@@ -199,12 +199,12 @@ namespace {
 
 // See comments in Bho::OnHttpEquiv for details.
 void ClearDocumentContents(IUnknown* browser) {
-  ScopedComPtr<IWebBrowser2> web_browser2;
+  base::win::ScopedComPtr<IWebBrowser2> web_browser2;
   if (SUCCEEDED(DoQueryService(SID_SWebBrowserApp, browser,
                                web_browser2.Receive()))) {
-    ScopedComPtr<IDispatch> doc_disp;
+    base::win::ScopedComPtr<IDispatch> doc_disp;
     web_browser2->get_Document(doc_disp.Receive());
-    ScopedComPtr<IHTMLDocument2> doc;
+    base::win::ScopedComPtr<IHTMLDocument2> doc;
     if (doc_disp && SUCCEEDED(doc.QueryFrom(doc_disp))) {
       SAFEARRAY* sa = ::SafeArrayCreateVector(VT_UI1, 0, 0);
       doc->write(sa);
@@ -218,17 +218,17 @@ void ClearDocumentContents(IUnknown* browser) {
 bool DocumentHasEmbeddedItems(IUnknown* browser) {
   bool has_embedded_items = false;
 
-  ScopedComPtr<IWebBrowser2> web_browser2;
-  ScopedComPtr<IDispatch> document;
+  base::win::ScopedComPtr<IWebBrowser2> web_browser2;
+  base::win::ScopedComPtr<IDispatch> document;
   if (SUCCEEDED(DoQueryService(SID_SWebBrowserApp, browser,
                                web_browser2.Receive())) &&
       SUCCEEDED(web_browser2->get_Document(document.Receive()))) {
-    ScopedComPtr<IOleContainer> container;
+    base::win::ScopedComPtr<IOleContainer> container;
     if (SUCCEEDED(container.QueryFrom(document))) {
-      ScopedComPtr<IEnumUnknown> enumerator;
+      base::win::ScopedComPtr<IEnumUnknown> enumerator;
       container->EnumObjects(OLECONTF_EMBEDDINGS, enumerator.Receive());
       if (enumerator) {
-        ScopedComPtr<IUnknown> unk;
+        base::win::ScopedComPtr<IUnknown> unk;
         DWORD fetched = 0;
         while (!has_embedded_items &&
                SUCCEEDED(enumerator->Next(1, unk.Receive(), &fetched))
@@ -237,7 +237,7 @@ bool DocumentHasEmbeddedItems(IUnknown* browser) {
           // that first the top level document finishes loading and then the
           // iframes load. We should only treat an embedded element as an
           // iframe if it supports the IWebBrowser interface.
-          ScopedComPtr<IWebBrowser2> embedded_web_browser2;
+          base::win::ScopedComPtr<IWebBrowser2> embedded_web_browser2;
           if (SUCCEEDED(embedded_web_browser2.QueryFrom(unk))) {
             // If we initiate a top level navigation then at times MSHTML
             // creates a temporary IWebBrowser2 interface which basically shows
@@ -340,7 +340,7 @@ void Bho::ProcessOptInUrls(IWebBrowser2* browser, BSTR url) {
     bool cf_protocol = StartsWith(current_url, kChromeProtocolPrefix, false);
     if (!cf_protocol && IsChrome(RendererTypeForUrl(current_url))) {
       DVLOG(1) << "Opt-in URL. Switching to cf.";
-      ScopedComPtr<IBrowserService> browser_service;
+      base::win::ScopedComPtr<IBrowserService> browser_service;
       DoQueryService(SID_SShellBrowser, browser, browser_service.Receive());
       DCHECK(browser_service) << "DoQueryService - SID_SShellBrowser failed.";
       MarkBrowserOnThreadForCFNavigation(browser_service);