Prerender: Remove MatchComplete status.

chrome/browser/prerender/prerender_manager.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_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <functional>
@@ skipping 394 matching lines @@
   if (!prerender_data->contents()->prerendering_has_started()) {
     target_tab_helper->WouldHavePrerenderedNextLoad(
         prerender_data->contents()->origin());
     prerender_data->contents()->Destroy(FINAL_STATUS_WOULD_HAVE_BEEN_USED);
     return NULL;
   }
 
   // Don't use prerendered pages if debugger is attached to the tab.
   // See http://crbug.com/98541
   if (content::DevToolsAgentHost::IsDebuggerAttached(web_contents)) {
-    DestroyAndMarkMatchCompleteAsUsed(prerender_data->contents(),
-                                      FINAL_STATUS_DEVTOOLS_ATTACHED);
+    histograms_->RecordFinalStatus(prerender_data->contents()->origin(),
+                                   FINAL_STATUS_DEVTOOLS_ATTACHED);
+    prerender_data->contents()->Destroy(FINAL_STATUS_DEVTOOLS_ATTACHED);
     return NULL;
   }
 
   // If the prerendered page is in the middle of a cross-site navigation,
   // don't swap it in because there isn't a good way to merge histories.
   if (prerender_data->contents()->IsCrossSiteNavigationPending()) {
-    DestroyAndMarkMatchCompleteAsUsed(
-        prerender_data->contents(),
+    histograms_->RecordFinalStatus(prerender_data->contents()->origin(),
+                                   FINAL_STATUS_CROSS_SITE_NAVIGATION_PENDING);
+    prerender_data->contents()->Destroy(
         FINAL_STATUS_CROSS_SITE_NAVIGATION_PENDING);
     return NULL;
   }
 
   // For bookkeeping purposes, we need to mark this WebContents to
   // reflect that it would have been prerendered.
   if (GetMode() == PRERENDER_MODE_EXPERIMENT_NO_USE_GROUP) {
     target_tab_helper->WouldHavePrerenderedNextLoad(
         prerender_data->contents()->origin());
     prerender_data->contents()->Destroy(FINAL_STATUS_WOULD_HAVE_BEEN_USED);
@@ skipping 340 matching lines @@
 void PrerenderManager::ClearData(int clear_flags) {
   DCHECK_GE(clear_flags, 0);
   DCHECK_LT(clear_flags, CLEAR_MAX);
   if (clear_flags & CLEAR_PRERENDER_CONTENTS)
     DestroyAllContents(FINAL_STATUS_CACHE_OR_HISTORY_CLEARED);
   // This has to be second, since destroying prerenders can add to the history.
   if (clear_flags & CLEAR_PRERENDER_HISTORY)
     prerender_history_->Clear();
 }
 
-void PrerenderManager::RecordFinalStatusWithMatchCompleteStatus(
-    Origin origin,
-    PrerenderContents::MatchCompleteStatus mc_status,
-    FinalStatus final_status) const {
-  histograms_->RecordFinalStatus(origin, mc_status, final_status);
+void PrerenderManager::RecordFinalStatus(Origin origin,
+                                         FinalStatus final_status) const {
+  histograms_->RecordFinalStatus(origin, final_status);
 }
 
 void PrerenderManager::RecordNavigation(const GURL& url) {
   DCHECK(CalledOnValidThread());
 
   navigations_.push_back(NavigationRecord(url, GetCurrentTimeTicks()));
   CleanUpOldNavigations();
 }
 
 // protected
@@ skipping 386 matching lines @@
 
 void PrerenderManager::DestroyAllContents(FinalStatus final_status) {
   DeleteOldWebContents();
   while (!active_prerenders_.empty()) {
     PrerenderContents* contents = active_prerenders_.front()->contents();
     contents->Destroy(final_status);
   }
   to_delete_prerenders_.clear();
 }
 
-void PrerenderManager::DestroyAndMarkMatchCompleteAsUsed(
-    PrerenderContents* prerender_contents,
-    FinalStatus final_status) {
-  prerender_contents->set_match_complete_status(
-      PrerenderContents::MATCH_COMPLETE_REPLACED);
-  histograms_->RecordFinalStatus(prerender_contents->origin(),
-                                 PrerenderContents::MATCH_COMPLETE_REPLACEMENT,
-                                 FINAL_STATUS_WOULD_HAVE_BEEN_USED);
-  prerender_contents->Destroy(final_status);
-}
-
 void PrerenderManager::RecordFinalStatusWithoutCreatingPrerenderContents(
     const GURL& url, Origin origin, FinalStatus final_status) const {
   PrerenderHistory::Entry entry(url, final_status, origin, base::Time::Now());
   prerender_history_->AddEntry(entry);
-  RecordFinalStatusWithMatchCompleteStatus(
-      origin, PrerenderContents::MATCH_COMPLETE_DEFAULT, final_status);
+  histograms_->RecordFinalStatus(origin, final_status);
 }
 
 void PrerenderManager::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_PROFILE_DESTROYED:
       DestroyAllContents(FINAL_STATUS_PROFILE_DESTROYED);
       on_close_web_contents_deleters_.clear();
       break;
@@ skipping 92 matching lines @@
 }
 
 void PrerenderManager::RenderProcessHostDestroyed(
     content::RenderProcessHost* host) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   size_t erased = prerender_process_hosts_.erase(host);
   DCHECK_EQ(1u, erased);
 }
 
 }  // namespace prerender