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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc

Issue 1443683002: Notify DataUseTabModel of navigations and tab closures (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: patch Created 5 years, 1 month 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/android/data_usage/data_use_ui_tab_model.cc ('K') | « chrome/browser/android/data_usage/data_use_ui_tab_model.cc ('k') | chrome/browser/profiles/profile_impl_io_data.cc » ('j') | chrome/browser/profiles/profile_impl_io_data.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc
diff --git a/chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc b/chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc
index 47ddf55444ea5b18cb57b01085df9b15cdd23616..fc8e1be7579762cc38a99e317b6ee87281552499 100644
--- a/chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc
+++ b/chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc
@@ -6,6 +6,7 @@
#include <stdint.h>
+#include "chrome/browser/android/data_usage/data_use_tab_model.h"
#include "chrome/browser/android/data_usage/data_use_ui_tab_model_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_tab_helper.h"
@@ -96,6 +97,66 @@ TEST_F(DataUseUITabModelTest, EntranceExitState) {
EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(baz_tab_id));
}
+// Checks if page transition type is converted correctly.
+TEST_F(DataUseUITabModelTest, ConvertTransitionType) {
+ DataUseTabModel::TransitionType transition_type;
+ EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_TYPED), &transition_type));
+ EXPECT_EQ(DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION, transition_type);
+ EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_TYPED | 0xFF00),
+ &transition_type));
+ EXPECT_EQ(DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION, transition_type);
+ EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_TYPED | 0xFFFF00),
+ &transition_type));
+ EXPECT_EQ(DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION, transition_type);
+ EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_TYPED | 0x12FFFF00),
+ &transition_type));
+ EXPECT_EQ(DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION, transition_type);
+
+ EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_AUTO_BOOKMARK), &transition_type));
+ EXPECT_EQ(DataUseTabModel::TRANSITION_BOOKMARK, transition_type);
+ EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_AUTO_BOOKMARK | 0xFF00),
+ &transition_type));
+ EXPECT_EQ(DataUseTabModel::TRANSITION_BOOKMARK, transition_type);
+ EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_AUTO_BOOKMARK | 0xFFFF00),
+ &transition_type));
+ EXPECT_EQ(DataUseTabModel::TRANSITION_BOOKMARK, transition_type);
+ EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_AUTO_BOOKMARK | 0x12FFFF00),
+ &transition_type));
+ EXPECT_EQ(DataUseTabModel::TRANSITION_BOOKMARK, transition_type);
+
+ EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_GENERATED), &transition_type));
+ EXPECT_EQ(DataUseTabModel::TRANSITION_OMNIBOX_SEARCH, transition_type);
+ EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_GENERATED | 0xFF00),
+ &transition_type));
+ EXPECT_EQ(DataUseTabModel::TRANSITION_OMNIBOX_SEARCH, transition_type);
+ EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_GENERATED | 0xFFFF00),
+ &transition_type));
+ EXPECT_EQ(DataUseTabModel::TRANSITION_OMNIBOX_SEARCH, transition_type);
+ EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_GENERATED | 0x12FFFF00),
+ &transition_type));
+ EXPECT_EQ(DataUseTabModel::TRANSITION_OMNIBOX_SEARCH, transition_type);
+
+ EXPECT_FALSE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_AUTO_SUBFRAME), &transition_type));
+ EXPECT_FALSE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_MANUAL_SUBFRAME),
+ &transition_type));
+ EXPECT_FALSE(data_use_ui_tab_model()->ConvertTransitionType(
+ ui::PageTransition(ui::PAGE_TRANSITION_FORM_SUBMIT), &transition_type));
+}
+
} // namespace android
} // namespace chrome
« chrome/browser/android/data_usage/data_use_ui_tab_model.cc ('K') | « chrome/browser/android/data_usage/data_use_ui_tab_model.cc ('k') | chrome/browser/profiles/profile_impl_io_data.cc » ('j') | chrome/browser/profiles/profile_impl_io_data.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698