Move PageTransition from //content/public/common to //ui/base

chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/login/signin/merge_session_load_page.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
@@ skipping 55 matching lines @@
     // Clean up pending tasks that might depend on the user manager.
     base::RunLoop().RunUntilIdle();
     test_user_manager_.reset();
 #endif
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   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) {
     (new TestMergeSessionLoadPage(web_contents(), GURL(url), this))->Show();
   }
 
   // Returns the MergeSessionLoadPage currently showing or NULL if none is
   // showing.
   InterstitialPage* GetMergeSessionLoadPage() {
     return InterstitialPage::GetInterstitialPage(web_contents());
@@ skipping 32 matching lines @@
   ScopedTestCrosSettings test_cros_settings_;
   scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 };
 
 TEST_F(MergeSessionLoadPageTest, MergeSessionPageNotShown) {
   SetMergeSessionState(OAuth2LoginManager::SESSION_RESTORE_DONE);
   // Start a load.
   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.
   InterstitialPage* interstitial = GetMergeSessionLoadPage();
   EXPECT_FALSE(interstitial);
 }
 
 TEST_F(MergeSessionLoadPageTest, MergeSessionPageNotShownOnTimeout) {
   SetMergeSessionState(OAuth2LoginManager::SESSION_RESTORE_IN_PROGRESS);
   SetSessionRestoreStart(
       base::Time::Now() +
       base::TimeDelta::FromSeconds(kSessionMergeTimeout + 1));
 
   // Start a load.
   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.
   InterstitialPage* interstitial = GetMergeSessionLoadPage();
   EXPECT_FALSE(interstitial);
 }
 
 TEST_F(MergeSessionLoadPageTest, MergeSessionPageShown) {
   SetMergeSessionState(OAuth2LoginManager::SESSION_RESTORE_IN_PROGRESS);
 
   // Start a load.
   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.
   ShowInterstitial(kURL2);
   InterstitialPage* interstitial = GetMergeSessionLoadPage();
   ASSERT_TRUE(interstitial);
   base::RunLoop().RunUntilIdle();
 
   // Simulate merge session completion.
   SetMergeSessionState(OAuth2LoginManager::SESSION_RESTORE_DONE);
   base::RunLoop().RunUntilIdle();
 
   // The URL remains to be URL2.
   EXPECT_EQ(kURL2, web_contents()->GetVisibleURL().spec());
 
   // Commit navigation and the interstitial page is gone.
   Navigate(kURL2, 2);
   EXPECT_FALSE(GetMergeSessionLoadPage());
 }
 
 }  // namespace chromeos