Make the ChromeNetworkDelegate use the ExtensionEventRouterForwarder

chrome/browser/extensions/extension_webrequest_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_webrequest_api.h"
 
 #include <algorithm>
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/extensions/extension_io_event_router.h"
+#include "chrome/browser/extensions/extension_event_router_forwarder.h"
 #include "chrome/browser/extensions/extension_webrequest_api_constants.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_extent.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "googleurl/src/gurl.h"
 
 namespace keys = extension_webrequest_api_constants;
 
 namespace {
 
@@ skipping 179 matching lines @@
 void ExtensionWebRequestEventRouter::RemoveEventListenerOnUIThread(
     const std::string& extension_id, const std::string& sub_event_name) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableFunction(
           &RemoveEventListenerOnIOThread,
           extension_id, sub_event_name));
 }
 
 void ExtensionWebRequestEventRouter::OnBeforeRequest(
-    const ExtensionIOEventRouter* event_router,
+    ExtensionEventRouterForwarder* event_router,
+    ProfileId profile_id,
     const GURL& url,
     const std::string& method) {
+  // TODO(jochen): Figure out what to do with events from the system context.
+  if (profile_id == Profile::kInvalidProfileId)
+    return;
   std::vector<const EventListener*> listeners =
       GetMatchingListeners(keys::kOnBeforeRequest, url);
   if (listeners.empty())
     return;
 
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetString(keys::kUrlKey, url.spec());
   dict->SetString(keys::kMethodKey, method);
   // TODO(mpcomplete): implement
   dict->SetInteger(keys::kTabIdKey, 0);
   dict->SetInteger(keys::kRequestIdKey, 0);
   dict->SetString(keys::kTypeKey, "main_frame");
   dict->SetInteger(keys::kTimeStampKey, 1);
   args.Append(dict);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
   for (std::vector<const EventListener*>::iterator it = listeners.begin();
        it != listeners.end(); ++it) {
+
     event_router->DispatchEventToExtension(
-        (*it)->extension_id, (*it)->sub_event_name, json_args);
+        (*it)->extension_id, (*it)->sub_event_name, json_args,
+        profile_id, true, GURL());
   }
 }
 
 void ExtensionWebRequestEventRouter::AddEventListener(
     const std::string& extension_id,
     const std::string& event_name,
     const std::string& sub_event_name,
     const RequestFilter& filter,
     int extra_info_spec) {
   if (!IsWebRequestEvent(event_name))
@@ skipping 67 matching lines @@
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(4, &sub_event_name));
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableFunction(
           &AddEventListenerOnIOThread,
           extension_id(), event_name, sub_event_name, filter, extra_info_spec));
 
   return true;
 }