Fixes to address code review comments from tommi from CL http://codereview.ch...

chrome_frame/chrome_frame_activex.cc

 // Copyright (c) 2009 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/chrome_frame_activex.h"
 
 #include <wininet.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 359 matching lines @@
   if (document_url.SchemeIsSecure()) {
     GURL source_url(src);
     if (!source_url.SchemeIsSecure()) {
       Base::put_src(ScopedBstr(g_activex_mixed_content_error));
       return E_ACCESSDENIED;
     }
   }
   return Base::put_src(src);
 }
 
-STDMETHODIMP ChromeFrameActivex::SetSite(IUnknown* site) {
-  // We need to bootstrap our BHO if IE is running while chrome frame is
-  // installed. For new tabs and windows the newly registered BHO's are
-  // loaded. The bootstrapping is only needed for the current tab.
-  site_ = site;
-  return IObjectWithSiteImpl<ChromeFrameActivex>::SetSite(site);
-}
-
 HRESULT ChromeFrameActivex::IOleObject_SetClientSite(
     IOleClientSite* client_site) {
   HRESULT hr = Base::IOleObject_SetClientSite(client_site);
   if (FAILED(hr) || !client_site) {
     EventHandlers* handlers[] = {
       &onmessage_,
       &onloaderror_,
       &onload_,
       &onreadystatechanged_,
       &onextensionready_,
@@ skipping 204 matching lines @@
     return hr;
 
   HWND top_window = ::GetAncestor(parent_wnd, GA_ROOT);
   chrome_wndproc_hook_ = InstallLocalWindowHook(top_window);
   if (chrome_wndproc_hook_)
     TopLevelWindowMapping::instance()->AddMapping(top_window, m_hWnd);
 
   return chrome_wndproc_hook_ ? S_OK : E_FAIL;
 }
 
-HRESULT ChromeFrameActivex::RegisterBHOIfNeeded() {
-  if (!site_) {
+HRESULT ChromeFrameActivex::registerBhoIfNeeded() {
+  if (!m_spUnkSite) {
     NOTREACHED() << "Invalid client site";
     return E_FAIL;
   }
 
   if (NavigationManager::GetThreadInstance() != NULL) {
     DLOG(INFO) << "BHO already loaded";
     return S_OK;
   }
 
   ScopedComPtr<IWebBrowser2> web_browser2;
-  HRESULT hr = DoQueryService(SID_SWebBrowserApp, site_,
+  HRESULT hr = DoQueryService(SID_SWebBrowserApp, m_spUnkSite,
                               web_browser2.Receive());
   if (FAILED(hr) || web_browser2.get() == NULL) {
     DLOG(WARNING) << "Failed to get IWebBrowser2 from client site. Error:"
                   << StringPrintf(" 0x%08X", hr);
     return hr;
   }
 
   wchar_t bho_class_id_as_string[MAX_PATH] = {0};
   StringFromGUID2(CLSID_ChromeFrameBHO, bho_class_id_as_string,
                   arraysize(bho_class_id_as_string));
@@ skipping 10 matching lines @@
   if (FAILED(hr)) {
     NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:"
                  << StringPrintf(" 0x%08X", hr);
     return hr;
   }
 
   web_browser2->PutProperty(ScopedBstr(bho_class_id_as_string),
                             ScopedVariant(bho));
   return S_OK;
 }