Move PageTransition into content namespace. While I'm touching all these files, I've also updated...

chrome/browser/ui/webui/web_ui_unittest.cc

 // Copyright (c) 2011 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 "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 10 matching lines @@
   // Tests navigating with a Web UI from a fresh (nothing pending or committed)
   // state, through pending, committed, then another navigation. The first page
   // ID that we should use is passed as a parameter. We'll use the next two
   // values. This must be increasing for the life of the tests.
   static void DoNavigationTest(TabContentsWrapper* wrapper, int page_id) {
     TabContents* contents = wrapper->tab_contents();
     NavigationController* controller = &contents->controller();
 
     // Start a pending load.
     GURL new_tab_url(chrome::kChromeUINewTabURL);
-    controller->LoadURL(new_tab_url, GURL(), PageTransition::LINK,
+    controller->LoadURL(new_tab_url, GURL(), content::PAGE_TRANSITION_LINK,
                         std::string());
 
     // The navigation entry should be pending with no committed entry.
     ASSERT_TRUE(controller->pending_entry());
     ASSERT_FALSE(controller->GetLastCommittedEntry());
 
     // Check the things the pending Web UI should have set.
     EXPECT_FALSE(wrapper->favicon_tab_helper()->ShouldDisplayFavicon());
     EXPECT_TRUE(contents->FocusLocationBarByDefault());
 
     // Now commit the load.
     static_cast<TestRenderViewHost*>(
         contents->render_view_host())->SendNavigate(page_id, new_tab_url);
 
     // The same flags should be set as before now that the load has committed.
     EXPECT_FALSE(wrapper->favicon_tab_helper()->ShouldDisplayFavicon());
     EXPECT_TRUE(contents->FocusLocationBarByDefault());
 
     // Start a pending navigation to a regular page.
     GURL next_url("http://google.com/");
-    controller->LoadURL(next_url, GURL(), PageTransition::LINK, std::string());
+    controller->LoadURL(next_url, GURL(), content::PAGE_TRANSITION_LINK,
+                        std::string());
 
     // Check the flags. Some should reflect the new page (URL, title), some
     // should reflect the old one (bookmark bar) until it has committed.
     EXPECT_TRUE(wrapper->favicon_tab_helper()->ShouldDisplayFavicon());
     EXPECT_FALSE(contents->FocusLocationBarByDefault());
 
     // Commit the regular page load. Note that we must send it to the "pending"
     // RenderViewHost if there is one, since this transition will also cause a
     // process transition, and our RVH pointer will be the "committed" one.
     // In the second call to this function from WebUIToStandard, it won't
@@ skipping 30 matching lines @@
   // alive), which will trigger different behavior in RenderViewHostManager.
   TestTabContents* contents2 = new TestTabContents(profile(), NULL);
   TabContentsWrapper wrapper2(contents2);
 
   DoNavigationTest(&wrapper2, 101);
 }
 
 TEST_F(WebUITest, WebUIToWebUI) {
   // Do a load (this state is tested above).
   GURL new_tab_url(chrome::kChromeUINewTabURL);
-  controller().LoadURL(new_tab_url, GURL(), PageTransition::LINK,
+  controller().LoadURL(new_tab_url, GURL(), content::PAGE_TRANSITION_LINK,
                        std::string());
   rvh()->SendNavigate(1, new_tab_url);
 
   // Start another pending load of the new tab page.
-  controller().LoadURL(new_tab_url, GURL(), PageTransition::LINK,
+  controller().LoadURL(new_tab_url, GURL(), content::PAGE_TRANSITION_LINK,
                        std::string());
   rvh()->SendNavigate(2, new_tab_url);
 
   // The flags should be the same as the non-pending state.
   EXPECT_FALSE(
       contents_wrapper()->favicon_tab_helper()->ShouldDisplayFavicon());
   EXPECT_TRUE(contents()->FocusLocationBarByDefault());
 }
 
 TEST_F(WebUITest, StandardToWebUI) {
   // Start a pending navigation to a regular page.
   GURL std_url("http://google.com/");
 
-  controller().LoadURL(std_url, GURL(), PageTransition::LINK, std::string());
+  controller().LoadURL(std_url, GURL(), content::PAGE_TRANSITION_LINK,
+                       std::string());
 
   // The state should now reflect the default.
   EXPECT_TRUE(contents_wrapper()->favicon_tab_helper()->ShouldDisplayFavicon());
   EXPECT_FALSE(contents()->FocusLocationBarByDefault());
 
   // Commit the load, the state should be the same.
   rvh()->SendNavigate(1, std_url);
   EXPECT_TRUE(contents_wrapper()->favicon_tab_helper()->ShouldDisplayFavicon());
   EXPECT_FALSE(contents()->FocusLocationBarByDefault());
 
   // Start a pending load for a WebUI.
   GURL new_tab_url(chrome::kChromeUINewTabURL);
-  controller().LoadURL(new_tab_url, GURL(), PageTransition::LINK,
+  controller().LoadURL(new_tab_url, GURL(), content::PAGE_TRANSITION_LINK,
                        std::string());
   EXPECT_TRUE(contents_wrapper()->favicon_tab_helper()->ShouldDisplayFavicon());
   EXPECT_TRUE(contents()->FocusLocationBarByDefault());
 
   // Committing Web UI is tested above.
 }
 
 class TabContentsForFocusTest : public TestTabContents {
  public:
   TabContentsForFocusTest(content::BrowserContext* browser_context,
@@ skipping 12 matching lines @@
   // Setup.  |tc| will be used to track when we try to focus the location bar.
   TabContentsForFocusTest* tc = new TabContentsForFocusTest(
       contents()->browser_context(),
       SiteInstance::CreateSiteInstance(contents()->browser_context()));
   tc->controller().CopyStateFrom(controller());
   SetContents(tc);
   int page_id = 200;
 
   // Load the NTP.
   GURL new_tab_url(chrome::kChromeUINewTabURL);
-  controller().LoadURL(new_tab_url, GURL(), PageTransition::LINK,
+  controller().LoadURL(new_tab_url, GURL(), content::PAGE_TRANSITION_LINK,
                        std::string());
   rvh()->SendNavigate(page_id, new_tab_url);
 
   // Navigate to another page.
   GURL next_url("http://google.com/");
   int next_page_id = page_id + 1;
-  controller().LoadURL(next_url, GURL(), PageTransition::LINK, std::string());
+  controller().LoadURL(next_url, GURL(), content::PAGE_TRANSITION_LINK,
+                       std::string());
   TestRenderViewHost* old_rvh = rvh();
   old_rvh->SendShouldCloseACK(true);
   pending_rvh()->SendNavigate(next_page_id, next_url);
   old_rvh->OnSwapOutACK();
 
   // Navigate back.  Should focus the location bar.
   int focus_called = tc->focus_called();
   ASSERT_TRUE(controller().CanGoBack());
   controller().GoBack();
   old_rvh = rvh();
   old_rvh->SendShouldCloseACK(true);
   pending_rvh()->SendNavigate(page_id, new_tab_url);
   old_rvh->OnSwapOutACK();
   EXPECT_LT(focus_called, tc->focus_called());
 
   // Navigate forward.  Shouldn't focus the location bar.
   focus_called = tc->focus_called();
   ASSERT_TRUE(controller().CanGoForward());
   controller().GoForward();
   old_rvh = rvh();
   old_rvh->SendShouldCloseACK(true);
   pending_rvh()->SendNavigate(next_page_id, next_url);
   old_rvh->OnSwapOutACK();
   EXPECT_EQ(focus_called, tc->focus_called());
 }