diff options
| author | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-15 13:13:28 +0000 |
|---|---|---|
| committer | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-15 13:13:28 +0000 |
| commit | dabc45c18830592f272eb74e9b2620055c3a7188 (patch) | |
| tree | badde3848c1f7c27d990818ba5581591e4334302 /chrome/browser/browser_process_impl.cc | |
| parent | af9c05172cabc3515132e036c91c2d5e78edc325 (diff) | |
| download | chromium_src-dabc45c18830592f272eb74e9b2620055c3a7188.zip chromium_src-dabc45c18830592f272eb74e9b2620055c3a7188.tar.gz chromium_src-dabc45c18830592f272eb74e9b2620055c3a7188.tar.bz2 | |
Revert 105659 - Delay network requests on startup if any webRequest or webNavigation extensions are enabled.
[Failures in chrome_frame tests]
Add a webRequest extension API permission, used to tell when an extension uses that API and therefore wants to delay startup. Use the "tabs" warning for it.
Also clean up the UserScriptListener, which never released requests individually and so doesn't need to track them individually either, and makes the RequestQueue handle bulk releases by its delegates instead.
BUG=99450
TEST=unit_tests.exe --gtest_filter=NetworkDelayListenerTest.*
Review URL: http://codereview.chromium.org/8205001
TBR=pam@chromium.org
Review URL: http://codereview.chromium.org/8296017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 073f52d..6d08b95 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -27,7 +27,6 @@ #include "chrome/browser/download/download_request_limiter.h" #include "chrome/browser/extensions/extension_event_router_forwarder.h" #include "chrome/browser/extensions/extension_tab_id_map.h" -#include "chrome/browser/extensions/network_delay_listener.h" #include "chrome/browser/extensions/user_script_listener.h" #include "chrome/browser/first_run/upgrade_util.h" #include "chrome/browser/google/google_url_tracker.h" @@ -763,10 +762,9 @@ void BrowserProcessImpl::CreateResourceDispatcherHost() { resource_dispatcher_host_.get() == NULL); created_resource_dispatcher_host_ = true; - // UserScriptListener and NetworkDelayListener will delete themselves. + // UserScriptListener will delete itself. ResourceQueue::DelegateSet resource_queue_delegates; resource_queue_delegates.insert(new UserScriptListener()); - resource_queue_delegates.insert(new NetworkDelayListener()); resource_dispatcher_host_.reset( new ResourceDispatcherHost(resource_queue_delegates)); |