Make the ChromeNetworkDelegate use the ExtensionEventRouterForwarder

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.
 
 #include "chrome/browser/extensions/extension_proxy_api.h"
 
 #include "base/base64.h"
 #include "base/json/json_writer.h"
 #include "base/string_util.h"
 #include "base/string_tokenizer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/extensions/extension_io_event_router.h"
+#include "chrome/browser/extensions/extension_event_router_forwarder.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/pref_names.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/proxy_config.h"
 
 namespace {
 
 // The scheme for which to use a manually specified proxy, not of the proxy URI
 // itself.
@@ skipping 90 matching lines @@
   return Singleton<ExtensionProxyEventRouter>::get();
 }
 
 ExtensionProxyEventRouter::ExtensionProxyEventRouter() {
 }
 
 ExtensionProxyEventRouter::~ExtensionProxyEventRouter() {
 }
 
 void ExtensionProxyEventRouter::OnProxyError(
-    const ExtensionIOEventRouter* event_router,
+    ExtensionEventRouterForwarder* event_router,
+    ProfileId profile_id,
     int error_code) {
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetBoolean(kProxyEventFatal, true);
   dict->SetString(kProxyEventError, net::ErrorToString(error_code));
   dict->SetString(kProxyEventDetails, "");
   args.Append(dict);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
-  event_router->DispatchEventToRenderers(
-      kProxyEventOnProxyError, json_args, GURL());
+
+  if (profile_id != Profile::InvalidProfileId) {
+    event_router->DispatchEventToRenderers(
+        kProxyEventOnProxyError, json_args, profile_id, true, GURL());
+  } else {
+    event_router->BroadcastEventToRenderers(
+        kProxyEventOnProxyError, json_args, GURL());
+  }
 }
 
 bool SetProxySettingsFunction::GetProxyServer(
     const DictionaryValue* dict,
     net::ProxyServer::Scheme default_scheme,
     net::ProxyServer* proxy_server) {
   std::string scheme_string;  // optional.
   // We can safely assume that this is ASCII due to the allowed enumeration
   // values specified in extension_api.json.
   dict->GetStringASCII(kProxyCfgScheme, &scheme_string);
@@ skipping 398 matching lines @@
       break;
     case net::ProxyServer::SCHEME_DIRECT:
     case net::ProxyServer::SCHEME_INVALID:
       NOTREACHED();
       return out;
   }
   out->SetString(kProxyCfgRuleHost, proxy.host_port_pair().host());
   out->SetInteger(kProxyCfgRulePort, proxy.host_port_pair().port());
   return out;
 }