SampleSet -> HistogramSamples (will be reused by SparseHistogram)

chrome/browser/chrome_browser_application_mac_unittest.mm

Index: chrome/browser/chrome_browser_application_mac_unittest.mm
===================================================================
--- chrome/browser/chrome_browser_application_mac_unittest.mm	(revision 155400)
+++ chrome/browser/chrome_browser_application_mac_unittest.mm	(working copy)
@@ -5,12 +5,15 @@
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/scoped_nsexception_enabler.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
+#include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Histogram;
+using base::HistogramSamples;
 using base::StatisticsRecorder;
 
 namespace chrome_browser_application_mac {
@@ -74,16 +77,16 @@
   StatisticsRecorder::GetSnapshot("OSX.NSException", &histograms);
   EXPECT_EQ(1U, histograms.size());
   EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histograms[0]->flags());
-  Histogram::SampleSet sample;
-  histograms[0]->SnapshotSample(&sample);
-  EXPECT_EQ(4, sample.counts(0));
-  EXPECT_EQ(1, sample.counts(1));
-  EXPECT_EQ(3, sample.counts(2));
-  EXPECT_EQ(2, sample.counts(3));
 
+  scoped_ptr<HistogramSamples> samples(histograms[0]->SnapshotSamples());
+  EXPECT_EQ(4, samples->GetCount(0));
+  EXPECT_EQ(1, samples->GetCount(1));
+  EXPECT_EQ(3, samples->GetCount(2));
+  EXPECT_EQ(2, samples->GetCount(3));
+
   // The unknown exceptions should end up in the overflow bucket.
   EXPECT_EQ(kUnknownNSException + 1, histograms[0]->bucket_count());
-  EXPECT_EQ(4, sample.counts(kUnknownNSException));
+  EXPECT_EQ(4, samples->GetCount(kUnknownNSException));
 }
 
 }  // chrome_browser_application_mac