Prerendering: Add MatchComplete PPLT

chrome/browser/prerender/prerender_contents.cc

 // Copyright (c) 2011 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 <algorithm>
 #include <utility>
 
 #include "base/process_util.h"
@@ skipping 331 matching lines @@
 bool PrerenderContents::GetRouteId(int* route_id) const {
   CHECK(route_id);
   DCHECK_GE(route_id_, -1);
   *route_id = route_id_;
   return route_id_ != -1;
 }
 
 void PrerenderContents::set_final_status(FinalStatus final_status) {
   DCHECK(final_status >= FINAL_STATUS_USED && final_status < FINAL_STATUS_MAX);
   DCHECK(final_status_ == FINAL_STATUS_MAX ||
-         final_status_ == FINAL_STATUS_CONTROL_GROUP);
+         final_status_ == FINAL_STATUS_CONTROL_GROUP ||
+         final_status_ == FINAL_STATUS_MATCH_COMPLETE_DUMMY);
 
   // Don't override final_status_ if it's FINAL_STATUS_CONTROL_GROUP,

[cbentzel, 2011/11/10 13:16:25]

Update comment.

[tburkard, 2011/11/10 18:36:55]

Done.

   // otherwise data will be collected in the Prerender.FinalStatus histogram.
-  if (final_status_ == FINAL_STATUS_CONTROL_GROUP)
+  if (final_status_ == FINAL_STATUS_CONTROL_GROUP ||
+      final_status_ == FINAL_STATUS_MATCH_COMPLETE_DUMMY)
     return;
 
   final_status_ = final_status;
 }
 
 PrerenderContents::~PrerenderContents() {
   DCHECK(final_status_ != FINAL_STATUS_MAX);
   DCHECK(prerendering_has_been_cancelled_ ||

[cbentzel, 2011/11/10 13:16:25]

Does this need to be updated with the MATCH_COMPLETE_DUMMY?

[tburkard, 2011/11/10 18:36:55]

Yes.  Excellent catch.  Surprised neither my testing nor the unit tests /
browser tests exposed a bug here.

[cbentzel, 2011/11/10 19:45:29]

Yeah - I'm actually a little worried about that. Do you understand why this
DCHECK wasn't firing?

          final_status_ == FINAL_STATUS_USED ||
          final_status_ == FINAL_STATUS_CONTROL_GROUP);
   DCHECK(origin_ != ORIGIN_MAX);
 
   // If we haven't even started prerendering, we were just in the control
   // group, which means we do not want to record the status.
   if (prerendering_has_started())
     prerender_manager_->RecordFinalStatus(origin_, experiment_id_,
                                           final_status_);
 
@@ skipping 197 matching lines @@
     if (!prerender_tracker_->GetFinalStatus(child_id_, route_id_,
                                             &final_status)) {
       NOTREACHED();
     }
   }
   set_final_status(final_status);
 
   prerendering_has_been_cancelled_ = true;
   // This has to be done after setting the final status, as it adds the
   // prerender to the history.
-  prerender_manager_->MoveEntryToPendingDelete(this);
+  prerender_manager_->MoveEntryToPendingDelete(this, final_status);
 
   // We may destroy the PrerenderContents before we have initialized the
   // RenderViewHost. Otherwise set the Observer's PrerenderContents to NULL to
   // avoid any more messages being sent.
   if (render_view_host_observer_.get())
     render_view_host_observer_->set_prerender_contents(NULL);
 }
 
 base::ProcessMetrics* PrerenderContents::MaybeGetProcessMetrics() {
   if (process_metrics_.get() == NULL) {
@@ skipping 69 matching lines @@
 bool PrerenderContents::IsCrossSiteNavigationPending() const {
   if (!prerender_contents_.get() || !prerender_contents_->tab_contents())
     return false;
   const TabContents* tab_contents = prerender_contents_->tab_contents();
   return (tab_contents->GetSiteInstance() !=
           tab_contents->GetPendingSiteInstance());
 }
 
 
 }  // namespace prerender