Revert 68293 - Revert 68290 - Restored missing BrokerRpcClient::Connect....

ceee/ie/plugin/bho/executor.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.
 //
 // CeeeExecutor implementation
 //
 // We use interfaces named ITabWindowManager and ITabWindow
 // (documented at
 // http://www.geoffchappell.com/viewer.htm?doc=studies/windows/ie/ieframe/interfaces/itabwindowmanager.htm
 // and
@@ skipping 352 matching lines @@
   }
   DCHECK(sync != NULL);
 
   hr = sync->Signal();
   if (FAILED(hr))
     LOG(ERROR) << "Failed to signal " << com::LogHr(hr);
 
   return hr;
 }
 
-CeeeExecutor::CeeeExecutor() : hwnd_(NULL) {
+CeeeExecutor::CeeeExecutor()
+    : hwnd_(NULL),
+      // Don't restart on broker crash. It won't work because executor was
+      // already registered in dead broker.
+      broker_rpc_client_(false) {
 }
 
 CeeeExecutor::~CeeeExecutor() {
 }
 
 HRESULT CeeeExecutor::CreateTabCall(ICeeeTabExecutor* executor,
                                     IUnknown *outer,
                                     REFIID riid2,
                                     IUnknown **out) {
   CComPtr<IUnknown> tab_call;
@@ skipping 35 matching lines @@
     return hr;
   }
 
   // If this is tab window then create the infobar manager.
   // TODO(mad@chromium.org): We are starting to need to have different classes
   // for the different executors.
   // TODO(hansl@chromium.org): We might not need to have an Executor for
   // Infobar. In any case, the construction below should have a reference to
   // a BHO and its EventSender so we don't create Infobars before the tab_id
   // is ready.
-  if (window_utils::GetTopLevelParent(hwnd_) != hwnd_)
+  if (window_utils::GetTopLevelParent(hwnd_) != hwnd_) {
+    hr = broker_rpc_client_.Connect(true);
+    if (FAILED(hr))
+      return hr;
     infobar_manager_.reset(
-        new infobar_api::InfobarManager(hwnd_, new BrokerRpcClient(false)));
+        new infobar_api::InfobarManager(hwnd_, &broker_rpc_client_));
+  }
 
   return S_OK;
 }
 
 HRESULT CeeeExecutor::GetWebBrowser(IWebBrowser2** browser) {
   DCHECK(browser);
   CComPtr<IFrameEventHandlerHost> frame_handler_host;
   HRESULT hr = GetSite(IID_IFrameEventHandlerHost,
                        reinterpret_cast<void**>(&frame_handler_host));
   if (FAILED(hr)) {
@@ skipping 564 matching lines @@
 
 STDMETHODIMP CeeeExecutor::OnTopFrameBeforeNavigate(BSTR url) {
   DCHECK(infobar_manager_ != NULL) << "infobar_manager_ is not initialized";
   if (infobar_manager_ == NULL)
     return E_FAIL;
 
   // According to the specification, tab navigation closes the infobar.
   infobar_manager_->HideAll();
   return S_OK;
 }