| Index: chrome/browser/net/http_pipelining_compatibility_client_unittest.cc
|
| diff --git a/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc b/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc
|
| index 04dddfe7ea8a18641c7c2c853ec14698fe75815b..7f3379041512dfe06cdf0f7a3e8c9bdff703bbf8 100644
|
| --- a/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc
|
| +++ b/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc
|
| @@ -25,7 +25,7 @@
|
| #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 {
|
| @@ -210,8 +210,8 @@ class HttpPipeliningCompatibilityClientTest : public testing::Test {
|
| 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];
|
| @@ -238,12 +238,12 @@ class HttpPipeliningCompatibilityClientTest : public testing::Test {
|
| 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) {
|
|
|