summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorpam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-15 13:13:28 +0000
committerpam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-15 13:13:28 +0000
commitdabc45c18830592f272eb74e9b2620055c3a7188 (patch)
treebadde3848c1f7c27d990818ba5581591e4334302 /net
parentaf9c05172cabc3515132e036c91c2d5e78edc325 (diff)
downloadchromium_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 'net')
-rw-r--r--net/url_request/url_request.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index 6b23f54..a66c012 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -38,7 +38,6 @@ class ResourceDispatcherHostTest;
class TestAutomationProvider;
class URLRequestAutomationJob;
class UserScriptListenerTest;
-class NetworkDelayListenerTest;
// Temporary layering violation to allow existing users of a deprecated
// interface.
@@ -176,7 +175,6 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe) {
friend class ::ResourceDispatcherHostTest;
friend class ::TestAutomationProvider;
friend class ::UserScriptListenerTest;
- friend class ::NetworkDelayListenerTest;
friend class ::URLRequestAutomationJob;
friend class TestInterceptor;
friend class URLRequestFilter;