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

Unified Diff: chrome/browser/translate/translate_manager_render_view_host_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/translate/translate_manager_render_view_host_unittest.cc
diff --git a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
index 2566d7663b1971f28a055bcaa5f7e484c3cd117f..135536cefe104a5017e0a46a769c4ea6b7886b44 100644
--- a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
+++ b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
@@ -839,9 +839,9 @@ TEST_F(TranslateManagerRenderViewHostTest, ReloadFromLocationBar) {
// equivalent of typing the URL again in the location bar.
NavEntryCommittedObserver nav_observer(web_contents());
web_contents()->GetController().LoadURL(
- url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());
+ url, content::Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
rvh_tester()->SendNavigateWithTransition(
- 0, url, content::PAGE_TRANSITION_TYPED);
+ 0, url, ui::PAGE_TRANSITION_TYPED);
// Test that we are really getting a same page navigation, the test would be
// useless if it was not the case.
@@ -894,12 +894,12 @@ TEST_F(TranslateManagerRenderViewHostTest, CloseInfoBarInSubframeNavigation) {
// Simulate a sub-frame auto-navigating.
subframe_tester->SendNavigateWithTransition(
- 1, GURL("http://pub.com"), content::PAGE_TRANSITION_AUTO_SUBFRAME);
+ 1, GURL("http://pub.com"), ui::PAGE_TRANSITION_AUTO_SUBFRAME);
EXPECT_TRUE(GetTranslateInfoBar() == NULL);
// Simulate the user navigating in a sub-frame.
subframe_tester->SendNavigateWithTransition(
- 2, GURL("http://pub.com"), content::PAGE_TRANSITION_MANUAL_SUBFRAME);
+ 2, GURL("http://pub.com"), ui::PAGE_TRANSITION_MANUAL_SUBFRAME);
EXPECT_TRUE(GetTranslateInfoBar() == NULL);
// Navigate out of page, a new infobar should show.

Powered by Google App Engine
This is Rietveld 408576698