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

chrome_frame/bho.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/bho.h"
 
 #include <shlguid.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 76 matching lines @@
 void ReadyModeDelegateImpl::DisableChromeFrame() {
   HttpNegotiatePatch::set_modify_user_agent(false);
   ProtocolSinkWrap::set_ignore_xua(true);
 }
 
 }  // namespace
 
 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);
       DCHECK(SUCCEEDED(hr)) << "DispEventAdvise failed. Error: " << hr;
 
       ready_mode::Configure(new ReadyModeDelegateImpl(), web_browser2);
     }
 
     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;
       if (browser_service) {
         g_patch_helper.PatchBrowserService(browser_service);
         DCHECK(SUCCEEDED(hr)) << "vtable_patch::PatchInterfaceMethods failed."
             << " Site: " << site << " Error: " << hr;
       }
     }
     // Save away our BHO instance in TLS which enables it to be referenced by
     // our active document/activex instances to query referrer and other
     // information for a URL.
     AddRef();
     RegisterThreadInstance();
     MetricsService::Start();
 
     if (!IncreaseWinInetConnections(kMaxHttpConnections)) {
       DLOG(WARNING) << "Failed to bump up HTTP connections. Error:"
                     << ::GetLastError();
     }
   } 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();
   }
 
   return IObjectWithSiteImpl<Bho>::SetSite(site);
 }
 
 STDMETHODIMP Bho::BeforeNavigate2(IDispatch* dispatch, VARIANT* url,
     VARIANT* flags, VARIANT* target_frame_name, VARIANT* post_data,
     VARIANT* headers, VARIANT_BOOL* cancel) {
   if (!url || url->vt != VT_BSTR || url->bstrVal == NULL) {
     DLOG(WARNING) << "Invalid URL passed in";
     return S_OK;
   }
 
-  ScopedComPtr<IWebBrowser2> web_browser2;
+  base::win::ScopedComPtr<IWebBrowser2> web_browser2;
   if (dispatch)
     web_browser2.QueryFrom(dispatch);
 
   if (!web_browser2) {
     NOTREACHED() << "Can't find WebBrowser2 with given dispatch";
     return S_OK;
   }
 
   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("")?
     referrer_.clear();
   }
 
   VARIANT_BOOL is_top_level = VARIANT_FALSE;
   web_browser2->get_TopLevelContainer(&is_top_level);
   if (is_top_level) {
     set_url(url->bstrVal);
     set_referrer("");
     set_post_data(post_data);
     set_headers(headers);
   }
   return S_OK;
 }
 
 STDMETHODIMP_(void) Bho::NavigateComplete2(IDispatch* dispatch, VARIANT* url) {
   DVLOG(1) << __FUNCTION__;
 }
 
 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);
 
   if (web_browser2) {
     VARIANT_BOOL is_top_level = VARIANT_FALSE;
     web_browser2->get_TopLevelContainer(&is_top_level);
     if (is_top_level) {
       CrashMetricsReporter::GetInstance()->IncrementMetric(
           CrashMetricsReporter::NAVIGATION_COUNT);
     }
   }
 }
 
 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);
       ::SafeArrayDestroy(sa);
     }
   }
 }
 
 // Returns true if the currently loaded document in the browser has
 // any embedded items such as a frame or an iframe.
 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))
                && fetched) {
           // If a top level document has embedded iframes then the theory is
           // 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
             // up as a temporary iframe in the parent document. It is not clear
             // as to how we can detect this. I tried the usual stuff like
             // getting to the parent IHTMLWindow2 interface. They all end up
             // pointing to dummy tear off interfaces owned by MSHTML.
             // As a temporary workaround, we found that the location url in
             // this case is about:blank. We now check for the same and don't
             // treat it as an iframe. This should be fine in most cases as we
@@ skipping 82 matching lines @@
   VARIANT_BOOL is_top_level = VARIANT_FALSE;
   browser->get_TopLevelContainer(&is_top_level);
   DCHECK(is_top_level);
 #endif
 
   std::wstring current_url(url, SysStringLen(url));
   if (IsValidUrlScheme(GURL(current_url), false)) {
     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);
     }
   }
 }
 
 bool PatchHelper::InitializeAndPatchProtocolsIfNeeded() {
   bool ret = false;
 
@@ skipping 19 matching lines @@
   }
 }
 
 void PatchHelper::UnpatchIfNeeded() {
   if (state_ == PATCH_PROTOCOL) {
     g_trans_hooks.RevertHooks();
     HttpNegotiatePatch::Uninitialize();
   }
   state_ = UNKNOWN;
 }