Restart of ceee_broker on crash.

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 84 matching lines @@
 BrowserHelperObject::BrowserHelperObject()
     : already_tried_installing_(false),
       tab_window_(NULL),
       tab_id_(kInvalidChromeSessionId),
       fired_on_created_event_(false),
       lower_bound_ready_state_(READYSTATE_UNINITIALIZED),
       ie7_or_later_(false),
       thread_id_(::GetCurrentThreadId()),
       full_tab_chrome_frame_(false),
       broker_client_queue_(this),
+      broker_rpc_(false),
       tab_events_funnel_(broker_client()) {
   TRACE_EVENT_BEGIN("ceee.bho", this, "");
 }
 
 BrowserHelperObject::~BrowserHelperObject() {
   TRACE_EVENT_END("ceee.bho", this, "");
 }
 
 HRESULT BrowserHelperObject::FinalConstruct() {
   if (ceee_module_util::GetOptionToolbandIsHidden()) {
@@ skipping 718 matching lines @@
         port_id, message));
     VLOG(2) << "Deferred PostMessage(" << port_id << ", \"" << message << "\")";
     return S_FALSE;
   } else {
     return PostMessageImpl(port_id, message);
   }
 }
 
 HRESULT BrowserHelperObject::PostMessageImpl(int port_id,
                                              const std::string& message) {
-    return extension_port_manager_.PostMessage(port_id, message);
+  return extension_port_manager_.PostMessage(port_id, message);
 }
 
 HRESULT BrowserHelperObject::OnCfPrivateMessage(BSTR msg,
                                                 BSTR origin,
                                                 BSTR target) {
   const wchar_t* start = com::ToString(target);
   const wchar_t* end = start + SysStringLen(target);
   if (LowerCaseEqualsASCII(start, end, ext::kAutomationPortRequestTarget) ||
       LowerCaseEqualsASCII(start, end, ext::kAutomationPortResponseTarget)) {
     extension_port_manager_.OnPortMessage(msg);
@@ skipping 94 matching lines @@
   if (V_VT(url) != VT_BSTR) {
     LOG(ERROR) << "OnNavigateComplete2 url VT=" << V_VT(url);
     return;
   }
 
   mu::ScopedTimer metrics_timer("ceee/BHO.NavigateComplete", &broker_rpc());
   base::win::ScopedBstr url_bstr(url->bstrVal);
   HandleNavigateComplete(webbrowser, url_bstr);
 
   for (std::vector<Sink*>::iterator iter = sinks_.begin();
-    iter != sinks_.end(); ++iter) {
+       iter != sinks_.end(); ++iter) {
       (*iter)->OnNavigateComplete(webbrowser, url_bstr);

[Sigurður Ásgeirsson, 2010/12/01 14:23:54]

nit: indent -1

[MAD, 2010/12/01 16:35:23]

Actually, -1 for "iter !=" and -2 for "(*iter)->"

[Vitaly Buka corp, 2010/12/01 19:06:04]

That is strange. I didn't touch this code.
I'll fix for consistency -2. I didn't do -1 because this file has 7 loops in
this way.
On 2010/12/01 16:35:23, MAD wrote:

   }
 }
 
 STDMETHODIMP_(void) BrowserHelperObject::OnNavigateError(
     IDispatch* webbrowser_disp, VARIANT* url, VARIANT* /*target_frame_name*/,
     VARIANT* status_code, VARIANT_BOOL* /*cancel*/) {
   if (webbrowser_disp == NULL || url == NULL || status_code == NULL) {
     LOG(ERROR) << "OnNavigateError got invalid parameter(s)";
     return;
   }
@@ skipping 402 matching lines @@
     DCHECK(it->second != NULL);
     READYSTATE this_ready_state = it->second->GetReadyState();
     if (this_ready_state < new_lowest_ready_state) {
       new_lowest_ready_state = this_ready_state;
     }
   }
 
   READYSTATE old_state = lower_bound_ready_state_;
   READYSTATE new_state = new_lowest_ready_state;
   if (old_state == new_state)
-    return S_OK;
+  return S_OK;

[Sigurður Ásgeirsson, 2010/12/01 14:23:54]

nit: indent +2

[Vitaly Buka corp, 2010/12/01 19:06:04]

Same here.
On 2010/12/01 14:23:54, Ruðrugis wrote:

 
   // Remember the new lowest ready state as our current one.
   lower_bound_ready_state_ = new_state;
 
   // Fire the event if the new ready state got us to or away from complete.
   if (old_state == READYSTATE_COMPLETE || new_state == READYSTATE_COMPLETE)
     FireOnUpdatedEvent(NULL, new_state);
   return S_OK;
 }
 
@@ skipping 194 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());
 }