Get rid of the ProfileId. It was added for ceee. I reverted the original change, since it led to ...

chrome/browser/extensions/extension_event_router_forwarder_unittest.cc

 // Copyright (c) 2011 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 "chrome/browser/extensions/extension_event_router_forwarder.h"
 
 #include "base/message_loop.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/test/thread_test_helper.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 127 matching lines @@
   scoped_refptr<MockExtensionEventRouterForwarder> event_router(
       new MockExtensionEventRouterForwarder);
   using ::testing::_;
   GURL url;
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(
           profile1_, "", kEventName, kEventArgs, profile1_, url));
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
   event_router->DispatchEventToRenderers(kEventName, kEventArgs,
-                                         profile1_->GetRuntimeId(),
-                                         true, url);
+                                         profile1_, true, url);
 }
 
 TEST_F(ExtensionEventRouterForwarderTest,
        UnicastRendererUIRestrictedIncognito1) {
   scoped_refptr<MockExtensionEventRouterForwarder> event_router(
       new MockExtensionEventRouterForwarder);
   Profile* incognito = CreateIncognitoProfile(profile1_);
   using ::testing::_;
   GURL url;
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(
           profile1_, "", kEventName, kEventArgs, profile1_, url));
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(incognito, _, _, _, _, _)).Times(0);
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
   event_router->DispatchEventToRenderers(kEventName, kEventArgs,
-                                         profile1_->GetRuntimeId(),
-                                         true, url);
+                                         profile1_, true, url);
 }
 
 TEST_F(ExtensionEventRouterForwarderTest,
        UnicastRendererUIRestrictedIncognito2) {
   scoped_refptr<MockExtensionEventRouterForwarder> event_router(
       new MockExtensionEventRouterForwarder);
   Profile* incognito = CreateIncognitoProfile(profile1_);
   using ::testing::_;
   GURL url;
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile1_, _, _, _, _, _)).Times(0);
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(
           incognito, "", kEventName, kEventArgs, incognito, url));
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
   event_router->DispatchEventToRenderers(kEventName, kEventArgs,
-                                         incognito->GetRuntimeId(),
-                                         true, url);
+                                         incognito, true, url);
 }
 
 TEST_F(ExtensionEventRouterForwarderTest, UnicastRendererUIUnrestricted) {
   scoped_refptr<MockExtensionEventRouterForwarder> event_router(
       new MockExtensionEventRouterForwarder);
   using ::testing::_;
   GURL url;
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(
           profile1_, "", kEventName, kEventArgs, NULL, url));
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
   event_router->DispatchEventToRenderers(kEventName, kEventArgs,
-                                         profile1_->GetRuntimeId(),
-                                         false, url);
+                                         profile1_, false, url);
 }
 
 TEST_F(ExtensionEventRouterForwarderTest,
        UnicastRendererUIUnrestrictedIncognito) {
   scoped_refptr<MockExtensionEventRouterForwarder> event_router(
       new MockExtensionEventRouterForwarder);
   Profile* incognito = CreateIncognitoProfile(profile1_);
   using ::testing::_;
   GURL url;
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(
           profile1_, "", kEventName, kEventArgs, NULL, url));
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(incognito, _, _, _, _, _)).Times(0);
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
   event_router->DispatchEventToRenderers(kEventName, kEventArgs,
-                                         profile1_->GetRuntimeId(),
-                                         false, url);
+                                         profile1_, false, url);
 }
 
 TEST_F(ExtensionEventRouterForwarderTest, BroadcastExtensionUI) {
   scoped_refptr<MockExtensionEventRouterForwarder> event_router(
       new MockExtensionEventRouterForwarder);
   GURL url;
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(
           profile1_, kExt, kEventName, kEventArgs, profile1_, url));
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(
           profile2_, kExt, kEventName, kEventArgs, profile2_, url));
   event_router->BroadcastEventToExtension(kExt, kEventName, kEventArgs, url);
 }
 
 TEST_F(ExtensionEventRouterForwarderTest, UnicastExtensionUIRestricted) {
   scoped_refptr<MockExtensionEventRouterForwarder> event_router(
       new MockExtensionEventRouterForwarder);
   using ::testing::_;
   GURL url;
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(
           profile1_, kExt, kEventName, kEventArgs, profile1_, url));
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
   event_router->DispatchEventToExtension(kExt, kEventName, kEventArgs,
-                                         profile1_->GetRuntimeId(),
-                                         true, url);
+                                         profile1_, true, url);
 }
 
 TEST_F(ExtensionEventRouterForwarderTest, UnicastExtensionUIUnrestricted) {
   scoped_refptr<MockExtensionEventRouterForwarder> event_router(
       new MockExtensionEventRouterForwarder);
   using ::testing::_;
   GURL url;
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(
           profile1_, kExt, kEventName, kEventArgs, NULL, url));
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
   event_router->DispatchEventToExtension(kExt, kEventName, kEventArgs,
-                                         profile1_->GetRuntimeId(),
-                                         false, url);
+                                         profile1_, false, url);
 }