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

chrome/browser/extensions/extension_function_dispatcher.cc

Index: chrome/browser/extensions/extension_function_dispatcher.cc
===================================================================
--- chrome/browser/extensions/extension_function_dispatcher.cc	(revision 92309)
+++ chrome/browser/extensions/extension_function_dispatcher.cc	(working copy)
@@ -427,7 +427,7 @@
 // static
 void ExtensionFunctionDispatcher::DispatchOnIOThread(
     const ExtensionInfoMap* extension_info_map,
-    ProfileId profile_id,
+    void* profile,
     int render_process_id,
     base::WeakPtr<ChromeRenderMessageFilter> ipc_sender,
     int routing_id,
@@ -436,7 +436,7 @@
       extension_info_map->extensions().GetByURL(params.source_url);
 
   scoped_refptr<ExtensionFunction> function(
-      CreateExtensionFunction(params, extension, profile_id, render_process_id,
+      CreateExtensionFunction(params, extension, profile, render_process_id,
                               ipc_sender, routing_id));
   if (!function)
     return;
@@ -510,7 +510,7 @@
     extension = service->GetExtensionByWebExtent(params.source_url);
 
   scoped_refptr<ExtensionFunction> function(CreateExtensionFunction(
-      params, extension, profile_->GetRuntimeId(),
+      params, extension, profile_,
       render_view_host->process()->id(),
       render_view_host, render_view_host->routing_id()));
   if (!function)
@@ -545,7 +545,7 @@
 ExtensionFunction* ExtensionFunctionDispatcher::CreateExtensionFunction(
     const ExtensionHostMsg_Request_Params& params,
     const Extension* extension,
-    ProfileId profile_id,
+    void* profile,
     int render_process_id,
     IPC::Message::Sender* ipc_sender,
     int routing_id) {
@@ -586,7 +586,7 @@
   function->set_has_callback(params.has_callback);
   function->set_user_gesture(params.user_gesture);
   function->set_extension(extension);
-  function->set_profile_id(profile_id);
+  function->set_profile(profile);
   return function;
 }