Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / signin / merge_session_load_page_unittest.cc

diff --git a/src/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc b/src/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc
index b23327b..72084a3 100644 (file)
--- a/src/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc
+++ b/src/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc
@@ -73,7 +73,7 @@ class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness {
   void Navigate(const char* url, int page_id) {
     WebContentsTester::For(web_contents())->TestDidNavigate(
         web_contents()->GetMainFrame(), page_id, GURL(url),
-        content::PAGE_TRANSITION_TYPED);
+        ui::PAGE_TRANSITION_TYPED);
   }
 
   void ShowInterstitial(const char* url) {
@@ -126,7 +126,7 @@ TEST_F(MergeSessionLoadPageTest, MergeSessionPageNotShown) {
   Navigate(kURL1, 1);
   // Load next page.
   controller().LoadURL(GURL(kURL2), content::Referrer(),
-                       content::PAGE_TRANSITION_TYPED, std::string());
+                       ui::PAGE_TRANSITION_TYPED, std::string());
 
   // Simulate the load causing an merge session interstitial page
   // to be shown.
@@ -144,7 +144,7 @@ TEST_F(MergeSessionLoadPageTest, MergeSessionPageNotShownOnTimeout) {
   Navigate(kURL1, 1);
   // Load next page.
   controller().LoadURL(GURL(kURL2), content::Referrer(),
-                       content::PAGE_TRANSITION_TYPED, std::string());
+                       ui::PAGE_TRANSITION_TYPED, std::string());
 
   // Simulate the load causing an merge session interstitial page
   // to be shown.
@@ -159,7 +159,7 @@ TEST_F(MergeSessionLoadPageTest, MergeSessionPageShown) {
   Navigate(kURL1, 1);
   // Load next page.
   controller().LoadURL(GURL(kURL2), content::Referrer(),
-                       content::PAGE_TRANSITION_TYPED, std::string());
+                       ui::PAGE_TRANSITION_TYPED, std::string());
 
   // Simulate the load causing an merge session interstitial page
   // to be shown.