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

Unified Diff: chrome/browser/sessions/session_restore_browsertest.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/sessions/session_restore.cc ('k') | chrome/browser/sessions/session_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sessions/session_restore_browsertest.cc
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index 5424bca84faf044effe8bf7c1e86c37ad0daf149..eed7405ce2dfe88b408ff562fc00baf6c4d13dad 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -43,10 +43,10 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/bindings_policy.h"
-#include "content/public/common/page_transition_types.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_navigation_observer.h"
#include "sync/protocol/session_specifics.pb.h"
+#include "ui/base/page_transition_types.h"
using sessions::SerializedNavigationEntry;
using sessions::SerializedNavigationEntryTestHelper;
@@ -144,7 +144,7 @@ class SessionRestoreTest : public InProcessBrowserTest {
} else {
chrome::NavigateParams params(profile,
url,
- content::PAGE_TRANSITION_LINK);
+ ui::PAGE_TRANSITION_LINK);
chrome::Navigate(&params);
}
Browser* new_browser = window_observer.WaitForSingleNewBrowser();
@@ -401,7 +401,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) {
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
chrome::AddSelectedTabWithURL(browser(), url2,
- content::PAGE_TRANSITION_LINK);
+ ui::PAGE_TRANSITION_LINK);
observer.Wait();
}
{
@@ -409,7 +409,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) {
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
chrome::AddSelectedTabWithURL(browser(), url3,
- content::PAGE_TRANSITION_LINK);
+ ui::PAGE_TRANSITION_LINK);
observer.Wait();
}
@@ -893,7 +893,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ActiveIndexUpdatedAtInsert) {
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
chrome::NavigateParams navigate_params(browser(), url3_,
- content::PAGE_TRANSITION_TYPED);
+ ui::PAGE_TRANSITION_TYPED);
navigate_params.tabstrip_index = 0;
navigate_params.disposition = NEW_BACKGROUND_TAB;
ui_test_utils::NavigateToURL(&navigate_params);
« no previous file with comments | « chrome/browser/sessions/session_restore.cc ('k') | chrome/browser/sessions/session_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698