Merge 68951 - Added refreshing of elevation policy on first run of new versio...

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>
 
@@ skipping 240 matching lines @@
       std::hex << parent.get();
 
   *parent_browser = parent.Detach();
   return S_OK;
 }
 
 HRESULT BrowserHelperObject::GetBrokerRegistrar(ICeeeBrokerRegistrar** broker) {
   DCHECK(broker);
   if (broker == NULL)
     return E_INVALIDARG;
-  HRESULT hr = ::CoCreateInstance(CLSID_CeeeBroker, NULL, CLSCTX_ALL,
-                                  IID_ICeeeBrokerRegistrar,
-                                  reinterpret_cast<void**>(broker));
-  DCHECK(SUCCEEDED(hr) && *broker) << "CoCreating Broker. " << com::LogHr(hr);
+  HRESULT hr = StartCeeeBroker(broker);
   if (FAILED(hr) || *broker == NULL)
     return com::AlwaysError(hr);
   return hr;
 }
 
 HRESULT BrowserHelperObject::CreateExecutor(IUnknown** executor) {
   HRESULT hr = ::CoCreateInstance(
       CLSID_CeeeExecutor, NULL, CLSCTX_INPROC_SERVER,
       IID_IUnknown, reinterpret_cast<void**>(executor));
   if (SUCCEEDED(hr)) {
@@ skipping 1348 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());
 }