Move the PageType enum to content/public/common, put it into the content namespace, and also make it conform to the Content API enum naming convention.

BUG=98716
TBR=ananta
Review URL: http://codereview.chromium.org/8336013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106076 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 3 deletions

diff --git a/content/browser/tab_contents/navigation_controller_unittest.cc b/content/browser/tab_contents/navigation_controller_unittest.cc
index 3ef5f39..543c98a 100644
--- a/content/browser/tab_contents/navigation_controller_unittest.cc
+++ b/content/browser/tab_contents/navigation_controller_unittest.cc
@@ -1606,7 +1606,7 @@ TEST_F(NavigationControllerTest, Interstitial) {
   const GURL url2("http://bar");
   controller().LoadURL(
       url1, GURL(), content::PAGE_TRANSITION_TYPED, std::string());
-  controller().pending_entry()->set_page_type(INTERSTITIAL_PAGE);
+  controller().pending_entry()->set_page_type(content::PAGE_TYPE_INTERSTITIAL);
 
   // At this point the interstitial will be displayed and the load will still
   // be pending. If the user continues, the load will commit.
@@ -1614,7 +1614,8 @@ TEST_F(NavigationControllerTest, Interstitial) {
 
   // The page should be a normal page again.
   EXPECT_EQ(url2, controller().GetLastCommittedEntry()->url());
-  EXPECT_EQ(NORMAL_PAGE, controller().GetLastCommittedEntry()->page_type());
+  EXPECT_EQ(content::PAGE_TYPE_NORMAL,
+            controller().GetLastCommittedEntry()->page_type());
 }
 
 TEST_F(NavigationControllerTest, RemoveEntry) {
@@ -1934,7 +1935,7 @@ TEST_F(NavigationControllerTest, CloneOmitsInterstitials) {
 
   // Add an interstitial entry.  Should be deleted with controller.
   NavigationEntry* interstitial_entry = new NavigationEntry();
-  interstitial_entry->set_page_type(INTERSTITIAL_PAGE);
+  interstitial_entry->set_page_type(content::PAGE_TYPE_INTERSTITIAL);
   controller().AddTransientEntry(interstitial_entry);
 
   scoped_ptr<TabContents> clone(controller().tab_contents()->Clone());