Updating histograms to allow for experiments & log origin-based histograms.

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/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 80 matching lines @@
  public:
   TestPrerenderContents(
       PrerenderManager* prerender_manager,
       PrerenderTracker* prerender_tracker,
       Profile* profile,
       const GURL& url,
       const GURL& referrer,
       int number_of_loads,
       FinalStatus expected_final_status)
       : PrerenderContents(prerender_manager, prerender_tracker, profile,
-                          url, referrer, ORIGIN_LINK_REL_PRERENDER),
+                          url, referrer, ORIGIN_LINK_REL_PRERENDER,
+                          PrerenderManager::kNoExperiment),
         number_of_loads_(0),
         expected_number_of_loads_(number_of_loads),
         expected_final_status_(expected_final_status),
         new_render_view_host_(NULL),
         was_hidden_(false),
         was_shown_(false),
         quit_message_loop_on_destruction_(true) {
   }
 
   virtual ~TestPrerenderContents() {
@@ skipping 125 matching lines @@
     VLOG(1) << "Factory created with queue length " <<
                expected_final_status_queue_.size();
   }
 
   virtual PrerenderContents* CreatePrerenderContents(
       PrerenderManager* prerender_manager,
       PrerenderTracker* prerender_tracker,
       Profile* profile,
       const GURL& url,
       const GURL& referrer,
-      Origin origin) OVERRIDE {
+      Origin origin,
+      char experiment_id) OVERRIDE {

[cbentzel, 2011/06/30 18:15:39]

uint8 is better than char. 

[tburkard, 2011/06/30 19:25:43]

So use 255 then as "no experiment"?  I think -1 is more intuitive..

[dominich, 2011/06/30 19:28:25]

You can cast -1 to a uint8.

Are the experiments going to be named? If so, an enum with 10 entries might be
better.

[tburkard, 2011/06/30 19:45:48]

Done.

[tburkard, 2011/06/30 19:45:48]

Done.

     CHECK(!expected_final_status_queue_.empty()) <<
           "Creating prerender contents for " << url.path() <<
           " with no expected final status";
     FinalStatus expected_final_status = expected_final_status_queue_.front();
     expected_final_status_queue_.pop_front();
     VLOG(1) << "Creating prerender contents for " << url.path() <<
                " with expected final status " << expected_final_status;
     VLOG(1) << expected_final_status_queue_.size() << " left in the queue.";
     return new TestPrerenderContents(prerender_manager, prerender_tracker,
                                      profile, url,
@@ skipping 1186 matching lines @@
       NewRunnableFunction(ClearBrowsingData, browser(),
                           BrowsingDataRemover::REMOVE_CACHE));
   ui_test_utils::RunMessageLoop();
 
   // Make sure prerender history was not cleared.  Not a vital behavior, but
   // used to compare with PrerenderClearHistory test.
   EXPECT_EQ(1, GetHistoryLength());
 }
 
 }  // namespace prerender