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

Index: chrome/browser/extensions/extension_event_router_forwarder_unittest.cc
===================================================================
--- chrome/browser/extensions/extension_event_router_forwarder_unittest.cc	(revision 92309)
+++ chrome/browser/extensions/extension_event_router_forwarder_unittest.cc	(working copy)
@@ -145,8 +145,7 @@
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
   event_router->DispatchEventToRenderers(kEventName, kEventArgs,
-                                         profile1_->GetRuntimeId(),
-                                         true, url);
+                                         profile1_, true, url);
 }
 
 TEST_F(ExtensionEventRouterForwarderTest,
@@ -164,8 +163,7 @@
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
   event_router->DispatchEventToRenderers(kEventName, kEventArgs,
-                                         profile1_->GetRuntimeId(),
-                                         true, url);
+                                         profile1_, true, url);
 }
 
 TEST_F(ExtensionEventRouterForwarderTest,
@@ -183,8 +181,7 @@
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
   event_router->DispatchEventToRenderers(kEventName, kEventArgs,
-                                         incognito->GetRuntimeId(),
-                                         true, url);
+                                         incognito, true, url);
 }
 
 TEST_F(ExtensionEventRouterForwarderTest, UnicastRendererUIUnrestricted) {
@@ -198,8 +195,7 @@
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
   event_router->DispatchEventToRenderers(kEventName, kEventArgs,
-                                         profile1_->GetRuntimeId(),
-                                         false, url);
+                                         profile1_, false, url);
 }
 
 TEST_F(ExtensionEventRouterForwarderTest,
@@ -217,8 +213,7 @@
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
   event_router->DispatchEventToRenderers(kEventName, kEventArgs,
-                                         profile1_->GetRuntimeId(),
-                                         false, url);
+                                         profile1_, false, url);
 }
 
 TEST_F(ExtensionEventRouterForwarderTest, BroadcastExtensionUI) {
@@ -245,8 +240,7 @@
   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) {
@@ -260,6 +254,5 @@
   EXPECT_CALL(*event_router,
       CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
   event_router->DispatchEventToExtension(kExt, kEventName, kEventArgs,
-                                         profile1_->GetRuntimeId(),
-                                         false, url);
+                                         profile1_, false, url);
 }