Use the RPC channel to set the ID <-> handle mapping....

ceee/ie/plugin/bho/browser_helper_object_unittest.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 <exdisp.h>
 #include <shlguid.h>
 
 #include "ceee/common/initializing_coclass.h"
+#include "ceee/ie/common/constants.h"
 #include "ceee/ie/common/mock_ceee_module_util.h"
 #include "ceee/ie/testing/mock_broker_and_friends.h"
 #include "ceee/ie/testing/mock_browser_and_friends.h"
 #include "ceee/ie/testing/mock_chrome_frame_host.h"
 #include "ceee/testing/utils/dispex_mocks.h"
 #include "ceee/testing/utils/instance_count_mixin.h"
 #include "ceee/testing/utils/mock_com.h"
 #include "ceee/testing/utils/test_utils.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
@@ skipping 837 matching lines @@
   ExpectFireOnRemovedEvent(0);
   ExpectFireOnUnmappedEvent(1);
   ASSERT_HRESULT_SUCCEEDED(bho_with_site_->SetSite(NULL));
 }
 
 TEST_F(BrowserHelperObjectTest, SetToolBandSessionId) {
   CreateSite();
   CreateBrowser();
 
   ASSERT_HRESULT_SUCCEEDED(bho_with_site_->SetSite(site_keeper_));
-  EXPECT_CALL(*(bho_->broker_), SetTabToolBandIdForHandle(kGoodTabId,
-        kGoodTabHandle)).WillOnce(Return(S_OK));
+  EXPECT_CALL(bho_->mock_broker_rpc_client_, FireEvent(
+      StrEq(ceee_event_names::kCeeeMapToolbandIdToHandle), _)).
+          WillOnce(Return(S_OK));
   EXPECT_EQ(S_OK, bho_->SetToolBandSessionId(kGoodTabId));
 
-  EXPECT_CALL(*(bho_->broker_), SetTabToolBandIdForHandle(kGoodTabId,
-        kGoodTabHandle)).WillOnce(Return(E_FAIL));
+  EXPECT_CALL(bho_->mock_broker_rpc_client_, FireEvent(
+      StrEq(ceee_event_names::kCeeeMapToolbandIdToHandle), _)).
+          WillOnce(Return(E_FAIL));
   EXPECT_EQ(E_FAIL, bho_->SetToolBandSessionId(kGoodTabId));
 
   ExpectFireOnRemovedEvent(0);
   ExpectFireOnUnmappedEvent(1);
   ASSERT_HRESULT_SUCCEEDED(bho_with_site_->SetSite(NULL));
 }
 
 TEST(BrowserHelperObjectLifeCycleTest, NoBhoForInvisibleToolband) {
   StrictMock<testing::MockCeeeModuleUtils> ceee_module_utils;
     EXPECT_CALL(ceee_module_utils, GetOptionToolbandIsHidden())
         .WillOnce(Return(false));
 
   TestingBrowserHelperObject* bho;
   base::win::ScopedComPtr<IObjectWithSite> bho_with_site;
   ASSERT_HRESULT_SUCCEEDED(
       TestingBrowserHelperObject::CreateInitialized(&bho,
           bho_with_site.Receive()));
   bho_with_site.Release();
   bho = NULL;
 
   EXPECT_CALL(ceee_module_utils, GetOptionToolbandIsHidden())
         .WillOnce(Return(true));
   ASSERT_HRESULT_FAILED(
       TestingBrowserHelperObject::CreateInitialized(&bho,
           bho_with_site.Receive()));
   ASSERT_EQ(0, testing::InstanceCountMixinBase::all_instance_count());
 }
 
 }  // namespace