Let MetricsService know about some Android Activities

base/metrics/histogram_snapshot_manager_unittest.cc

Index: base/metrics/histogram_snapshot_manager_unittest.cc
diff --git a/base/metrics/histogram_snapshot_manager_unittest.cc b/base/metrics/histogram_snapshot_manager_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..aa7fbc5a0b35f5b2e39724a22faaa2df9e91bba1
--- /dev/null
+++ b/base/metrics/histogram_snapshot_manager_unittest.cc
@@ -0,0 +1,106 @@
+// Copyright 2013 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/metrics/histogram_snapshot_manager.h"
+
+#include <string>
+#include <vector>
+
+#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_delta_serialization.h"
+#include "base/metrics/statistics_recorder.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace base {
+
+class HistogramFlattenerDeltaRecorder : public HistogramFlattener {
+ public:
+  virtual void RecordDelta(const HistogramBase& histogram,
+                           const HistogramSamples& snapshot) OVERRIDE {
+    recorded_delta_histogram_names_.push_back(histogram.histogram_name());
+  }
+
+  virtual void InconsistencyDetected(
+      HistogramBase::Inconsistency problem) OVERRIDE {
+    ASSERT_TRUE(false);
+  }
+
+  virtual void UniqueInconsistencyDetected(
+      HistogramBase::Inconsistency problem) OVERRIDE {
+    ASSERT_TRUE(false);
+  }
+
+  virtual void InconsistencyDetectedInLoggedCount(int amount) OVERRIDE {
+    ASSERT_TRUE(false);
+  }
+
+  std::vector<std::string> GetRecordedDeltaHistogramNames() {
+    return recorded_delta_histogram_names_;
+  }
+
+  void ClearRecordedData() { recorded_delta_histogram_names_.clear(); }
+
+ private:
+  std::vector<std::string> recorded_delta_histogram_names_;
+};
+
+TEST(HistogramSnapshotManagerTest, PrepareDeltasHistogramFilter) {
+  StatisticsRecorder statistics_recorder;
+  HistogramFlattenerDeltaRecorder histogram_flattener_delta_recorder;
+  HistogramSnapshotManager histogram_snapshot_manager(
+      &histogram_flattener_delta_recorder);
+  std::vector<std::string> recorded_delta_histogram_names;
+
+  // kNoFlags filter should record all histograms.
+  UMA_HISTOGRAM_ENUMERATION("UmaHistogram", 1, 2);
+  UMA_STABILITY_HISTOGRAM_ENUMERATION("UmaStabilityHistogram", 1, 2);
+  histogram_snapshot_manager.PrepareDeltas(HistogramBase::kNoFlags,
+                                           HistogramBase::kNoFlags);
+  recorded_delta_histogram_names =
+      histogram_flattener_delta_recorder.GetRecordedDeltaHistogramNames();
+  EXPECT_EQ((unsigned)2, recorded_delta_histogram_names.size());
+  EXPECT_EQ("UmaHistogram", recorded_delta_histogram_names[0]);
+  EXPECT_EQ("UmaStabilityHistogram", recorded_delta_histogram_names[1]);
+  histogram_flattener_delta_recorder.ClearRecordedData();

[Alexei Svitkine (slow), 2014/01/27 19:12:54]

Instead of calling ClearRecordedData() after each test case, use separate TEST_F
blocks.

[Kibeom Kim (inactive), 2014/01/29 01:52:32]

Done.

+
+  // Record histograms that have kUmaTargetedHistogramFlag.
+  UMA_HISTOGRAM_ENUMERATION("UmaHistogram", 1, 2);
+  UMA_STABILITY_HISTOGRAM_ENUMERATION("UmaStabilityHistogram", 1, 2);
+  histogram_snapshot_manager.PrepareDeltas(
+      HistogramBase::kNoFlags, HistogramBase::kUmaTargetedHistogramFlag);
+  recorded_delta_histogram_names =
+      histogram_flattener_delta_recorder.GetRecordedDeltaHistogramNames();
+  EXPECT_EQ((unsigned)2, recorded_delta_histogram_names.size());
+  EXPECT_EQ("UmaHistogram", recorded_delta_histogram_names[0]);
+  EXPECT_EQ("UmaStabilityHistogram", recorded_delta_histogram_names[1]);
+  histogram_flattener_delta_recorder.ClearRecordedData();
+
+  // Record only histograms that have kStabilityHistogramFlag.
+  UMA_HISTOGRAM_ENUMERATION("UmaHistogram", 1, 2);
+  UMA_STABILITY_HISTOGRAM_ENUMERATION("UmaStabilityHistogram", 1, 2);
+  histogram_snapshot_manager.PrepareDeltas(
+      HistogramBase::kNoFlags, HistogramBase::kStabilityHistogramFlag);
+  recorded_delta_histogram_names =
+      histogram_flattener_delta_recorder.GetRecordedDeltaHistogramNames();
+  EXPECT_EQ((unsigned)1, recorded_delta_histogram_names.size());
+  EXPECT_EQ("UmaStabilityHistogram", recorded_delta_histogram_names[0]);
+  histogram_flattener_delta_recorder.ClearRecordedData();
+
+  // Record only histograms that have both kUmaTargetedHistogramFlag and
+  // kStabilityHistogramFlag.
+  UMA_HISTOGRAM_ENUMERATION("UmaHistogram", 1, 2);
+  UMA_STABILITY_HISTOGRAM_ENUMERATION("UmaStabilityHistogram", 1, 2);
+  histogram_snapshot_manager.PrepareDeltas(
+      HistogramBase::kNoFlags,
+      static_cast<HistogramBase::Flags>(
+          HistogramBase::kUmaTargetedHistogramFlag |
+          HistogramBase::kStabilityHistogramFlag));
+  recorded_delta_histogram_names =
+      histogram_flattener_delta_recorder.GetRecordedDeltaHistogramNames();
+  EXPECT_EQ((unsigned)1, recorded_delta_histogram_names.size());
+  EXPECT_EQ("UmaStabilityHistogram", recorded_delta_histogram_names[0]);
+  histogram_flattener_delta_recorder.ClearRecordedData();
+}
+
+}  // namespace base