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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/autocomplete/shortcuts_provider_unittest.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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/autocomplete/shortcuts_provider.cc ('k') | chrome/browser/autofill/autofill_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/shortcuts_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
index f6a86e7d21968bacfdb90bfb8f676aa00447eb8c..7178cff7c234400ac6dd2e13c46159e74d1bdd5c 100644
--- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
@@ -53,7 +53,7 @@ struct TestShortcutInfo {
std::string contents_class;
std::string description;
std::string description_class;
- content::PageTransition transition;
+ ui::PageTransition transition;
AutocompleteMatch::Type type;
std::string keyword;
int days_from_now;
@@ -61,141 +61,141 @@ struct TestShortcutInfo {
} shortcut_test_db[] = {
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880E0", "goog", "www.google.com",
"http://www.google.com/", "Google", "0,1,4,0", "Google", "0,3,4,1",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1,
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1,
100 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880E1", "slash", "slashdot.org",
"http://slashdot.org/", "slashdot.org", "0,3,5,1",
"Slashdot - News for nerds, stuff that matters", "0,2,5,0",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 0,
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 0,
100 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880E2", "news", "slashdot.org",
"http://slashdot.org/", "slashdot.org", "0,1",
"Slashdot - News for nerds, stuff that matters", "0,0,11,2,15,0",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 0,
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 0,
5 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880E3", "news", "sports.yahoo.com",
"http://sports.yahoo.com/", "sports.yahoo.com", "0,1",
"Yahoo! Sports - Sports News, Scores, Rumors, Fantasy Games, and more",
- "0,0,23,2,27,0", content::PAGE_TRANSITION_TYPED,
+ "0,0,23,2,27,0", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_TITLE, "", 2, 5 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880E4", "news weather",
"www.cnn.com/index.html", "http://www.cnn.com/index.html",
"www.cnn.com/index.html", "0,1",
"CNN.com - Breaking News, U.S., World, Weather, Entertainment & Video",
- "0,0,19,2,23,0,38,2,45,0", content::PAGE_TRANSITION_TYPED,
+ "0,0,19,2,23,0,38,2,45,0", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_TITLE, "", 1, 10 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880E5", "nhl scores", "sports.yahoo.com",
"http://sports.yahoo.com/", "sports.yahoo.com", "0,1",
"Yahoo! Sports - Sports News, Scores, Rumors, Fantasy Games, and more",
- "0,0,29,2,35,0", content::PAGE_TRANSITION_TYPED,
+ "0,0,29,2,35,0", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_BODY, "", 1, 10 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880E6", "nhl scores",
"www.nhl.com/scores/index.html", "http://www.nhl.com/scores/index.html",
"www.nhl.com/scores/index.html", "0,1,4,3,7,1",
"January 13, 2010 - NHL.com - Scores", "0,0,19,2,22,0,29,2,35,0",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 5,
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 5,
1 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880E7", "just", "www.testsite.com/a.html",
"http://www.testsite.com/a.html", "www.testsite.com/a.html", "0,1",
"Test - site - just a test", "0,0,14,2,18,0",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 5,
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 5,
1 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880E8", "just", "www.testsite.com/b.html",
"http://www.testsite.com/b.html", "www.testsite.com/b.html", "0,1",
"Test - site - just a test", "0,0,14,2,18,0",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 5,
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 5,
2 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880E9", "just", "www.testsite.com/c.html",
"http://www.testsite.com/c.html", "www.testsite.com/c.html", "0,1",
"Test - site - just a test", "0,0,14,2,18,0",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 8,
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 8,
1 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880EA", "just a", "www.testsite.com/d.html",
"http://www.testsite.com/d.html", "www.testsite.com/d.html", "0,1",
"Test - site - just a test", "0,0,14,2,18,0",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "",
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "",
12, 1 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880EB", "just a t",
"www.testsite.com/e.html", "http://www.testsite.com/e.html",
"www.testsite.com/e.html", "0,1", "Test - site - just a test",
- "0,0,14,2,18,0", content::PAGE_TRANSITION_TYPED,
+ "0,0,14,2,18,0", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_TITLE, "", 12, 1 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880EC", "just a te",
"www.testsite.com/f.html", "http://www.testsite.com/f.html",
"www.testsite.com/f.html", "0,1", "Test - site - just a test",
- "0,0,14,2,18,0", content::PAGE_TRANSITION_TYPED,
+ "0,0,14,2,18,0", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_TITLE, "", 12, 1 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880ED", "ago", "www.daysagotest.com/a.html",
"http://www.daysagotest.com/a.html", "www.daysagotest.com/a.html",
- "0,1,8,3,11,1", "Test - site", "0,0", content::PAGE_TRANSITION_TYPED,
+ "0,1,8,3,11,1", "Test - site", "0,0", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_URL, "", 1, 1 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880EE", "ago", "www.daysagotest.com/b.html",
"http://www.daysagotest.com/b.html", "www.daysagotest.com/b.html",
- "0,1,8,3,11,1", "Test - site", "0,0", content::PAGE_TRANSITION_TYPED,
+ "0,1,8,3,11,1", "Test - site", "0,0", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_URL, "", 2, 1 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880EF", "ago", "www.daysagotest.com/c.html",
"http://www.daysagotest.com/c.html", "www.daysagotest.com/c.html",
- "0,1,8,3,11,1", "Test - site", "0,0", content::PAGE_TRANSITION_TYPED,
+ "0,1,8,3,11,1", "Test - site", "0,0", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_URL, "", 3, 1 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880F0", "ago", "www.daysagotest.com/d.html",
"http://www.daysagotest.com/d.html", "www.daysagotest.com/d.html",
- "0,1,8,3,11,1", "Test - site", "0,0", content::PAGE_TRANSITION_TYPED,
+ "0,1,8,3,11,1", "Test - site", "0,0", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_URL, "", 4, 1 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880F1", "echo echo", "echo echo",
"chrome-extension://cedabbhfglmiikkmdgcpjdkocfcmbkee/?q=echo",
"Run Echo command: echo", "0,0", "Echo", "0,4",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::EXTENSION_APP,
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::EXTENSION_APP,
"echo", 1, 1 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880F2", "abcdef.com", "http://abcdef.com",
"http://abcdef.com/", "Abcdef", "0,1,4,0", "Abcdef", "0,3,4,1",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1,
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1,
100 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880F3", "query", "query",
"https://www.google.com/search?q=query", "query", "0,0",
- "Google Search", "0,4", content::PAGE_TRANSITION_GENERATED,
+ "Google Search", "0,4", ui::PAGE_TRANSITION_GENERATED,
AutocompleteMatchType::SEARCH_HISTORY, "", 1, 100 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880F4", "word", "www.word",
"https://www.google.com/search?q=www.word", "www.word", "0,0",
- "Google Search", "0,4", content::PAGE_TRANSITION_GENERATED,
+ "Google Search", "0,4", ui::PAGE_TRANSITION_GENERATED,
AutocompleteMatchType::SEARCH_HISTORY, "", 1, 100 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880F5", "about:o", "chrome://omnibox",
"chrome://omnibox/", "about:omnibox", "0,3,10,1", "", "",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::NAVSUGGEST, "",
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::NAVSUGGEST, "",
1, 100 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880F6", "www/real sp",
"http://www/real space/long-url-with-space.html",
"http://www/real%20space/long-url-with-space.html",
"www/real space/long-url-with-space.html", "0,3,11,1",
"Page With Space; Input with Space", "0,0",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "",
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "",
1, 100 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880F7", "duplicate", "http://duplicate.com",
"http://duplicate.com/", "Duplicate", "0,1", "Duplicate", "0,1",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1,
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1,
100 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880F8", "dupl", "http://duplicate.com",
"http://duplicate.com/", "Duplicate", "0,1", "Duplicate", "0,1",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1,
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1,
100 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880F9", "notrailing.com/",
"http://notrailing.com", "http://notrailing.com/", "No Trailing Slash",
"0,1", "No Trailing Slash on fill_into_edit", "0,1",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "",
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "",
1, 100 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880FA", "http:///foo.com",
"http://foo.com", "http://foo.com/", "Foo - Typo in Input",
"0,1", "Foo - Typo in Input Corrected in fill_into_edit", "0,1",
- content::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "",
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "",
1, 100 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880FB", "trailing1 ",
"http://trailing1.com", "http://trailing1.com/",
"Trailing1 - Space in Shortcut", "0,1",
- "Trailing1 - Space in Shortcut", "0,1", content::PAGE_TRANSITION_TYPED,
+ "Trailing1 - Space in Shortcut", "0,1", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_URL, "", 1, 100 },
{ "BD85DBA2-8C29-49F9-84AE-48E1E90880FC", "about:trailing2 ",
"chrome://trailing2blah", "chrome://trailing2blah/",
"Trailing2 - Space in Shortcut", "0,1",
- "Trailing2 - Space in Shortcut", "0,1", content::PAGE_TRANSITION_TYPED,
+ "Trailing2 - Space in Shortcut", "0,1", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_URL, "", 1, 100 },
};
@@ -714,7 +714,7 @@ TEST_F(ShortcutsProviderTest, CalculateScore) {
history::ShortcutsDatabase::Shortcut::MatchCore(
ASCIIToUTF16("www.test.com"), GURL("http://www.test.com"),
ASCIIToUTF16("www.test.com"), "0,1,4,3,8,1",
- ASCIIToUTF16("A test"), "0,0,2,2", content::PAGE_TRANSITION_TYPED,
+ ASCIIToUTF16("A test"), "0,0,2,2", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_URL, base::string16()),
base::Time::Now(), 1);
@@ -765,19 +765,19 @@ TEST_F(ShortcutsProviderTest, DeleteMatch) {
TestShortcutInfo shortcuts_to_test_delete[] = {
{ "BD85DBA2-8C29-49F9-84AE-48E1E90881F1", "delete", "www.deletetest.com/1",
"http://www.deletetest.com/1", "http://www.deletetest.com/1", "0,2",
- "Erase this shortcut!", "0,0", content::PAGE_TRANSITION_TYPED,
+ "Erase this shortcut!", "0,0", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_URL, "", 1, 1},
{ "BD85DBA2-8C29-49F9-84AE-48E1E90881F2", "erase", "www.deletetest.com/1",
"http://www.deletetest.com/1", "http://www.deletetest.com/1", "0,2",
- "Erase this shortcut!", "0,0", content::PAGE_TRANSITION_TYPED,
+ "Erase this shortcut!", "0,0", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_TITLE, "", 1, 1},
{ "BD85DBA2-8C29-49F9-84AE-48E1E90881F3", "keep", "www.deletetest.com/1/2",
"http://www.deletetest.com/1/2", "http://www.deletetest.com/1/2", "0,2",
- "Keep this shortcut!", "0,0", content::PAGE_TRANSITION_TYPED,
+ "Keep this shortcut!", "0,0", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_TITLE, "", 1, 1},
{ "BD85DBA2-8C29-49F9-84AE-48E1E90881F4", "delete", "www.deletetest.com/2",
"http://www.deletetest.com/2", "http://www.deletetest.com/2", "0,2",
- "Erase this shortcut!", "0,0", content::PAGE_TRANSITION_TYPED,
+ "Erase this shortcut!", "0,0", ui::PAGE_TRANSITION_TYPED,
AutocompleteMatchType::HISTORY_URL, "", 1, 1},
};
« no previous file with comments | « chrome/browser/autocomplete/shortcuts_provider.cc ('k') | chrome/browser/autofill/autofill_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698