Revert 105661 - Revert 105659 - Delay network requests on startup if any webRequest or webNavigation extensions are enabled.

[Relanding 105659. This will re-cause failures in chrome_frame_net_tests, to be fixed in the next CL.]



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



TBR=pam@chromium.org
Review URL: http://codereview.chromium.org/8308003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105686 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 7 deletions

diff --git a/content/browser/renderer_host/resource_queue.h b/content/browser/renderer_host/resource_queue.h
index d8cecec..1119335 100644
--- a/content/browser/renderer_host/resource_queue.h
+++ b/content/browser/renderer_host/resource_queue.h
@@ -28,8 +28,7 @@ class CONTENT_EXPORT ResourceQueueDelegate {
   virtual void Initialize(ResourceQueue* resource_queue) = 0;
 
   // Should return true if it wants the |request| to not be started at this
-  // point. To start the delayed request, ResourceQueue::StartDelayedRequest
-  // should be used.
+  // point. Use ResourceQueue::StartDelayedRequests to restart requests.
   virtual bool ShouldDelayRequest(
       net::URLRequest* request,
       const ResourceDispatcherHostRequestInfo& request_info,
@@ -74,11 +73,10 @@ class CONTENT_EXPORT ResourceQueue {
   // |request_id| is no longer valid.
   void RemoveRequest(const GlobalRequestID& request_id);
 
-  // A delegate should call StartDelayedRequest when it wants to allow the
-  // request to start. If it was the last delegate that demanded the request
-  // to be delayed, the request will be started.
-  void StartDelayedRequest(ResourceQueueDelegate* delegate,
-                           const GlobalRequestID& request_id);
+  // A delegate should call StartDelayedRequests when it wants to allow all
+  // its delayed requests to start. If it was the last delegate that required
+  // a request to be delayed, that request will be started.
+  void StartDelayedRequests(ResourceQueueDelegate* delegate);
 
  private:
   typedef std::map<GlobalRequestID, net::URLRequest*> RequestMap;