chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc - Issue 379283002: Rework UMAHistogramHelper and StatisticsDeltaReader into [Chrome]HistogramTester.

Unified Diff: chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

Issue 379283002: Rework UMAHistogramHelper and StatisticsDeltaReader into [Chrome]HistogramTester. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: mmenke nits Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/views/passwords/manage_passwords_view_test.cc ('K') | « chrome/browser/ui/views/passwords/manage_passwords_view_test.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

index af8fc1e2711c976fcaceaf6f60299e5cbf3fa700..62f1b53c5738eaa60200a6ef219b0e89a8f337b3 100644

--- a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

+++ b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

@@ -8,6 +8,7 @@

#include "base/path_service.h"

#include "base/prefs/pref_service.h"

#include "base/strings/utf_string_conversions.h"

+#include "base/test/histogram_tester.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/profiles/profile_metrics.h"

@@ -25,7 +26,6 @@

#include "chrome/test/base/test_switches.h"

#include "chrome/test/base/testing_browser_process.h"

#include "chrome/test/base/testing_profile_manager.h"

-#include "chrome/test/base/uma_histogram_helper.h"

#include "components/signin/core/common/profile_management_switches.h"

#include "content/public/test/test_utils.h"

#include "grit/generated_resources.h"

@@ -86,7 +86,7 @@ void ProfileChooserViewBrowserTest::OpenProfileChooserView() {

#endif

IN_PROC_BROWSER_TEST_F(ProfileChooserViewBrowserTest, MAYBE_ViewProfileUMA) {

- UMAHistogramHelper histograms;

+ base::HistogramTester histograms;

// If multiprofile mode is not enabled, you can't switch between profiles.

if (!profiles::IsMultipleProfilesEnabled())

return;

@@ -96,7 +96,6 @@ IN_PROC_BROWSER_TEST_F(ProfileChooserViewBrowserTest, MAYBE_ViewProfileUMA) {

ASSERT_NO_FATAL_FAILURE(OpenProfileChooserView());

- histograms.Fetch();

msw 2014/07/18 17:30:25 Were the NaCl tests the only ones that actually re

Ilya Sherman 2014/07/18 17:32:00 Indeed, the NaCl tests were the only ones that act

histograms.ExpectUniqueSample("Profile.UpgradeEnrollment",

ProfileMetrics::PROFILE_ENROLLMENT_SHOW_PREVIEW_PROMO, 1);

}