Prerender: Remove MatchComplete status.

chrome/browser/prerender/prerender_contents.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prerender/prerender_contents.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <functional>
@@ skipping 187 matching lines @@
     Origin origin)
     : prerendering_has_started_(false),
       session_storage_namespace_id_(-1),
       prerender_manager_(prerender_manager),
       prerender_url_(url),
       referrer_(referrer),
       profile_(profile),
       has_stopped_loading_(false),
       has_finished_loading_(false),
       final_status_(FINAL_STATUS_MAX),
-      match_complete_status_(MATCH_COMPLETE_DEFAULT),
       prerendering_has_been_cancelled_(false),
       child_id_(-1),
       route_id_(-1),
       origin_(origin),
       network_bytes_(0) {
   DCHECK(prerender_manager != NULL);
 }
 
 bool PrerenderContents::Init() {
   return AddAliasURL(prerender_url_);
@@ skipping 121 matching lines @@
 
   final_status_ = final_status;
 }
 
 PrerenderContents::~PrerenderContents() {
   DCHECK_NE(FINAL_STATUS_MAX, final_status());
   DCHECK(
       prerendering_has_been_cancelled() || final_status() == FINAL_STATUS_USED);
   DCHECK_NE(ORIGIN_MAX, origin());
 
-  prerender_manager_->RecordFinalStatusWithMatchCompleteStatus(
-      origin(), match_complete_status(), final_status());
+  prerender_manager_->RecordFinalStatus(origin(), final_status());
 
   bool used = final_status() == FINAL_STATUS_USED ||
               final_status() == FINAL_STATUS_WOULD_HAVE_BEEN_USED;
   prerender_manager_->RecordNetworkBytes(origin(), used, network_bytes_);
 
   // Broadcast the removal of aliases.
   for (content::RenderProcessHost::iterator host_iterator =
            content::RenderProcessHost::AllHostsIterator();
        !host_iterator.IsAtEnd();
        host_iterator.Advance()) {
@@ skipping 93 matching lines @@
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_CancelPrerenderForPrinting,
                         OnCancelPrerenderForPrinting)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 bool PrerenderContents::CheckURL(const GURL& url) {
   if (!url.SchemeIsHTTPOrHTTPS()) {
-    DCHECK_NE(MATCH_COMPLETE_REPLACEMENT_PENDING, match_complete_status_);
     Destroy(FINAL_STATUS_UNSUPPORTED_SCHEME);
     return false;
   }
-  if (match_complete_status_ != MATCH_COMPLETE_REPLACEMENT_PENDING &&
-      prerender_manager_->HasRecentlyBeenNavigatedTo(origin(), url)) {
+  if (prerender_manager_->HasRecentlyBeenNavigatedTo(origin(), url)) {
     Destroy(FINAL_STATUS_RECENTLY_VISITED);
     return false;
   }
   return true;
 }
 
 bool PrerenderContents::AddAliasURL(const GURL& url) {
   if (!CheckURL(url))
     return false;
 
@@ skipping 237 matching lines @@
 void PrerenderContents::AddResourceThrottle(
     const base::WeakPtr<PrerenderResourceThrottle>& throttle) {
   resource_throttles_.push_back(throttle);
 }
 
 void PrerenderContents::AddNetworkBytes(int64_t bytes) {
   network_bytes_ += bytes;
 }
 
 }  // namespace prerender