[Tests not passing yet] Remove prerender sessionStorage namespace merging.

chrome/browser/prerender/prerender_histograms.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_histograms.h"
 
 #include <string>
 
 #include "base/format_macros.h"
 #include "base/metrics/histogram.h"
@@ skipping 50 matching lines @@
     case ORIGIN_EXTERNAL_REQUEST:
         return ComposeHistogramName("externalrequest", name);
     case ORIGIN_INSTANT:
       return ComposeHistogramName("Instant", name);
     case ORIGIN_LINK_REL_NEXT:
       return ComposeHistogramName("webnext", name);
     case ORIGIN_GWS_PRERENDER:  // Handled above.
     default:
       NOTREACHED();
       break;
-  };
+  }
 
   // Dummy return value to make the compiler happy.
   NOTREACHED();
   return ComposeHistogramName("wash", name);
 }
 
 bool OriginIsOmnibox(Origin origin) {
   return origin == ORIGIN_OMNIBOX;
 }
 
@@ skipping 309 matching lines @@
   }
   if (mc_status == PrerenderContents::MATCH_COMPLETE_DEFAULT ||
       mc_status == PrerenderContents::MATCH_COMPLETE_REPLACEMENT ||
       mc_status == PrerenderContents::MATCH_COMPLETE_REPLACEMENT_PENDING) {
     PREFIXED_HISTOGRAM_ORIGIN_EXPERIMENT(
         "FinalStatusMatchComplete", origin, experiment_id,
         UMA_HISTOGRAM_ENUMERATION(name, final_status, FINAL_STATUS_MAX));
   }
 }
 
-void PrerenderHistograms::RecordEvent(Origin origin, uint8 experiment_id,
-                                      PrerenderEvent event) const {
-  DCHECK_LT(event, PRERENDER_EVENT_MAX);
-  PREFIXED_HISTOGRAM_ORIGIN_EXPERIMENT(
-      "Event", origin, experiment_id,
-      UMA_HISTOGRAM_ENUMERATION(name, event, PRERENDER_EVENT_MAX));
-}
-
 void PrerenderHistograms::RecordCookieStatus(Origin origin,
                                              uint8 experiment_id,
                                              int cookie_status) const {
   DCHECK_GE(cookie_status, 0);
   DCHECK_LT(cookie_status, PrerenderContents::kNumCookieStatuses);
   PREFIXED_HISTOGRAM_ORIGIN_EXPERIMENT(
       "CookieStatus", origin, experiment_id,
       UMA_HISTOGRAM_ENUMERATION(name, cookie_status,
                                 PrerenderContents::kNumCookieStatuses));
 }
@@ skipping 57 matching lines @@
   return last_experiment_id_;
 }
 
 bool PrerenderHistograms::IsOriginExperimentWash() const {
   if (!WithinWindow())
     return false;
   return origin_experiment_wash_;
 }
 
 }  // namespace prerender