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

chrome/browser/extensions/extension_proxy_api.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.
 
 // Implementation of the Chrome Extensions Proxy Settings API.
 
 #include "chrome/browser/extensions/extension_proxy_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/stringprintf.h"
@@ skipping 15 matching lines @@
 }
 
 ExtensionProxyEventRouter::ExtensionProxyEventRouter() {
 }
 
 ExtensionProxyEventRouter::~ExtensionProxyEventRouter() {
 }
 
 void ExtensionProxyEventRouter::OnProxyError(
     ExtensionEventRouterForwarder* event_router,
-    ProfileId profile_id,
+    void* profile,
     int error_code) {
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetBoolean(keys::kProxyEventFatal, true);
   dict->SetString(keys::kProxyEventError, net::ErrorToString(error_code));
   dict->SetString(keys::kProxyEventDetails, "");
   args.Append(dict);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
-  if (profile_id != Profile::kInvalidProfileId) {
+  if (profile) {
     event_router->DispatchEventToRenderers(
-        keys::kProxyEventOnProxyError, json_args, profile_id, true, GURL());
+        keys::kProxyEventOnProxyError, json_args, profile, true, GURL());
   } else {
     event_router->BroadcastEventToRenderers(
         keys::kProxyEventOnProxyError, json_args, GURL());
   }
 }
 
 void ExtensionProxyEventRouter::OnPACScriptError(
     ExtensionEventRouterForwarder* event_router,
-    ProfileId profile_id,
+    void* profile,
     int line_number,
     const string16& error) {
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetBoolean(keys::kProxyEventFatal, false);
   dict->SetString(keys::kProxyEventError,
                   net::ErrorToString(net::ERR_PAC_SCRIPT_FAILED));
   std::string error_msg;
   if (line_number != -1) {
     base::SStringPrintf(
         &error_msg, "line: %d: %s", line_number, UTF16ToUTF8(error).c_str());
   } else {
     error_msg = UTF16ToUTF8(error);
   }
   dict->SetString(keys::kProxyEventDetails, error_msg);
   args.Append(dict);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
-  if (profile_id != Profile::kInvalidProfileId) {
+  if (profile) {
     event_router->DispatchEventToRenderers(
-        keys::kProxyEventOnProxyError, json_args, profile_id, true, GURL());
+        keys::kProxyEventOnProxyError, json_args, profile, true, GURL());
   } else {
     event_router->BroadcastEventToRenderers(
         keys::kProxyEventOnProxyError, json_args, GURL());
   }
 }
 
 ProxyPrefTransformer::ProxyPrefTransformer() {
 }
 
 ProxyPrefTransformer::~ProxyPrefTransformer() {
@@ skipping 82 matching lines @@
       if (!proxy_rules_dict)
         return NULL;
       extension_pref->Set(keys::kProxyConfigRules, proxy_rules_dict);
       break;
     }
     case ProxyPrefs::kModeCount:
       NOTREACHED();
   }
   return extension_pref.release();
 }