Make the ChromeNetworkDelegate use the ExtensionEventRouterForwarder

chrome/browser/profiles/profile_impl_io_data.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/profiles/profile_impl_io_data.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/extensions/extension_io_event_router.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_cookie_policy.h"
 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "net/ftp/ftp_network_layer.h"
@@ skipping 114 matching lines @@
       new ChromeCookiePolicy(profile_params.host_content_settings_map);
 
   main_request_context_->set_chrome_cookie_policy(cookie_policy);
   media_request_context_->set_chrome_cookie_policy(cookie_policy);
   extensions_request_context_->set_chrome_cookie_policy(cookie_policy);
 
   main_request_context_->set_net_log(lazy_params_->io_thread->net_log());
   media_request_context_->set_net_log(lazy_params_->io_thread->net_log());
   extensions_request_context_->set_net_log(lazy_params_->io_thread->net_log());
 
-  extension_io_event_router_ = profile_params.extension_io_event_router;
-  network_delegate_.reset(
-      new ChromeNetworkDelegate(extension_io_event_router_));
+  network_delegate_.reset(new ChromeNetworkDelegate(
+        io_thread_globals->extension_event_router_forwarder.get(),
+        profile_params.profile));
   main_request_context_->set_network_delegate(network_delegate_.get());
   media_request_context_->set_network_delegate(network_delegate_.get());
 
   main_request_context_->set_host_resolver(
       io_thread_globals->host_resolver.get());
   media_request_context_->set_host_resolver(
       io_thread_globals->host_resolver.get());
   main_request_context_->set_cert_verifier(
       io_thread_globals->cert_verifier.get());
   media_request_context_->set_cert_verifier(
@@ skipping 115 matching lines @@
 }
 
 scoped_refptr<ChromeURLRequestContext>
 ProfileImplIOData::AcquireExtensionsRequestContext() const {
   DCHECK(extensions_request_context_);
   scoped_refptr<ChromeURLRequestContext> context = extensions_request_context_;
   extensions_request_context_->set_profile_io_data(this);
   extensions_request_context_ = NULL;
   return context;
 }