Connect SparseHistogram with the rest of stats system

chrome/browser/net/http_pipelining_compatibility_client_unittest.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/net/http_pipelining_compatibility_client.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_test_util.h"
 #include "net/test/test_server.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using base::Histogram;
+using base::HistogramBase;
 using base::HistogramSamples;
 
 namespace chrome_browser_net {
 
 namespace {
 
 static const char* const kHistogramNames[] = {
   "NetConnectivity.Pipeline.CanarySuccess",
   "NetConnectivity.Pipeline.Depth",
   "NetConnectivity.Pipeline.AllHTTP11",
@@ skipping 164 matching lines @@
   }
 
   MessageLoopForIO message_loop_;
   net::TestServer test_server_;
   net::TestURLRequestContextGetter* context_;
   content::TestBrowserThread io_thread_;
 
  private:
   scoped_ptr<HistogramSamples> GetHistogram(const char* name) {
     scoped_ptr<HistogramSamples> samples;
-    Histogram* cached_histogram = NULL;
-    Histogram* current_histogram =
+    HistogramBase* cached_histogram = NULL;
+    HistogramBase* current_histogram =
         base::StatisticsRecorder::FindHistogram(name);
     if (ContainsKey(histograms_, name)) {
       cached_histogram = histograms_[name];
     }
 
     // This is to work around the CACHE_HISTOGRAM_* macros caching the last used
     // histogram by name. So, even though we throw out the StatisticsRecorder
     // between tests, the CACHE_HISTOGRAM_* might still write into the old
     // Histogram if it has the same name as the last run. We keep a cache of the
     // last used Histogram and then update the cache if it's different than the
     // current Histogram.
     if (cached_histogram && current_histogram) {
       samples = cached_histogram->SnapshotSamples();
       if (cached_histogram != current_histogram) {
         samples->Add(*(current_histogram->SnapshotSamples()));
         histograms_[name] = current_histogram;
       }
     } else if (current_histogram) {
       samples = current_histogram->SnapshotSamples();
       histograms_[name] = current_histogram;
     } else if (cached_histogram) {
       samples = cached_histogram->SnapshotSamples();
     }
     return samples.Pass();
   }
 
-  static std::map<std::string, Histogram*> histograms_;
+  static std::map<std::string, HistogramBase*> histograms_;
   std::map<std::string, HistogramSamples*> original_samples_;
 };
 
 // static
-std::map<std::string, Histogram*>
+std::map<std::string, HistogramBase*>
     HttpPipeliningCompatibilityClientTest::histograms_;
 
 TEST_F(HttpPipeliningCompatibilityClientTest, Success) {
   RequestInfo info;
   info.filename = "files/alphabet.txt";
   info.expected_response = "abcdefghijklmnopqrstuvwxyz";
   std::vector<RequestInfo> requests;
   requests.push_back(info);
 
   RunTest(requests, HttpPipeliningCompatibilityClient::PIPE_TEST_DEFAULTS);
@@ skipping 329 matching lines @@
   callback.WaitForResult();
 
   ExpectHistogramCount(1, false, FIELD_CANARY);
   ExpectHistogramCount(0, false, FIELD_SUCCESS);
   ExpectHistogramCount(0, true, FIELD_SUCCESS);
 }
 
 }  // anonymous namespace
 
 }  // namespace chrome_browser_net