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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc

Issue 2117373002: Cleanup: Change LogMostVisitedImpression|Navigation APIs to take an enum (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ntp_uma_cleanup
Patch Set: Created 4 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/resources/local_ntp/most_visited_util.js ('K') | « chrome/browser/ui/webui/ntp/ntp_user_data_logger.cc ('k') | chrome/common/ntp_logging_events.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc
diff --git a/chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc b/chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc
index 8f9b9bcafd7c03085b2d8edcb845e6c770f86d8b..559f46be678a8e2ed9313187892431a637ac0e20 100644
--- a/chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc
@@ -108,56 +108,79 @@ TEST_F(NTPUserDataLoggerTest, TestLogging) {
TEST_F(NTPUserDataLoggerTest, TestLogMostVisitedImpression) {
base::StatisticsRecorder::Initialize();
- EXPECT_EQ(0, GetBinCount("NewTabPage.SuggestionsImpression.foobar", 1));
- EXPECT_EQ(0, GetBinCount("NewTabPage.SuggestionsImpression.foobar", 5));
+ EXPECT_EQ(0, GetTotalCount("NewTabPage.SuggestionsImpression"));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.SuggestionsImpression.server", 1));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.SuggestionsImpression.server", 5));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.SuggestionsImpression.client", 1));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.SuggestionsImpression.client", 5));
TestNTPUserDataLogger logger;
- logger.LogMostVisitedImpression(1, base::ASCIIToUTF16("foobar"));
- EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.foobar", 1));
- EXPECT_EQ(0, GetBinCount("NewTabPage.SuggestionsImpression.foobar", 5));
-
- logger.LogMostVisitedImpression(5, base::ASCIIToUTF16("foobar"));
- EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.foobar", 1));
- EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.foobar", 5));
-
- // Try without provider. Only total increases.
- logger.LogMostVisitedImpression(5, base::ASCIIToUTF16(""));
- EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.foobar", 1));
- EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.foobar", 5));
-
- logger.LogMostVisitedImpression(1, base::ASCIIToUTF16("foobar"));
- EXPECT_EQ(2, GetBinCount("NewTabPage.SuggestionsImpression.foobar", 1));
- EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.foobar", 5));
+ logger.LogMostVisitedImpression(1, NTP_TILE_SOURCE_SERVER);
+ EXPECT_EQ(1, GetTotalCount("NewTabPage.SuggestionsImpression"));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.server", 1));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.SuggestionsImpression.server", 5));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.SuggestionsImpression.client", 1));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.SuggestionsImpression.client", 5));
+
+ logger.LogMostVisitedImpression(5, NTP_TILE_SOURCE_SERVER);
+ EXPECT_EQ(2, GetTotalCount("NewTabPage.SuggestionsImpression"));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.server", 1));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.server", 5));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.SuggestionsImpression.client", 1));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.SuggestionsImpression.client", 5));
+
+ logger.LogMostVisitedImpression(1, NTP_TILE_SOURCE_CLIENT);
+ EXPECT_EQ(3, GetTotalCount("NewTabPage.SuggestionsImpression"));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.server", 1));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.server", 5));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.client", 1));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.SuggestionsImpression.client", 5));
+
+ logger.LogMostVisitedImpression(5, NTP_TILE_SOURCE_CLIENT);
+ EXPECT_EQ(4, GetTotalCount("NewTabPage.SuggestionsImpression"));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.server", 1));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.server", 5));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.client", 1));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.SuggestionsImpression.client", 5));
}
TEST_F(NTPUserDataLoggerTest, TestLogMostVisitedNavigation) {
base::StatisticsRecorder::Initialize();
EXPECT_EQ(0, GetTotalCount("NewTabPage.MostVisited"));
- EXPECT_EQ(0, GetBinCount("NewTabPage.MostVisited.foobar", 1));
- EXPECT_EQ(0, GetBinCount("NewTabPage.MostVisited.foobar", 5));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.MostVisited.server", 1));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.MostVisited.server", 5));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.MostVisited.client", 1));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.MostVisited.client", 5));
TestNTPUserDataLogger logger;
- logger.LogMostVisitedNavigation(1, base::ASCIIToUTF16("foobar"));
+ logger.LogMostVisitedNavigation(1, NTP_TILE_SOURCE_SERVER);
EXPECT_EQ(1, GetTotalCount("NewTabPage.MostVisited"));
- EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.foobar", 1));
- EXPECT_EQ(0, GetBinCount("NewTabPage.MostVisited.foobar", 5));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.server", 1));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.MostVisited.server", 5));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.MostVisited.client", 1));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.MostVisited.client", 5));
- logger.LogMostVisitedNavigation(5, base::ASCIIToUTF16("foobar"));
+ logger.LogMostVisitedNavigation(5, NTP_TILE_SOURCE_SERVER);
EXPECT_EQ(2, GetTotalCount("NewTabPage.MostVisited"));
- EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.foobar", 1));
- EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.foobar", 5));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.server", 1));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.server", 5));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.MostVisited.client", 1));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.MostVisited.client", 5));
- // Try without provider. Only total increases.
- logger.LogMostVisitedNavigation(5, base::ASCIIToUTF16(""));
+ logger.LogMostVisitedNavigation(1, NTP_TILE_SOURCE_CLIENT);
EXPECT_EQ(3, GetTotalCount("NewTabPage.MostVisited"));
- EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.foobar", 1));
- EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.foobar", 5));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.server", 1));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.server", 5));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.client", 1));
+ EXPECT_EQ(0, GetBinCount("NewTabPage.MostVisited.client", 5));
- logger.LogMostVisitedNavigation(1, base::ASCIIToUTF16("foobar"));
+ logger.LogMostVisitedNavigation(5, NTP_TILE_SOURCE_CLIENT);
EXPECT_EQ(4, GetTotalCount("NewTabPage.MostVisited"));
- EXPECT_EQ(2, GetBinCount("NewTabPage.MostVisited.foobar", 1));
- EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.foobar", 5));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.server", 1));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.server", 5));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.client", 1));
+ EXPECT_EQ(1, GetBinCount("NewTabPage.MostVisited.client", 5));
}
« chrome/browser/resources/local_ntp/most_visited_util.js ('K') | « chrome/browser/ui/webui/ntp/ntp_user_data_logger.cc ('k') | chrome/common/ntp_logging_events.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698