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

Unified Diff: chrome/browser/sync/profile_sync_service_typed_url_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
Index: chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
index 1a2e241ad43c919c8ebbcac58bd115506763e2d7..2fe0476e2ffb2ccf412069d72825fc1cad732634 100644
--- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
@@ -352,7 +352,7 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {
history_url.set_hidden(hidden);
visits->push_back(history::VisitRow(
history_url.id(), history_url.last_visit(), 0,
- content::PAGE_TRANSITION_TYPED, 0));
+ ui::PAGE_TRANSITION_TYPED, 0));
history_url.set_visit_count(visits->size());
return history_url;
}
@@ -372,7 +372,7 @@ void AddTypedUrlEntries(ProfileSyncServiceTypedUrlTest* test,
history::VisitVector visits;
visits.push_back(history::VisitRow(
entries[i].id(), entries[i].last_visit(), 0,
- content::PageTransitionFromInt(0), 0));
+ ui::PageTransitionFromInt(0), 0));
test->AddTypedUrlSyncNode(entries[i], visits);
}
}
@@ -527,7 +527,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, HasNativeHasSyncMerge) {
history::VisitVector merged_visits;
merged_visits.push_back(history::VisitRow(
sync_entry.id(), base::Time::FromInternalValue(15), 0,
- content::PageTransitionFromInt(0), 0));
+ ui::PageTransitionFromInt(0), 0));
history::URLRow merged_entry(MakeTypedUrlEntry("http://native.com", "name",
2, 17, false, &merged_visits));
@@ -704,7 +704,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeAddFromVisit) {
history::URLVisitedDetails details;
details.row = added_entry;
- details.transition = content::PAGE_TRANSITION_TYPED;
+ details.transition = ui::PAGE_TRANSITION_TYPED;
scoped_refptr<ThreadNotifier> notifier(
new ThreadNotifier(history_thread_.get()));
notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED,
@@ -743,7 +743,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeUpdateFromVisit) {
history::URLVisitedDetails details;
details.row = updated_entry;
- details.transition = content::PAGE_TRANSITION_TYPED;
+ details.transition = ui::PAGE_TRANSITION_TYPED;
scoped_refptr<ThreadNotifier> notifier(
new ThreadNotifier(history_thread_.get()));
notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED,
@@ -784,7 +784,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserIgnoreChangeUpdateFromVisit) {
details.row = updated_entry;
// Should ignore this change because it's not TYPED.
- details.transition = content::PAGE_TRANSITION_RELOAD;
+ details.transition = ui::PAGE_TRANSITION_RELOAD;
scoped_refptr<ThreadNotifier> notifier(
new ThreadNotifier(history_thread_.get()));
notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED,
@@ -803,7 +803,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserIgnoreChangeUpdateFromVisit) {
12, 15, false,
&updated_visits));
details.row = twelve_visits;
- details.transition = content::PAGE_TRANSITION_TYPED;
+ details.transition = ui::PAGE_TRANSITION_TYPED;
notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED,
content::Source<Profile>(profile_),
content::Details<history::URLVisitedDetails>(&details));
@@ -818,7 +818,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserIgnoreChangeUpdateFromVisit) {
20, 15, false,
&updated_visits));
details.row = twenty_visits;
- details.transition = content::PAGE_TRANSITION_TYPED;
+ details.transition = ui::PAGE_TRANSITION_TYPED;
notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED,
content::Source<Profile>(profile_),
content::Details<history::URLVisitedDetails>(&details));

Powered by Google App Engine
This is Rietveld 408576698