Make a separate histogram for MatchComplete Final Status'es and

chrome/browser/prerender/prerender_browsertest.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 <deque>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
@@ skipping 126 matching lines @@
         quit_message_loop_on_destruction_(
             expected_final_status != FINAL_STATUS_EVICTED &&
             expected_final_status != FINAL_STATUS_APP_TERMINATING &&
             expected_final_status != FINAL_STATUS_MATCH_COMPLETE_DUMMY),
         expected_pending_prerenders_(0) {
     if (expected_number_of_loads == 0)
       MessageLoopForUI::current()->Quit();
   }
 
   virtual ~TestPrerenderContents() {
-    EXPECT_EQ(expected_final_status_, final_status()) <<
-              " when testing URL " << prerender_url().path() <<
-              " (Expected: " << NameFromFinalStatus(expected_final_status_) <<
-              ", Actual: " << NameFromFinalStatus(final_status()) << ")";
+    if (expected_final_status_ == FINAL_STATUS_MATCH_COMPLETE_DUMMY) {
+      EXPECT_EQ(mc_status(), MC_REPLACEMENT);

[dominich, 2012/01/20 22:23:37]

Can you add some output like the below case that has the URL in it? It really
helps when figuring out why a test fails.

[tburkard, 2012/01/20 23:23:00]

I agree that in the other case, it's helpful, because you see what was expected
and what it is.  Here, the fact that it's not marked as MC_REPLACEMENT is cause
for error.  It's a binary check, is it marked or not.  So re-printing it
wouldn't help much, I think.

On 2012/01/20 22:23:37, dominich wrote:

+    } else {
+      EXPECT_EQ(expected_final_status_, final_status()) <<
+          " when testing URL " << prerender_url().path() <<
+          " (Expected: " << NameFromFinalStatus(expected_final_status_) <<
+          ", Actual: " << NameFromFinalStatus(final_status()) << ")";
+    }
     // Prerendering RenderViewHosts should be hidden before the first
     // navigation, so this should be happen for every PrerenderContents for
     // which a RenderViewHost is created, regardless of whether or not it's
     // used.
     if (new_render_view_host_)
       EXPECT_TRUE(was_hidden_);
 
     // A used PrerenderContents will only be destroyed when we swap out
     // TabContents, at the end of a navigation caused by a call to
     // NavigateToURLImpl().
@@ skipping 1741 matching lines @@
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderSessionStorage) {
   set_loader_path("files/prerender/prerender_loader_with_session_storage.html");
   PrerenderTestURL(GetCrossDomainTestUrl("files/prerender/prerender_page.html"),
                    FINAL_STATUS_USED,
                    1);
   NavigateToDestURL();
   GoBackToPageBeforePrerender(browser());
 }
 
 }  // namespace prerender