Revert of Add <link rel=next> support to prerender.

chrome/browser/prerender/prerender_link_manager.cc

Index: chrome/browser/prerender/prerender_link_manager.cc
diff --git a/chrome/browser/prerender/prerender_link_manager.cc b/chrome/browser/prerender/prerender_link_manager.cc
index 30846b4b26e92107e453b4a8dfde977405a489f5..8213dedd8701b4abb3250e952cc564b2297ef250 100644
--- a/chrome/browser/prerender/prerender_link_manager.cc
+++ b/chrome/browser/prerender/prerender_link_manager.cc
@@ -7,18 +7,15 @@
 #include <functional>
 #include <limits>
 #include <set>
-#include <string>
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
-#include "base/metrics/field_trial.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_handle.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/prerender_messages.h"
-#include "chrome/common/prerender_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/session_storage_namespace.h"
@@ -31,29 +28,7 @@
 using content::RenderViewHost;
 using content::SessionStorageNamespace;
 
-namespace prerender {
-
 namespace {
-
-bool ShouldStartRelNextPrerenders() {
-  const std::string experiment_name =
-      base::FieldTrialList::FindFullName("PrerenderRelNextTrial");
-
-  return experiment_name.find("Yes") != std::string::npos;
-}
-
-bool ShouldStartPrerender(uint32 rel_types) {
-  const bool should_start_rel_next_prerenders =
-      ShouldStartRelNextPrerenders();
-
-  if (rel_types & PrerenderRelTypePrerender) {
-    return true;
-  } else if (should_start_rel_next_prerenders &&
-             (rel_types & PrerenderRelTypeNext) == PrerenderRelTypeNext) {
-    return true;
-  }
-  return false;
-}
 
 void Send(int child_id, IPC::Message* raw_message) {
   using content::RenderProcessHost;
@@ -66,6 +41,8 @@
 }
 
 }  // namespace
+
+namespace prerender {
 
 // Helper class to implement PrerenderContents::Observer and watch prerenders
 // which launch other prerenders.
@@ -132,7 +109,6 @@
 void PrerenderLinkManager::OnAddPrerender(int launcher_child_id,
                                           int prerender_id,
                                           const GURL& url,
-                                          uint32 rel_types,
                                           const content::Referrer& referrer,
                                           const gfx::Size& size,
                                           int render_view_route_id) {
@@ -159,7 +135,7 @@
   }
 
   LinkPrerender
-      prerender(launcher_child_id, prerender_id, url, rel_types, referrer, size,
+      prerender(launcher_child_id, prerender_id, url, referrer, size,
                 render_view_route_id, manager_->GetCurrentTimeTicks(),
                 prerender_contents);
   prerenders_.push_back(prerender);
@@ -220,7 +196,6 @@
     int launcher_child_id,
     int prerender_id,
     const GURL& url,
-    uint32 rel_types,
     const content::Referrer& referrer,
     const gfx::Size& size,
     int render_view_route_id,
@@ -229,7 +204,6 @@
     : launcher_child_id(launcher_child_id),
       prerender_id(prerender_id),
       url(url),
-      rel_types(rel_types),
       referrer(referrer),
       size(size),
       render_view_route_id(render_view_route_id),
@@ -340,11 +314,6 @@
       }
     }
 
-    if (!ShouldStartPrerender((*i)->rel_types)) {
-      prerenders_.erase(*i);
-      continue;
-    }
-
     PrerenderHandle* handle = manager_->AddPrerenderFromLinkRelPrerender(
         (*i)->launcher_child_id, (*i)->render_view_route_id,
         (*i)->url, (*i)->referrer, (*i)->size);