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

chrome/browser/ui/browser_navigator_browsertest.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/ui/browser_navigator_browsertest.h"
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 39 matching lines @@
 } // namespace
 
 
 browser::NavigateParams BrowserNavigatorTest::MakeNavigateParams() const {
   return MakeNavigateParams(browser());
 }
 
 browser::NavigateParams BrowserNavigatorTest::MakeNavigateParams(
     Browser* browser) const {
   browser::NavigateParams params(browser, GetGoogleURL(),
-                                 PageTransition::LINK);
+                                 content::PAGE_TRANSITION_LINK);
   params.window_action = browser::NavigateParams::SHOW_WINDOW;
   return params;
 }
 
 Browser* BrowserNavigatorTest::CreateEmptyBrowserForType(Browser::Type type,
                                                          Profile* profile) {
   Browser* browser = Browser::CreateForType(type, profile);
   browser->AddBlankTab(true);
   return browser;
 }
@@ skipping 60 matching lines @@
 
   // Register for a notification if an additional tab_contents was instantiated.
   // Opening a Singleton tab that is already opened should not be opening a new
   // tab nor be creating a new TabContents object
   NotificationRegistrar registrar;
 
   // As the registrar object goes out of scope, this will get unregistered
   registrar.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB,
                 NotificationService::AllSources());
 
-  browser()->AddSelectedTabWithURL(singleton_url1, PageTransition::LINK);
-  browser()->AddSelectedTabWithURL(GetGoogleURL(), PageTransition::LINK);
+  browser()->AddSelectedTabWithURL(
+      singleton_url1, content::PAGE_TRANSITION_LINK);
+  browser()->AddSelectedTabWithURL(
+      GetGoogleURL(), content::PAGE_TRANSITION_LINK);
 
   // We should have one browser with 3 tabs, the 3rd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->active_index());
 
   unsigned int previous_tab_contents_count =
       created_tab_contents_count_ = 0;
 
   // Navigate to singleton_url1.
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
   p.url = singleton_url1;
   browser::Navigate(&p);
 
   // The middle tab should now be selected.
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(1, browser()->active_index());
 
   // No tab contents should have been created
   EXPECT_EQ(previous_tab_contents_count,
             created_tab_contents_count_);
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabRespectingRef) {
   GURL singleton_ref_url1("http://maps.google.com/#a");
   GURL singleton_ref_url2("http://maps.google.com/#b");
   GURL singleton_ref_url3("http://maps.google.com/");
 
-  browser()->AddSelectedTabWithURL(singleton_ref_url1, PageTransition::LINK);
+  browser()->AddSelectedTabWithURL(
+      singleton_ref_url1, content::PAGE_TRANSITION_LINK);
 
   // We should have one browser with 2 tabs, 2nd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
   // Navigate to singleton_url2.
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
   p.url = singleton_ref_url2;
@@ skipping 510 matching lines @@
   EXPECT_EQ(2u, BrowserList::size());
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(1, p.browser->tab_count());
 }
 
 // This test verifies that constructing params with disposition = SINGLETON_TAB
 // and IGNORE_AND_NAVIGATE opens a new tab navigated to the specified URL if
 // no previous tab with that URL (minus the path) exists.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabNew_IgnorePath) {
-  browser()->AddSelectedTabWithURL(GetGoogleURL(), PageTransition::LINK);
+  browser()->AddSelectedTabWithURL(
+      GetGoogleURL(), content::PAGE_TRANSITION_LINK);
 
   // We should have one browser with 2 tabs, the 2nd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
   // Navigate to a new singleton tab with a sub-page.
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
   p.url = GetSettingsAdvancedURL();
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
   p.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
   browser::Navigate(&p);
 
   // The last tab should now be selected and navigated to the sub-page of the
   // URL.
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(2, browser()->active_index());
   EXPECT_EQ(GetSettingsAdvancedURL(),
             browser()->GetSelectedTabContents()->GetURL());
 }
 
 // This test verifies that constructing params with disposition = SINGLETON_TAB
 // and IGNORE_AND_NAVIGATE opens an existing tab with the matching URL (minus
 // the path) which is navigated to the specified URL.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabExisting_IgnorePath) {
   GURL singleton_url1(GetSettingsURL());
