Ensure that just started broker doesn't get events addressed to dead instance.

ceee/ie/broker/broker_rpc_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.
 
 #include "ceee/ie/broker/broker_rpc_client.h"
 #include "ceee/ie/broker/broker_rpc_server.h"
 
 #include <atlbase.h>
 #include "broker_rpc_lib.h"  // NOLINT
 #include "ceee/ie/broker/broker_rpc_utils.h"
@@ skipping 12 matching lines @@
 using testing::_;
 
 MOCK_STATIC_CLASS_BEGIN(BrokerRpcMock)
   MOCK_STATIC_INIT_BEGIN(BrokerRpcMock)
     MOCK_STATIC_INIT(GetRpcEndPointAddress);
     MOCK_STATIC_INIT(BrokerRpcServer_FireEvent);
     MOCK_STATIC_INIT(BrokerRpcServer_SendUmaHistogramTimes);
     MOCK_STATIC_INIT(BrokerRpcServer_SendUmaHistogramData);
   MOCK_STATIC_INIT_END()
   MOCK_STATIC0(std::wstring, , GetRpcEndPointAddress);
-  MOCK_STATIC3(void, , BrokerRpcServer_FireEvent, handle_t, const char*,
-               const char*);
+  MOCK_STATIC4(void, , BrokerRpcServer_FireEvent, handle_t, BrokerContextHandle,
+               const char*, const char*);
   MOCK_STATIC3(void, , BrokerRpcServer_SendUmaHistogramTimes, handle_t,
                const char*, int);
   MOCK_STATIC6(void, , BrokerRpcServer_SendUmaHistogramData, handle_t,
                const char*, int, int, int, int);
 MOCK_STATIC_CLASS_END(BrokerRpcMock)
 
 class BrokerRpcTest : public testing::Test {
  protected:
   virtual void SetUp() {
     EXPECT_CALL(broker_rpc_mock_, GetRpcEndPointAddress())
@@ skipping 27 matching lines @@
   BrokerRpcServer server;
   ASSERT_TRUE(server.Start());
 
   BrokerRpcClient client;
   ASSERT_HRESULT_SUCCEEDED(client.Connect(false));
 
   const char* name = "name";
   const char* args = "args";
 
   EXPECT_CALL(broker_rpc_mock_,
-      BrokerRpcServer_FireEvent(_, StrEq(name), StrEq(args)))
+      BrokerRpcServer_FireEvent(_, _, StrEq(name), StrEq(args)))
           .Times(1);
 
   ASSERT_HRESULT_SUCCEEDED(client.FireEvent(name, args));
 
   EXPECT_CALL(broker_rpc_mock_,
       BrokerRpcServer_SendUmaHistogramTimes(_, StrEq(name), 321))
           .Times(1);
   ASSERT_HRESULT_SUCCEEDED(client.SendUmaHistogramTimes(name, 321));
 
   EXPECT_CALL(broker_rpc_mock_,
       BrokerRpcServer_SendUmaHistogramData(_, StrEq(name), 1, 2, 3, 4))
           .Times(1);
   ASSERT_HRESULT_SUCCEEDED(client.SendUmaHistogramData(name, 1, 2, 3, 4));
 }
 
 }  // namespace