Kill holdback for Http Prioritization experiment. Turn on to 100%.

Review URL: http://codereview.chromium.org/458010

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

3 files changed, 16 insertions, 40 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index aaac50d..df391c1 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -737,16 +737,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
   // Initialize and maintain DNS prefetcher module.
   chrome_browser_net::DnsPrefetcherInit dns_prefetch(user_prefs, local_state);
 
-  scoped_refptr<FieldTrial> http_prioritization_trial =
-      new FieldTrial("HttpPrioritization", 100);
-  // Put 10% of people in the fallback experiment with the http prioritization
-  // code disabled.
-  const int holdback_group =
-      http_prioritization_trial->AppendGroup("_no_http_prioritization", 10);
-  if (http_prioritization_trial->group() == holdback_group) {
-    ResourceDispatcherHost::DisableHttpPrioritization();
-  }
-
   scoped_refptr<FieldTrial> socket_late_binding_trial =
       new FieldTrial("SocketLateBinding", 100);
   socket_late_binding_trial->AppendGroup("_disable_late_binding", 50);
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index 89d13bb..a4bd156 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -74,8 +74,6 @@ using base::TimeTicks;
 
 // ----------------------------------------------------------------------------
 
-bool ResourceDispatcherHost::g_is_http_prioritization_enabled = true;
-
 // A ShutdownTask proxies a shutdown task from the UI thread to the IO thread.
 // It should be constructed on the UI thread and run in the IO thread.
 class ResourceDispatcherHost::ShutdownTask : public Task {
@@ -529,24 +527,22 @@ void ResourceDispatcherHost::BeginRequest(
   request->set_load_flags(load_flags);
   request->set_context(context);
 
-  if (IsHttpPrioritizationEnabled()) {
-    // If the request is for the top level page or a frame/iframe, then we
-    // should prioritize it higher than other resource types.  Currently, we
-    // just use priorities 1 and 0.
-    if (ResourceType::IsFrame(request_data.resource_type)) {
-      request->set_priority(net::HIGHEST);
-    } else {
-      switch (request_data.resource_type) {
-        case ResourceType::STYLESHEET:
-        case ResourceType::SCRIPT:
-          request->set_priority(net::MEDIUM);
-          break;
-        case ResourceType::IMAGE:
-          request->set_priority(net::LOWEST);
-          break;
-        default:
-          request->set_priority(net::LOW);
-      }
+  // If the request is for the top level page or a frame/iframe, then we
+  // should prioritize it higher than other resource types.  Currently, we
+  // just use priorities 1 and 0.
+  if (ResourceType::IsFrame(request_data.resource_type)) {
+    request->set_priority(net::HIGHEST);
+  } else {
+    switch (request_data.resource_type) {
+      case ResourceType::STYLESHEET:
+      case ResourceType::SCRIPT:
+        request->set_priority(net::MEDIUM);
+        break;
+      case ResourceType::IMAGE:
+        request->set_priority(net::LOWEST);
+        break;
+      default:
+        request->set_priority(net::LOW);
     }
   }
 
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.h b/chrome/browser/renderer_host/resource_dispatcher_host.h
index ee62a82..efdd741 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.h
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.h
@@ -278,14 +278,6 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
     return false;
   }
 
-  static void DisableHttpPrioritization() {
-    g_is_http_prioritization_enabled = false;
-  }
-
-  static bool IsHttpPrioritizationEnabled() {
-    return g_is_http_prioritization_enabled;
-  }
-
  private:
   FRIEND_TEST(ResourceDispatcherHostTest, TestBlockedRequestsProcessDies);
   FRIEND_TEST(ResourceDispatcherHostTest,
@@ -481,8 +473,6 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
   // Keeps track of elements blocked by the Privacy Blacklist.
   chrome::BlockedResponse blocked_;
 
-  static bool g_is_http_prioritization_enabled;
-
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcherHost);
 };