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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1811173002: DataUseTabModel should check the URL to differentiate history navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed tbansal comments Created 4 years, 9 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
« no previous file with comments | « chrome/browser/android/data_usage/data_use_ui_tab_model.cc ('k') | no next file » | no next file with comments »
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 527c9365b9e513aab4f2ec5696274815099ad77e..da290284e9c54f0824d704543e84ff8a072d2a9b 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
@@ -15,6 +15,7 @@
#include "chrome/browser/android/data_usage/external_data_use_observer.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_tab_helper.h"
+#include "chrome/common/url_constants.h"
#include "components/data_usage/core/data_use_aggregator.h"
#include "components/data_usage/core/data_use_amortizer.h"
#include "components/data_usage/core/data_use_annotator.h"
@@ -355,84 +356,77 @@ TEST_F(DataUseUITabModelTest, EntranceExitStateForDialog) {
// 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_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
- ui::PageTransition(ui::PAGE_TRANSITION_RELOAD), &transition_type));
- EXPECT_EQ(DataUseTabModel::TRANSITION_RELOAD, transition_type);
- EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
- ui::PageTransition(ui::PAGE_TRANSITION_RELOAD | 0xFF00),
- &transition_type));
- EXPECT_EQ(DataUseTabModel::TRANSITION_RELOAD, transition_type);
- EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
- ui::PageTransition(ui::PAGE_TRANSITION_RELOAD | 0xFFFF00),
- &transition_type));
- EXPECT_EQ(DataUseTabModel::TRANSITION_RELOAD, transition_type);
- EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
- ui::PageTransition(ui::PAGE_TRANSITION_RELOAD | 0x12FFFF00),
- &transition_type));
- EXPECT_EQ(DataUseTabModel::TRANSITION_RELOAD, transition_type);
-
- // Navigating back or forward.
- EXPECT_FALSE(data_use_ui_tab_model()->ConvertTransitionType(
- ui::PageTransition(ui::PAGE_TRANSITION_RELOAD |
- ui::PAGE_TRANSITION_FORWARD_BACK),
- &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));
+ const struct {
+ ui::PageTransition page_transition;
+ const std::string url;
+ bool expected_return;
+ DataUseTabModel::TransitionType expected_transition_type;
+ } tests[] = {
+ {ui::PageTransition(ui::PAGE_TRANSITION_TYPED), std::string(), true,
+ DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION},
+ {ui::PageTransition(ui::PAGE_TRANSITION_TYPED | 0xFF00), std::string(),
+ true, DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION},
+ {ui::PageTransition(ui::PAGE_TRANSITION_TYPED | 0xFFFF00), std::string(),
+ true, DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION},
+ {ui::PageTransition(ui::PAGE_TRANSITION_TYPED | 0x12FFFF00),
+ std::string(), true, DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION},
+ {ui::PageTransition(ui::PAGE_TRANSITION_AUTO_BOOKMARK), std::string(),
+ true, DataUseTabModel::TRANSITION_BOOKMARK},
+ {ui::PageTransition(ui::PAGE_TRANSITION_AUTO_BOOKMARK | 0xFF00),
+ std::string(), true, DataUseTabModel::TRANSITION_BOOKMARK},
+ {ui::PageTransition(ui::PAGE_TRANSITION_AUTO_BOOKMARK | 0xFFFF00),
+ std::string(), true, DataUseTabModel::TRANSITION_BOOKMARK},
+ {ui::PageTransition(ui::PAGE_TRANSITION_AUTO_BOOKMARK | 0x12FFFF00),
+ std::string(), true, DataUseTabModel::TRANSITION_BOOKMARK},
+ {ui::PageTransition(ui::PAGE_TRANSITION_GENERATED), std::string(), true,
+ DataUseTabModel::TRANSITION_OMNIBOX_SEARCH},
+ {ui::PageTransition(ui::PAGE_TRANSITION_GENERATED | 0xFF00),
+ std::string(), true, DataUseTabModel::TRANSITION_OMNIBOX_SEARCH},
+ {ui::PageTransition(ui::PAGE_TRANSITION_GENERATED | 0xFFFF00),
+ std::string(), true, DataUseTabModel::TRANSITION_OMNIBOX_SEARCH},
+ {ui::PageTransition(ui::PAGE_TRANSITION_GENERATED | 0x12FFFF00),
+ std::string(), true, DataUseTabModel::TRANSITION_OMNIBOX_SEARCH},
+ {ui::PageTransition(ui::PAGE_TRANSITION_RELOAD), std::string(), true,
+ DataUseTabModel::TRANSITION_RELOAD},
+ {ui::PageTransition(ui::PAGE_TRANSITION_RELOAD | 0xFF00), std::string(),
+ true, DataUseTabModel::TRANSITION_RELOAD},
+ {ui::PageTransition(ui::PAGE_TRANSITION_RELOAD | 0xFFFF00), std::string(),
+ true, DataUseTabModel::TRANSITION_RELOAD},
+ {ui::PageTransition(ui::PAGE_TRANSITION_RELOAD | 0x12FFFF00),
+ std::string(), true, DataUseTabModel::TRANSITION_RELOAD},
+
+ // Navigating back or forward.
+ {ui::PageTransition(ui::PAGE_TRANSITION_RELOAD |
+ ui::PAGE_TRANSITION_FORWARD_BACK),
+ std::string(), false},
+ {ui::PageTransition(ui::PAGE_TRANSITION_RELOAD |
+ ui::PAGE_TRANSITION_AUTO_SUBFRAME),
+ std::string(), false},
+ {ui::PageTransition(ui::PAGE_TRANSITION_RELOAD |
+ ui::PAGE_TRANSITION_MANUAL_SUBFRAME),
+ std::string(), false},
+ {ui::PageTransition(ui::PAGE_TRANSITION_RELOAD |
+ ui::PAGE_TRANSITION_FORM_SUBMIT),
+ std::string(), false},
+
+ // Navigating history.
+ {ui::PageTransition(ui::PAGE_TRANSITION_AUTO_TOPLEVEL),
+ kChromeUIHistoryFrameURL, true,
+ DataUseTabModel::TRANSITION_HISTORY_ITEM},
+ {ui::PageTransition(ui::PAGE_TRANSITION_AUTO_TOPLEVEL),
+ kChromeUIHistoryURL, true, DataUseTabModel::TRANSITION_HISTORY_ITEM},
+ {ui::PageTransition(ui::PAGE_TRANSITION_AUTO_TOPLEVEL), std::string(),
+ false},
+ };
+
+ for (const auto& test : tests) {
+ DataUseTabModel::TransitionType transition_type;
+ EXPECT_EQ(test.expected_return,
+ data_use_ui_tab_model()->ConvertTransitionType(
+ test.page_transition, GURL(test.url), &transition_type));
+ if (test.expected_return)
+ EXPECT_EQ(test.expected_transition_type, transition_type);
+ }
}
} // namespace android
« no previous file with comments | « chrome/browser/android/data_usage/data_use_ui_tab_model.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698