-  browser()->AddSelectedTabWithURL(singleton_url1, PageTransition::LINK);
-  browser()->AddSelectedTabWithURL(GetGoogleURL(), PageTransition::LINK);
+  browser()->AddSelectedTabWithURL(
+      singleton_url1, content::PAGE_TRANSITION_LINK);
+  browser()->AddSelectedTabWithURL(
+      GetGoogleURL(), content::PAGE_TRANSITION_LINK);
 
   // We should have one browser with 3 tabs, the 3rd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(2, browser()->active_index());
 
   // Navigate to singleton_url1.
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
   p.url = GetSettingsAdvancedURL();
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
   p.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
   browser::Navigate(&p);
 
   // The middle tab should now be selected and navigated to the sub-page of the
   // URL.
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
   EXPECT_EQ(GetSettingsAdvancedURL(),
             browser()->GetSelectedTabContents()->GetURL());
 }
 
 // This test verifies that constructing params with disposition = SINGLETON_TAB
 // and IGNORE_AND_NAVIGATE opens an existing tab with the matching URL (minus
 // the path) which is navigated to the specified URL.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabExistingSubPath_IgnorePath) {
   GURL singleton_url1(GetSettingsAdvancedURL());
-  browser()->AddSelectedTabWithURL(singleton_url1, PageTransition::LINK);
-  browser()->AddSelectedTabWithURL(GetGoogleURL(), PageTransition::LINK);
+  browser()->AddSelectedTabWithURL(
+      singleton_url1, content::PAGE_TRANSITION_LINK);
+  browser()->AddSelectedTabWithURL(
+    GetGoogleURL(), content::PAGE_TRANSITION_LINK);

[Jói, 2011/10/12 22:35:02]

indent 2 more

 
   // We should have one browser with 3 tabs, the 3rd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(2, browser()->active_index());
 
   // Navigate to singleton_url1.
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
   p.url = GetSettingsPersonalURL();
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
   p.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
   browser::Navigate(&p);
 
   // The middle tab should now be selected and navigated to the sub-page of the
   // URL.
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
   EXPECT_EQ(GetSettingsPersonalURL(),
             browser()->GetSelectedTabContents()->GetURL());
 }
 
 // This test verifies that constructing params with disposition = SINGLETON_TAB
 // and IGNORE_AND_STAY_PUT opens an existing tab with the matching URL (minus
 // the path).
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabExistingSubPath_IgnorePath2) {
   GURL singleton_url1(GetSettingsAdvancedURL());
-  browser()->AddSelectedTabWithURL(singleton_url1, PageTransition::LINK);
-  browser()->AddSelectedTabWithURL(GetGoogleURL(), PageTransition::LINK);
+  browser()->AddSelectedTabWithURL(
+      singleton_url1, content::PAGE_TRANSITION_LINK);
+  browser()->AddSelectedTabWithURL(
+      GetGoogleURL(), content::PAGE_TRANSITION_LINK);
 
   // We should have one browser with 3 tabs, the 3rd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(2, browser()->active_index());
 
   // Navigate to singleton_url1.
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
   p.url = GetSettingsPersonalURL();
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
   p.path_behavior = browser::NavigateParams::IGNORE_AND_STAY_PUT;
   browser::Navigate(&p);
 
   // The middle tab should now be selected.
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
   EXPECT_EQ(singleton_url1,
             browser()->GetSelectedTabContents()->GetURL());
 }
 
 // This test verifies that constructing params with disposition = SINGLETON_TAB
 // and IGNORE_AND_NAVIGATE will update the current tab's URL if the currently
 // selected tab is a match but has a different path.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabFocused_IgnorePath) {
   GURL singleton_url_current(GetSettingsAdvancedURL());
-  browser()->AddSelectedTabWithURL(singleton_url_current, PageTransition::LINK);
+  browser()->AddSelectedTabWithURL(
+      singleton_url_current, content::PAGE_TRANSITION_LINK);
 
   // We should have one browser with 2 tabs, the 2nd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
   // Navigate to a different settings path.
   GURL singleton_url_target(GetSettingsPersonalURL());
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
@@ skipping 10 matching lines @@
             browser()->GetSelectedTabContents()->GetURL());
 }
 
 // This test verifies that constructing params with disposition = SINGLETON_TAB
 // and IGNORE_AND_NAVIGATE will open an existing matching tab with a different
 // query.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabExisting_IgnoreQuery) {
   int initial_tab_count = browser()->tab_count();
   GURL singleton_url_current("chrome://settings/internet");
