Avoid double-setting of the tool band ID in the CEEE executors manager....

ceee/ie/plugin/toolband/tool_band.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 toolband implementation.
 #include "ceee/ie/plugin/toolband/tool_band.h"
 
 #include <atlsafe.h>
 #include <atlstr.h>
 #include <shlguid.h>
@@ skipping 39 matching lines @@
 _ATL_FUNC_INFO ToolBand::handler_type_idispatch_variantref_ =
     { CC_STDCALL, VT_EMPTY, 2, { VT_DISPATCH, VT_VARIANT | VT_BYREF } };
 
 ToolBand::ToolBand()
     : already_tried_installing_(false),
       own_line_flag_(false),
       already_checked_own_line_flag_(false),
       listening_to_browser_events_(false),
       band_id_(0),
       is_quitting_(false),
+      already_sent_id_to_bho_(false),
       current_width_(kToolBandMinWidth),
       current_height_(kToolBandHeight) {
   TRACE_EVENT_BEGIN("ceee.toolband", this, "");
 }
 
 ToolBand::~ToolBand() {
   TRACE_EVENT_END("ceee.toolband", this, "");
 }
 
 HRESULT ToolBand::FinalConstruct() {
@@ skipping 619 matching lines @@
       if (SUCCEEDED(hr2) && bho_iid_access.get() != NULL) {
         CLSID calling_card = {};
         hr2 = bho_iid_access->GetClassID(&calling_card);
         DCHECK(SUCCEEDED(hr2) && calling_card == CLSID_BrowserHelperObject);
       }
     }
 #endif
     DVLOG(1) << "BHO already loaded";
     if (existing_bho.vt != VT_UNKNOWN || existing_bho.punkVal == NULL)
       return E_FAIL;
-    else
-      return SendSessionIdToBho(existing_bho.punkVal);
+
+    hr = SendSessionIdToBho(existing_bho.punkVal);
+    DCHECK(SUCCEEDED(hr)) << "Failed to send tool band session ID to the " <<
+        "BHO." << com::LogHr(hr);
+    return SUCCEEDED(hr) ? S_OK : hr;
   }
 
   ScopedComPtr<IObjectWithSite> bho;
   hr = CreateBhoInstance(bho.Receive());
 
   if (FAILED(hr)) {
     NOTREACHED() << "Failed to create CEEE BHO." << com::LogHr(hr);
     return hr;
   }
 
   hr = bho->SetSite(web_browser_);
   if (FAILED(hr)) {
     NOTREACHED() << "CEEE BHO SetSite failed.:" << com::LogHr(hr);
     return hr;
   }
 
   hr = web_browser_->PutProperty(bho_class_id_bstr, CComVariant(bho));
   if (FAILED(hr)) {
     LOG(ERROR) << "Assigning BHO to the web browser failed." << com::LogHr(hr);
     return hr;
   }
   LOG_IF(INFO, SUCCEEDED(hr)) << "CEEE BHO has been created by the toolband.";
 
-  return SendSessionIdToBho(bho);
+  hr = SendSessionIdToBho(bho);
+  DCHECK(SUCCEEDED(hr)) << "Failed to send tool band session ID to the BHO." <<
+      com::LogHr(hr);
+  return SUCCEEDED(hr) ? S_OK : hr;
 }
 
 HRESULT ToolBand::CreateBhoInstance(IObjectWithSite** new_bho_instance) {
   DCHECK(new_bho_instance != NULL && *new_bho_instance == NULL);
   return BrowserHelperObject::CreateInstance(new_bho_instance);
 }
 
 HRESULT ToolBand::GetSessionId(int* session_id) {
   if (chrome_frame_) {
     ScopedComPtr<IChromeFrameInternal> chrome_frame_internal_;
     chrome_frame_internal_.QueryFrom(chrome_frame_);
     if (chrome_frame_internal_) {
       return chrome_frame_internal_->getSessionId(session_id);
     }
   }
   NOTREACHED();
   return E_UNEXPECTED;
 }
 
 HRESULT ToolBand::SendSessionIdToBho(IUnknown* bho) {
+  if (already_sent_id_to_bho_)
+    return S_FALSE;
   // Now send the tool band's session ID to the BHO.
   ScopedComPtr<ICeeeBho> ceee_bho;
   HRESULT hr = ceee_bho.QueryFrom(bho);
   if (SUCCEEDED(hr)) {
     int session_id = 0;
     hr = GetSessionId(&session_id);
     if (SUCCEEDED(hr)) {
-      return ceee_bho->SetToolBandSessionId(session_id);
+      hr = ceee_bho->SetToolBandSessionId(session_id);
+      if (SUCCEEDED(hr))
+        already_sent_id_to_bho_ = true;
+      return hr;
     }
   }
   return E_FAIL;
 }