ceee: Include base/win/scope_comptr.h instead of base/scoped_comptr_win.h

ceee/ie/plugin/toolband/tool_band.cc

 // Copyright (c) 2010 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.
 //
 // IE toolband implementation.
 #include "ceee/ie/plugin/toolband/tool_band.h"
 
 #include <atlsafe.h>
 #include <atlstr.h>
 #include <shlguid.h>
@@ skipping 269 matching lines @@
     listening_to_browser_events_ = SUCCEEDED(hr);
     DCHECK(SUCCEEDED(hr)) <<
       "DispEventAdvise on web browser failed. Error: " << hr;
     // Non-critical functionality. If fails in the field, just move on.
   }
 
   return S_OK;
 }
 
 HRESULT ToolBand::InitializeAndShowWindow(IUnknown* site) {
-  ScopedComPtr<IOleWindow> site_window;
+  base::win::ScopedComPtr<IOleWindow> site_window;
   HRESULT hr = site_window.QueryFrom(site);
   if (FAILED(hr)) {
     LOG(ERROR) << "Failed to get site window: " << com::LogHr(hr);
     return hr;
   }
 
   DCHECK(NULL != site_window.get());
   hr = site_window->GetWindow(&parent_window_.m_hWnd);
   if (FAILED(hr)) {
     LOG(ERROR) << "Failed to get parent window handle: " << com::LogHr(hr);
@@ skipping 11 matching lines @@
 
   return hr;
 }
 
 HRESULT ToolBand::Teardown() {
   TRACE_EVENT_INSTANT("ceee.toolband.teardown", this, "");
 
   if (IsWindow()) {
     // Teardown the ActiveX host window.
     CAxWindow host(m_hWnd);
-    ScopedComPtr<IObjectWithSite> host_with_site;
+    base::win::ScopedComPtr<IObjectWithSite> host_with_site;
     HRESULT hr = host.QueryHost(host_with_site.Receive());
     if (SUCCEEDED(hr))
       host_with_site->SetSite(NULL);
 
     DestroyWindow();
   }
 
   if (chrome_frame_) {
     ChromeFrameEvents::DispEventUnadvise(chrome_frame_);
   }
@@ skipping 10 matching lines @@
 
 void ToolBand::OnFinalMessage(HWND window) {
   GetUnknown()->Release();
 }
 
 LRESULT ToolBand::OnCreate(LPCREATESTRUCT lpCreateStruct) {
   // Grab a self-reference.
   GetUnknown()->AddRef();
 
   // Create a host window instance.
-  ScopedComPtr<IAxWinHostWindow> host;
+  base::win::ScopedComPtr<IAxWinHostWindow> host;
   HRESULT hr = CAxHostWindow::CreateInstance(host.Receive());
   if (FAILED(hr)) {
     LOG(ERROR) << "Failed to create ActiveX host window. " << com::LogHr(hr);
     return 1;
   }
 
   // We're the site for the host window, this needs to be in place
   // before we attach ChromeFrame to the ActiveX control window, so
   // as to allow it to probe our service provider.
   hr = SetChildSite(host);
@@ skipping 193 matching lines @@
     // user deleted the extension but the registry stayed the same.
     already_tried_installing_ = true;
     chrome_frame_->installExtension(CComBSTR(extension_path_.c_str()));
   } else {
     // Hide the browser bar as fast as we can.
     // Set the current height of the bar to 0, so that if the user manually
     // shows the bar, it will not be visible on screen.
     current_height_ = 0;
 
     // Ask IE to reload all info for this toolband.
-    ScopedComPtr<IOleCommandTarget> cmd_target;
+    base::win::ScopedComPtr<IOleCommandTarget> cmd_target;
     HRESULT hr = GetSite(IID_IOleCommandTarget,
                          reinterpret_cast<void**>(cmd_target.Receive()));
     if (SUCCEEDED(hr)) {
       CComVariant band_id(static_cast<int>(band_id_));
       hr = cmd_target->Exec(&CGID_DeskBand, DBID_BANDINFOCHANGED,
                             OLECMDEXECOPT_DODEFAULT, &band_id, NULL);
       if (FAILED(hr)) {
         LOG(ERROR) << "Failed to Execute DBID_BANDINFOCHANGED. Error Code: "
             << com::LogHr(hr);
       }
@@ skipping 99 matching lines @@
         std::hex << hr;
     return hr;
   }
 
   if (existing_bho.vt != VT_EMPTY) {
     DCHECK(existing_bho.vt == VT_UNKNOWN && existing_bho.punkVal != NULL);
 #ifndef NDEBUG
     if (existing_bho.vt == VT_UNKNOWN && existing_bho.punkVal != NULL) {
       // This is a sanity / assumption check regarding what we should regard
       // as a valid BHO.
-      ScopedComPtr<IPersist> bho_iid_access;
+      base::win::ScopedComPtr<IPersist> bho_iid_access;
       HRESULT hr2 = bho_iid_access.QueryFrom(existing_bho.punkVal);
       DCHECK(SUCCEEDED(hr2) && bho_iid_access.get() != NULL);
       if (SUCCEEDED(hr2) && bho_iid_access.get() != NULL) {
         CLSID calling_card = {};
         hr2 = bho_iid_access->GetClassID(&calling_card);
         DCHECK(SUCCEEDED(hr2) && calling_card == CLSID_BrowserHelperObject);
       }
     }
 #endif
     DVLOG(1) << "BHO already loaded";
     if (existing_bho.vt != VT_UNKNOWN || existing_bho.punkVal == NULL)
       return E_FAIL;
 
     hr = SendSessionIdToBho(existing_bho.punkVal);
     DCHECK(SUCCEEDED(hr)) << "Failed to send tool band session ID to the " <<
         "BHO." << com::LogHr(hr);
     return SUCCEEDED(hr) ? S_OK : hr;
   }
 
-  ScopedComPtr<IObjectWithSite> bho;
+  base::win::ScopedComPtr<IObjectWithSite> bho;
   hr = CreateBhoInstance(bho.Receive());
 
   if (FAILED(hr)) {
     NOTREACHED() << "Failed to create CEEE BHO." << com::LogHr(hr);
     return hr;
   }
 
   hr = bho->SetSite(web_browser_);
   if (FAILED(hr)) {
     NOTREACHED() << "CEEE BHO SetSite failed.:" << com::LogHr(hr);
@@ skipping 13 matching lines @@
   return SUCCEEDED(hr) ? S_OK : hr;
 }
 
 HRESULT ToolBand::CreateBhoInstance(IObjectWithSite** new_bho_instance) {
   DCHECK(new_bho_instance != NULL && *new_bho_instance == NULL);
   return BrowserHelperObject::CreateInstance(new_bho_instance);
 }
 
 HRESULT ToolBand::GetSessionId(int* session_id) {
   if (chrome_frame_) {
-    ScopedComPtr<IChromeFrameInternal> chrome_frame_internal_;
+    base::win::ScopedComPtr<IChromeFrameInternal> chrome_frame_internal_;
     chrome_frame_internal_.QueryFrom(chrome_frame_);
     if (chrome_frame_internal_) {
       return chrome_frame_internal_->getSessionId(session_id);
     }
   }
   NOTREACHED();
   return E_UNEXPECTED;
 }
 
 HRESULT ToolBand::SendSessionIdToBho(IUnknown* bho) {
   if (already_sent_id_to_bho_)
     return S_FALSE;
   // Now send the tool band's session ID to the BHO.
-  ScopedComPtr<ICeeeBho> ceee_bho;
+  base::win::ScopedComPtr<ICeeeBho> ceee_bho;
   HRESULT hr = ceee_bho.QueryFrom(bho);
   if (SUCCEEDED(hr)) {
     int session_id = 0;
     hr = GetSessionId(&session_id);
     if (SUCCEEDED(hr)) {
       hr = ceee_bho->SetToolBandSessionId(session_id);
       if (SUCCEEDED(hr))
         already_sent_id_to_bho_ = true;
       return hr;
     }
   }
   return E_FAIL;
 }