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

Unified Diff: chrome/browser/ui/autofill/generated_credit_card_bubble_controller_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/ui/autofill/generated_credit_card_bubble_controller_unittest.cc
diff --git a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc
index d52aff55785301d8f08f7723bbb58fe357a21ef3..de08c51c45f9183bf066f6ab900bee4772e913ce 100644
--- a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc
@@ -16,10 +16,10 @@
#include "chrome/test/base/testing_profile.h"
#include "components/autofill/core/browser/autofill_test_utils.h"
#include "content/public/browser/web_contents.h"
-#include "content/public/common/page_transition_types.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/public/test/web_contents_tester.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/page_transition_types.h"
#include "ui/gfx/range/range.h"
#if defined(OS_WIN)
@@ -76,7 +76,7 @@ class GeneratedCreditCardBubbleControllerTest : public testing::Test {
BackingCard());
}
- void NavigateWithTransition(content::PageTransition trans) {
+ void NavigateWithTransition(ui::PageTransition trans) {
content::WebContentsTester::For(test_web_contents_.get())->TestDidNavigate(
test_web_contents_->GetMainFrame(), 1, GURL("about:blank"), trans);
}
@@ -156,7 +156,7 @@ TEST_F(GeneratedCreditCardBubbleControllerTest, HideOnLinkClick) {
EXPECT_TRUE(controller()->GetTestingBubble()->showing());
// However, if the user clicks a link the bubble should hide.
- NavigateWithTransition(content::PAGE_TRANSITION_LINK);
+ NavigateWithTransition(ui::PAGE_TRANSITION_LINK);
EXPECT_FALSE(controller());
}
@@ -167,9 +167,9 @@ TEST_F(GeneratedCreditCardBubbleControllerTest, StayOnSomeNavigations) {
// If the user reloads or the page redirects or submits a form, the bubble
// should stay showing.
- NavigateWithTransition(content::PAGE_TRANSITION_CLIENT_REDIRECT);
- NavigateWithTransition(content::PAGE_TRANSITION_FORM_SUBMIT);
- NavigateWithTransition(content::PAGE_TRANSITION_RELOAD);
+ NavigateWithTransition(ui::PAGE_TRANSITION_CLIENT_REDIRECT);
+ NavigateWithTransition(ui::PAGE_TRANSITION_FORM_SUBMIT);
+ NavigateWithTransition(ui::PAGE_TRANSITION_RELOAD);
EXPECT_TRUE(controller()->GetTestingBubble()->showing());
}

Powered by Google App Engine
This is Rietveld 408576698