(Owner approval for) Delay network requests on startup if any webRequest ...

chrome/browser/extensions/user_script_listener.cc

Index: chrome/browser/extensions/user_script_listener.cc
===================================================================
--- chrome/browser/extensions/user_script_listener.cc	(revision 104705)
+++ chrome/browser/extensions/user_script_listener.cc	(working copy)
@@ -10,7 +10,6 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/renderer_host/global_request_id.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/common/notification_service.h"
 #include "net/url_request/url_request.h"
@@ -54,7 +53,6 @@
     if ((*it).MatchesURL(request->url())) {
       // One of the user scripts wants to inject into this request, but the
       // script isn't ready yet. Delay the request.
-      delayed_request_ids_.push_front(request_id);

[Matt Perry, 2011/10/11 18:40:12]

I'm confused by this change. Before, we only blocked requests that match a
pattern used by the set of loaded content scripts.

This change makes it so that we don't load any requests as long as there are
unloaded content scripts.

[Pam (message me for reviews), 2011/10/12 14:28:12]

We still only block requests that match a pattern (line 54 left or 53 right).

We used to, and still do, release all blocked requests at once (in
StartDelayedRequests) when we get NOTIFICATION_USER_SCRIPTS_UPDATED. That is,
all we ever did with delayed_request_ids_ is iterate over the whole thing. We
never released individual blocked requests, so there's no need for the added
complication of tracking them.

[Matt Perry, 2011/10/12 17:13:55]

Of course, good point! My mistake.

       return true;
     }
   }
@@ -80,13 +78,8 @@
   user_scripts_ready_ = true;
 
   if (resource_queue_) {
-    for (DelayedRequests::iterator it = delayed_request_ids_.begin();
-         it != delayed_request_ids_.end(); ++it) {
-      resource_queue_->StartDelayedRequest(this, *it);
-    }
+      resource_queue_->StartDelayedRequests(this);
   }
-
-  delayed_request_ids_.clear();
 }
 
 void UserScriptListener::AppendNewURLPatterns(const URLPatterns& new_patterns) {