-  browser()->AddSelectedTabWithURL(singleton_url_current, PageTransition::LINK);
+  browser()->AddSelectedTabWithURL(
+      singleton_url_current, content::PAGE_TRANSITION_LINK);
 
   EXPECT_EQ(initial_tab_count + 1, browser()->tab_count());
   EXPECT_EQ(initial_tab_count, browser()->active_index());
 
   // Navigate to a different settings path.
   GURL singleton_url_target(
       "chrome://settings/internet?"
       "servicePath=/profile/ethernet_00aa00aa00aa&networkType=1");
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
@@ skipping 31 matching lines @@
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GetSettingsURL(),
             browser()->GetSelectedTabContents()->GetURL());
 }
 
 // This test verifies that the settings page isn't opened in the incognito
 // window from a non-incognito window (bookmark open-in-incognito trigger).
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_Settings_UseNonIncognitoWindowForBookmark) {
   browser::NavigateParams params(browser(), GURL("chrome://settings"),
-                                 PageTransition::AUTO_BOOKMARK);
+                                 content::PAGE_TRANSITION_AUTO_BOOKMARK);
   params.disposition = OFF_THE_RECORD;
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources());
     browser::Navigate(&params);
     observer.Wait();
   }
 
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(GURL("chrome://settings"),
@@ skipping 22 matching lines @@
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL(chrome::kChromeUIBookmarksURL),
             browser()->GetSelectedTabContents()->GetURL());
 }
 
 // This test makes sure a crashed singleton tab reloads from a new navigation.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateToCrashedSingletonTab) {
   GURL singleton_url(GetSettingsAdvancedURL());
-  TabContentsWrapper* wrapper =
-      browser()->AddSelectedTabWithURL(singleton_url, PageTransition::LINK);
+  TabContentsWrapper* wrapper = browser()->AddSelectedTabWithURL(
+      singleton_url, content::PAGE_TRANSITION_LINK);
   TabContents* tab_contents = wrapper->tab_contents();
 
   // We should have one browser with 2 tabs, the 2nd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
   // Kill the singleton tab.
   tab_contents->SetIsCrashed(base::TERMINATION_STATUS_PROCESS_CRASHED, -1);
   EXPECT_TRUE(tab_contents->is_crashed());
@@ skipping 132 matching lines @@
                        NavigateFromOtherTabToSingletonOptions) {
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources());
     browser()->OpenOptionsDialog();
     observer.Wait();
   }
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources());
-    browser()->AddSelectedTabWithURL(GetGoogleURL(), PageTransition::LINK);
+    browser()->AddSelectedTabWithURL(
+        GetGoogleURL(), content::PAGE_TRANSITION_LINK);
     observer.Wait();
   }
 
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources());
     browser()->OpenOptionsDialog();
     observer.Wait();
   }
   EXPECT_EQ(2, browser()->tab_count());
@@ skipping 16 matching lines @@
 
   // Focus the omnibox.
   browser()->FocusLocationBar();
 
   AutocompleteEditController* controller =
       browser()->window()->GetLocationBar()->location_entry()->model()->
           controller();
 
   // Simulate an alt-enter.
   controller->OnAutocompleteAccept(url2, NEW_FOREGROUND_TAB,
-                                   PageTransition::TYPED, GURL());
+                                   content::PAGE_TRANSITION_TYPED, GURL());
 
   // Make sure the second tab is selected.
   EXPECT_EQ(1, browser()->active_index());
 
   // The tab contents should have the focus in the second tab.
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                            VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 
   // Go back to the first tab. The focus should not be in the omnibox.
   browser()->SelectPreviousTab();
@@ skipping 35 matching lines @@
         content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources());
     browser()->ShowDownloadsTab();
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(GURL(chrome::kChromeUIDownloadsURL),
             browser()->GetSelectedTabContents()->GetURL());
 }
 
 } // namespace