SampleSet -> HistogramSamples (will be reused by SparseHistogram)

chrome/browser/protector/default_search_provider_change_browsertest.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 "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
+#include "base/metrics/sample_vector.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/protector/base_setting_change.h"
 #include "chrome/browser/protector/histograms.h"
 #include "chrome/browser/protector/mock_protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ skipping 106 matching lines @@
   void ExpectSettingsOpened(const std::string& subpage) {
     GURL settings_url(chrome::kChromeUISettingsURL + subpage);
     EXPECT_CALL(*mock_protector_service_, OpenTab(settings_url, browser()));
   }
 
   void ExpectHistogramCount(const std::string& name,
                             size_t bucket,
                             base::Histogram::Count count) {
     base::Histogram* histogram = base::StatisticsRecorder::FindHistogram(name);
     EXPECT_TRUE(histogram != NULL);
-    base::Histogram::SampleSet sample;
-    histogram->SnapshotSample(&sample);
-    EXPECT_EQ(count, sample.counts(bucket)) <<
-        "Invalid " << name << " value for bucket " << bucket;
+    scoped_ptr<base::SampleVector> samples = histogram->SnapshotSamples();
+    EXPECT_EQ(count, samples->GetCountAtIndex(bucket))
+        << "Invalid " << name << " value for bucket " << bucket;
   }
 
  protected:
   MockProtectorService* mock_protector_service_;
   TemplateURLService* turl_service_;
   scoped_ptr<TemplateURL> prepopulated_url_;
 };
 
 // Tests below call both Apply and Discard on a single change instance.
 // This is test-only and should not be happening in real code.
@@ skipping 521 matching lines @@
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
   // Discard does nothing - backup was already active.
   change->Discard(browser());
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 }
 
 }  // namespace protector