Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2985)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/signin/account_reconcilor_unittest.cc

Issue 379283002: Rework UMAHistogramHelper and StatisticsDeltaReader into [Chrome]HistogramTester. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ChromeOS tests Created 6 years, 4 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/chromeos/external_metrics_unittest.cc ('K') | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/account_reconcilor_unittest.cc
diff --git a/chrome/browser/signin/account_reconcilor_unittest.cc b/chrome/browser/signin/account_reconcilor_unittest.cc
index c4e69e80112b82b37ce3ab2c6947f0ed870231c3..8a32cc5c4426fcffdb23f96a4cf419c3f6597066 100644
--- a/chrome/browser/signin/account_reconcilor_unittest.cc
+++ b/chrome/browser/signin/account_reconcilor_unittest.cc
@@ -6,6 +6,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/test/histogram_tester.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "chrome/browser/prefs/pref_service_syncable.h"
@@ -20,7 +21,6 @@
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
-#include "chrome/test/base/uma_histogram_helper.h"
#include "components/signin/core/browser/account_reconcilor.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "components/signin/core/browser/signin_manager.h"
@@ -36,13 +36,6 @@
namespace {
const char kTestEmail[] = "user@gmail.com";
-const char* const kHistogramsToSnapshot[] = {
- "Signin.Reconciler.DifferentPrimaryAccounts.FirstRun",
- "Signin.Reconciler.AddedToCookieJar.FirstRun",
- "Signin.Reconciler.AddedToChrome.FirstRun",
- "Signin.Reconciler.DifferentPrimaryAccounts.SubsequentRun",
- "Signin.Reconciler.AddedToCookieJar.SubsequentRun",
- "Signin.Reconciler.AddedToChrome.SubsequentRun"};
class MockAccountReconcilor : public testing::StrictMock<AccountReconcilor> {
public:
@@ -96,7 +89,7 @@ class AccountReconcilorTest : public ::testing::TestWithParam<bool> {
TestingProfile* profile() { return profile_; }
FakeSigninManagerForTesting* signin_manager() { return signin_manager_; }
FakeProfileOAuth2TokenService* token_service() { return token_service_; }
- UMAHistogramHelper* histogram_helper() { return &histogram_helper_; }
+ base::HistogramTester* histogram_tester() { return &histogram_tester_; }
void SetFakeResponse(const std::string& url,
const std::string& data,
@@ -125,7 +118,7 @@ class AccountReconcilorTest : public ::testing::TestWithParam<bool> {
MockAccountReconcilor* mock_reconcilor_;
net::FakeURLFetcherFactory url_fetcher_factory_;
scoped_ptr<TestingProfileManager> testing_profile_manager_;
- UMAHistogramHelper histogram_helper_;
+ base::HistogramTester histogram_tester_;
DISALLOW_COPY_AND_ASSIGN(AccountReconcilorTest);
};
@@ -171,10 +164,6 @@ void AccountReconcilorTest::SetUp() {
token_service_ =
static_cast<FakeProfileOAuth2TokenService*>(
ProfileOAuth2TokenServiceFactory::GetForProfile(profile()));
-
- // Take a new snapshot of the concerned histograms before each test
- histogram_helper_.PrepareSnapshot(kHistogramsToSnapshot,
- arraysize(kHistogramsToSnapshot));
}
MockAccountReconcilor* AccountReconcilorTest::GetMockReconcilor() {
@@ -392,10 +381,9 @@ TEST_P(AccountReconcilorTest, StartReconcileNoop) {
ASSERT_TRUE(reconcilor->AreAllRefreshTokensChecked());
ASSERT_FALSE(reconcilor->is_reconcile_started_);
- histogram_helper()->Fetch();
- histogram_helper()->ExpectTotalCount(
+ histogram_tester()->ExpectTotalCount(
"Signin.Reconciler.DifferentPrimaryAccounts.FirstRun", 1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.DifferentPrimaryAccounts.FirstRun",
signin_metrics::ACCOUNTS_SAME,
1);
@@ -441,8 +429,7 @@ TEST_P(AccountReconcilorTest, StartReconcileNoopWithDots) {
ASSERT_TRUE(reconcilor->AreAllRefreshTokensChecked());
ASSERT_FALSE(reconcilor->is_reconcile_started_);
- histogram_helper()->Fetch();
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.DifferentPrimaryAccounts.FirstRun",
signin_metrics::ACCOUNTS_SAME,
1);
@@ -486,10 +473,9 @@ TEST_P(AccountReconcilorTest, StartReconcileNoopMultiple) {
ASSERT_TRUE(reconcilor->AreAllRefreshTokensChecked());
ASSERT_FALSE(reconcilor->is_reconcile_started_);
- histogram_helper()->Fetch();
- histogram_helper()->ExpectTotalCount(
+ histogram_tester()->ExpectTotalCount(
"Signin.Reconciler.DifferentPrimaryAccounts.FirstRun", 1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.DifferentPrimaryAccounts.FirstRun",
signin_metrics::ACCOUNTS_SAME,
1);
@@ -521,14 +507,13 @@ TEST_P(AccountReconcilorTest, StartReconcileAddToCookie) {
GoogleServiceAuthError::AuthErrorNone());
ASSERT_FALSE(reconcilor->is_reconcile_started_);
- histogram_helper()->Fetch();
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.DifferentPrimaryAccounts.FirstRun",
signin_metrics::ACCOUNTS_SAME,
1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.AddedToCookieJar.FirstRun", 1, 1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.AddedToChrome.FirstRun", 0, 1);
}
@@ -567,14 +552,13 @@ TEST_P(AccountReconcilorTest, StartReconcileAddToCookieTwice) {
reconcilor, "other@gmail.com", GoogleServiceAuthError::AuthErrorNone());
ASSERT_FALSE(reconcilor->is_reconcile_started_);
- histogram_helper()->Fetch();
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.DifferentPrimaryAccounts.FirstRun",
signin_metrics::ACCOUNTS_SAME,
1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.AddedToCookieJar.FirstRun", 1, 1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.AddedToChrome.FirstRun", 0, 1);
// Do another pass after I've added a third account to the token service
@@ -608,22 +592,21 @@ TEST_P(AccountReconcilorTest, StartReconcileAddToCookieTwice) {
reconcilor, "third@gmail.com", GoogleServiceAuthError::AuthErrorNone());
ASSERT_FALSE(reconcilor->is_reconcile_started_);
- histogram_helper()->Fetch();
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.DifferentPrimaryAccounts.FirstRun",
signin_metrics::ACCOUNTS_SAME,
1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.AddedToCookieJar.FirstRun", 1, 1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.AddedToChrome.FirstRun", 0, 1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.DifferentPrimaryAccounts.SubsequentRun",
signin_metrics::ACCOUNTS_SAME,
1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.AddedToCookieJar.SubsequentRun", 1, 1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.AddedToChrome.SubsequentRun", 0, 1);
}
@@ -651,14 +634,13 @@ TEST_P(AccountReconcilorTest, StartReconcileAddToChrome) {
SimulateRefreshTokenFetched(reconcilor, "other@gmail.com", "");
ASSERT_FALSE(reconcilor->is_reconcile_started_);
- histogram_helper()->Fetch();
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.DifferentPrimaryAccounts.FirstRun",
signin_metrics::ACCOUNTS_SAME,
1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.AddedToCookieJar.FirstRun", 0, 1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.AddedToChrome.FirstRun", 1, 1);
}
@@ -694,14 +676,13 @@ TEST_P(AccountReconcilorTest, StartReconcileBadPrimary) {
GoogleServiceAuthError::AuthErrorNone());
ASSERT_FALSE(reconcilor->is_reconcile_started_);
- histogram_helper()->Fetch();
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.DifferentPrimaryAccounts.FirstRun",
signin_metrics::COOKIE_AND_TOKEN_PRIMARIES_DIFFERENT,
1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.AddedToCookieJar.FirstRun", 2, 1);
- histogram_helper()->ExpectUniqueSample(
+ histogram_tester()->ExpectUniqueSample(
"Signin.Reconciler.AddedToChrome.FirstRun", 0, 1);
}
« chrome/browser/chromeos/external_metrics_unittest.cc ('K') | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698