Revert 71377 - Added loading of nested BHO....

ceee/ie/plugin/bho/browser_helper_object.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 browser helper object implementation.
 #include "ceee/ie/plugin/bho/browser_helper_object.h"
 
 #include <atlsafe.h>
 #include <shlguid.h>
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
-#include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/tuple.h"
 #include "base/utf_string_conversions.h"
 #include "ceee/common/com_utils.h"
 #include "ceee/common/window_utils.h"
 #include "ceee/common/windows_constants.h"
 #include "ceee/ie/broker/tab_api_module.h"
 #include "ceee/ie/common/constants.h"
 #include "ceee/ie/common/extension_manifest.h"
 #include "ceee/ie/common/ie_util.h"
@@ skipping 86 matching lines @@
   TRACE_EVENT_END("ceee.bho", this, "");
 }
 
 HRESULT BrowserHelperObject::FinalConstruct() {
   if (ceee_module_util::GetOptionToolbandIsHidden()) {
     // Patching wininet when BHO could not be created considered pointless.
     LOG(INFO) <<
         "Refused to instantiate the BHO when the visual component is hidden.";
     return E_FAIL;
   }
-
-  const wchar_t* bho_list = NULL;
-  ::LoadString(_pModule->m_hInstResource, IDS_CEEE_NESTED_BHO_LIST,
-               reinterpret_cast<wchar_t*>(&bho_list), 0);
-  if (bho_list == NULL) {
-    LOG(ERROR) << "Failed to load string: " << GetLastError();
-  } else {
-    std::vector<std::wstring> guids;
-    base::SplitString(bho_list, ',', &guids);
-    for (size_t i = 0; i < guids.size(); ++i) {
-      CLSID clsid;
-      base::win::ScopedComPtr<IObjectWithSite> factory;
-      HRESULT hr = ::CLSIDFromString(guids[i].c_str(), &clsid);
-      if (SUCCEEDED(hr)) {
-        hr = factory.CreateInstance(clsid);
-        if (SUCCEEDED(hr)) {
-          nested_bho_.push_back(factory);
-        } else {
-          LOG(ERROR) << "Failed to load " << guids[i] << " " << com::LogWe(hr);
-        }
-      } else {
-        LOG(ERROR) << "Invalid CLSID " << guids[i] << " " << com::LogWe(hr);
-      }
-    }
-  }
-
   return S_OK;
 }
 
 void BrowserHelperObject::FinalRelease() {
   // Need to disconnect outside of destructor, because we use a virtual method
   // for unit testing.
   broker_rpc().Disconnect();
   web_browser_.Release();
-  nested_bho_.clear();
 }
 
 void BrowserHelperObject::ReportAddonTimes(const char* name,
                                            const CLSID& clsid) {
   ReportSingleAddonTime(name, clsid, "LoadTime");
   ReportSingleAddonTime(name, clsid, "NavTime");
 }
 
 void BrowserHelperObject::ReportSingleAddonTime(const char* name,
                                                 const CLSID& clsid,
@@ skipping 17 matching lines @@
     break;
   default:
     counter_name += 'x';
     break;
   }
   VLOG(1) << counter_name << "=" << time;
   broker_rpc().SendUmaHistogramTimes(counter_name.c_str(), time);
 }
 
 STDMETHODIMP BrowserHelperObject::SetSite(IUnknown* site) {
-  for (size_t i = 0; i < nested_bho_.size(); ++i) {
-    HRESULT hr = nested_bho_[i]->SetSite(site);
-    LOG_IF(ERROR, FAILED(hr)) << "Failed to set site of nested BHO" <<
-        com::LogWe(hr);
-  }
+  typedef IObjectWithSiteImpl<BrowserHelperObject> SuperSite;
 
   // From experience, we know the site may be set multiple times.
   // Let's ignore second and subsequent set or unset.
   if (site != NULL && m_spUnkSite.p != NULL ||
       site == NULL && m_spUnkSite.p == NULL ) {
     LOG(WARNING) << "Duplicate call to SetSite, previous site "
                  << m_spUnkSite.p << " new site " << site;
     return S_OK;
   }
 
   if (NULL == site) {
     mu::ScopedTimer metrics_timer("ceee/BHO.TearDown", &broker_rpc());
 
     // TODO(vitalybuka@chromium.org): switch to sampling when we have enough
     // users.
     ReportAddonTimes("BHO", CLSID_BrowserHelperObject);
     ReportAddonTimes("ChromeFrameBHO", CLSID_ChromeFrameBHO);
     ReportAddonTimes("Toolband", CLSID_ToolBand);
 
     // We're being torn down.
     TearDown();
 
     FireOnRemovedEvent();
     // This call should be the last thing we send to the broker.
     FireOnUnmappedEvent();
   }
 
-  typedef IObjectWithSiteImpl<BrowserHelperObject> SuperSite;
   HRESULT hr = SuperSite::SetSite(site);
   if (FAILED(hr))
     return hr;
 
   if (NULL != site) {
     // We're being initialized.
     hr = Initialize(site);
 
     // Release the site, and tear down our own state in case of failure.
     if (FAILED(hr)) {
@@ skipping 1428 matching lines @@
     return S_FALSE;
   } else {
     return SendEventToBrokerImpl(event_name, event_args);
   }
 }
 
 HRESULT BrowserHelperObject::SendEventToBrokerImpl(
     const std::string& event_name, const std::string& event_args) {
   return broker_rpc().FireEvent(event_name.c_str(), event_args.c_str());
 }