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

Move PageTransition enumeration from //content/public/common to //ui/base
so that it can be used by iOS and layered components that are used on iOS.

BUG=372373
R=avi@chromium.org, ben@chromium.org, wfh@chromium.org
TBR=ben, nasko

Review URL: https://codereview.chromium.org/562603002

Cr-Commit-Position: refs/heads/master@{#295686}

6 files changed, 64 insertions, 65 deletions

diff --git a/components/sessions/BUILD.gn b/components/sessions/BUILD.gn
index 762bc66..79a0d4b 100644
--- a/components/sessions/BUILD.gn
+++ b/components/sessions/BUILD.gn
@@ -20,6 +20,7 @@ component("sessions") {
     "//base",
     "//content/public/browser",
     "//skia",
+    "//ui/base",
     "//url",
   ]
 
diff --git a/components/sessions/DEPS b/components/sessions/DEPS
index ac27a7d..966369f 100644
--- a/components/sessions/DEPS
+++ b/components/sessions/DEPS
@@ -3,4 +3,5 @@ include_rules = [
   "+content/public/common",
   "+sync",
   "+third_party/WebKit/public/platform",
+  "+ui/base",
 ]
diff --git a/components/sessions/serialized_navigation_entry.cc b/components/sessions/serialized_navigation_entry.cc
index a5ba41c..b45ffd7 100644
--- a/components/sessions/serialized_navigation_entry.cc
+++ b/components/sessions/serialized_navigation_entry.cc
@@ -22,7 +22,7 @@ const char kSearchTermsKey[] = "search_terms";
 SerializedNavigationEntry::SerializedNavigationEntry()
     : index_(-1),
       unique_id_(0),
-      transition_type_(content::PAGE_TRANSITION_TYPED),
+      transition_type_(ui::PAGE_TRANSITION_TYPED),
       has_post_data_(false),
       post_id_(-1),
       is_overriding_user_agent_(false),
@@ -80,41 +80,40 @@ SerializedNavigationEntry SerializedNavigationEntry::FromSyncData(
   if (sync_data.has_page_transition()) {
     switch (sync_data.page_transition()) {
       case sync_pb::SyncEnums_PageTransition_LINK:
-        transition = content::PAGE_TRANSITION_LINK;
+        transition = ui::PAGE_TRANSITION_LINK;
         break;
       case sync_pb::SyncEnums_PageTransition_TYPED:
-        transition = content::PAGE_TRANSITION_TYPED;
+        transition = ui::PAGE_TRANSITION_TYPED;
         break;
       case sync_pb::SyncEnums_PageTransition_AUTO_BOOKMARK:
-        transition = content::PAGE_TRANSITION_AUTO_BOOKMARK;
+        transition = ui::PAGE_TRANSITION_AUTO_BOOKMARK;
         break;
       case sync_pb::SyncEnums_PageTransition_AUTO_SUBFRAME:
-        transition = content::PAGE_TRANSITION_AUTO_SUBFRAME;
+        transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
         break;
       case sync_pb::SyncEnums_PageTransition_MANUAL_SUBFRAME:
-        transition = content::PAGE_TRANSITION_MANUAL_SUBFRAME;
+        transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME;
         break;
       case sync_pb::SyncEnums_PageTransition_GENERATED:
-        transition = content::PAGE_TRANSITION_GENERATED;
+        transition = ui::PAGE_TRANSITION_GENERATED;
         break;
       case sync_pb::SyncEnums_PageTransition_AUTO_TOPLEVEL:
-        transition = content::PAGE_TRANSITION_AUTO_TOPLEVEL;
+        transition = ui::PAGE_TRANSITION_AUTO_TOPLEVEL;
         break;
       case sync_pb::SyncEnums_PageTransition_FORM_SUBMIT:
-        transition = content::PAGE_TRANSITION_FORM_SUBMIT;
+        transition = ui::PAGE_TRANSITION_FORM_SUBMIT;
         break;
       case sync_pb::SyncEnums_PageTransition_RELOAD:
-        transition = content::PAGE_TRANSITION_RELOAD;
+        transition = ui::PAGE_TRANSITION_RELOAD;
         break;
       case sync_pb::SyncEnums_PageTransition_KEYWORD:
-        transition = content::PAGE_TRANSITION_KEYWORD;
+        transition = ui::PAGE_TRANSITION_KEYWORD;
         break;
       case sync_pb::SyncEnums_PageTransition_KEYWORD_GENERATED:
-        transition =
-            content::PAGE_TRANSITION_KEYWORD_GENERATED;
+        transition = ui::PAGE_TRANSITION_KEYWORD_GENERATED;
         break;
       default:
-        transition = content::PAGE_TRANSITION_LINK;
+        transition = ui::PAGE_TRANSITION_LINK;
         break;
     }
   }
@@ -122,26 +121,25 @@ SerializedNavigationEntry SerializedNavigationEntry::FromSyncData(
   if  (sync_data.has_redirect_type()) {
     switch (sync_data.redirect_type()) {
       case sync_pb::SyncEnums_PageTransitionRedirectType_CLIENT_REDIRECT:
-        transition |= content::PAGE_TRANSITION_CLIENT_REDIRECT;
+        transition |= ui::PAGE_TRANSITION_CLIENT_REDIRECT;
         break;
       case sync_pb::SyncEnums_PageTransitionRedirectType_SERVER_REDIRECT:
-        transition |= content::PAGE_TRANSITION_SERVER_REDIRECT;
+        transition |= ui::PAGE_TRANSITION_SERVER_REDIRECT;
         break;
     }
   }
   if (sync_data.navigation_forward_back())
-      transition |= content::PAGE_TRANSITION_FORWARD_BACK;
+      transition |= ui::PAGE_TRANSITION_FORWARD_BACK;
   if (sync_data.navigation_from_address_bar())
-      transition |= content::PAGE_TRANSITION_FROM_ADDRESS_BAR;
+      transition |= ui::PAGE_TRANSITION_FROM_ADDRESS_BAR;
   if (sync_data.navigation_home_page())
-      transition |= content::PAGE_TRANSITION_HOME_PAGE;
+      transition |= ui::PAGE_TRANSITION_HOME_PAGE;
   if (sync_data.navigation_chain_start())
-      transition |= content::PAGE_TRANSITION_CHAIN_START;
+      transition |= ui::PAGE_TRANSITION_CHAIN_START;
   if (sync_data.navigation_chain_end())
-      transition |= content::PAGE_TRANSITION_CHAIN_END;
+      transition |= ui::PAGE_TRANSITION_CHAIN_END;
 
-  navigation.transition_type_ =
-      static_cast<content::PageTransition>(transition);
+  navigation.transition_type_ = static_cast<ui::PageTransition>(transition);
 
   navigation.timestamp_ = base::Time();
   navigation.search_terms_ = base::UTF8ToUTF16(sync_data.search_terms());
@@ -279,7 +277,7 @@ bool SerializedNavigationEntry::ReadFromPickle(PickleIterator* iterator) {
     return false;
   virtual_url_ = GURL(virtual_url_spec);
   page_state_ = content::PageState::CreateFromEncodedData(page_state_data);
-  transition_type_ = static_cast<content::PageTransition>(transition_type_int);
+  transition_type_ = ui::PageTransitionFromInt(transition_type_int);
 
   // type_mask did not always exist in the written stream. As such, we
   // don't fail if it can't be read.
@@ -344,7 +342,7 @@ scoped_ptr<NavigationEntry> SerializedNavigationEntry::ToNavigationEntry(
           referrer_,
           // Use a transition type of reload so that we don't incorrectly
           // increase the typed count.
-          content::PAGE_TRANSITION_RELOAD,
+          ui::PAGE_TRANSITION_RELOAD,
           false,
           // The extra headers are not sync'ed across sessions.
           std::string(),
@@ -379,51 +377,51 @@ sync_pb::TabNavigation SerializedNavigationEntry::ToSyncData() const {
   sync_data.set_title(base::UTF16ToUTF8(title_));
 
   // Page transition core.
-  COMPILE_ASSERT(content::PAGE_TRANSITION_LAST_CORE ==
-                 content::PAGE_TRANSITION_KEYWORD_GENERATED,
+  COMPILE_ASSERT(ui::PAGE_TRANSITION_LAST_CORE ==
+                 ui::PAGE_TRANSITION_KEYWORD_GENERATED,
                  PageTransitionCoreBounds);
-  switch (PageTransitionStripQualifier(transition_type_)) {
-    case content::PAGE_TRANSITION_LINK:
+  switch (ui::PageTransitionStripQualifier(transition_type_)) {
+    case ui::PAGE_TRANSITION_LINK:
       sync_data.set_page_transition(
           sync_pb::SyncEnums_PageTransition_LINK);
       break;
-    case content::PAGE_TRANSITION_TYPED:
+    case ui::PAGE_TRANSITION_TYPED:
       sync_data.set_page_transition(
           sync_pb::SyncEnums_PageTransition_TYPED);
       break;
-    case content::PAGE_TRANSITION_AUTO_BOOKMARK:
+    case ui::PAGE_TRANSITION_AUTO_BOOKMARK:
       sync_data.set_page_transition(
           sync_pb::SyncEnums_PageTransition_AUTO_BOOKMARK);
       break;
-    case content::PAGE_TRANSITION_AUTO_SUBFRAME:
+    case ui::PAGE_TRANSITION_AUTO_SUBFRAME:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_AUTO_SUBFRAME);
       break;
-    case content::PAGE_TRANSITION_MANUAL_SUBFRAME:
+    case ui::PAGE_TRANSITION_MANUAL_SUBFRAME:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_MANUAL_SUBFRAME);
       break;
-    case content::PAGE_TRANSITION_GENERATED:
+    case ui::PAGE_TRANSITION_GENERATED:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_GENERATED);
       break;
-    case content::PAGE_TRANSITION_AUTO_TOPLEVEL:
+    case ui::PAGE_TRANSITION_AUTO_TOPLEVEL:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_AUTO_TOPLEVEL);
       break;
-    case content::PAGE_TRANSITION_FORM_SUBMIT:
+    case ui::PAGE_TRANSITION_FORM_SUBMIT:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_FORM_SUBMIT);
       break;
-    case content::PAGE_TRANSITION_RELOAD:
+    case ui::PAGE_TRANSITION_RELOAD:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_RELOAD);
       break;
-    case content::PAGE_TRANSITION_KEYWORD:
+    case ui::PAGE_TRANSITION_KEYWORD:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_KEYWORD);
       break;
-    case content::PAGE_TRANSITION_KEYWORD_GENERATED:
+    case ui::PAGE_TRANSITION_KEYWORD_GENERATED:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_KEYWORD_GENERATED);
       break;
@@ -432,25 +430,25 @@ sync_pb::TabNavigation SerializedNavigationEntry::ToSyncData() const {
   }
 
   // Page transition qualifiers.
-  if (PageTransitionIsRedirect(transition_type_)) {
-    if (transition_type_ & content::PAGE_TRANSITION_CLIENT_REDIRECT) {
+  if (ui::PageTransitionIsRedirect(transition_type_)) {
+    if (transition_type_ & ui::PAGE_TRANSITION_CLIENT_REDIRECT) {
       sync_data.set_redirect_type(
         sync_pb::SyncEnums_PageTransitionRedirectType_CLIENT_REDIRECT);
-    } else if (transition_type_ & content::PAGE_TRANSITION_SERVER_REDIRECT) {
+    } else if (transition_type_ & ui::PAGE_TRANSITION_SERVER_REDIRECT) {
       sync_data.set_redirect_type(
         sync_pb::SyncEnums_PageTransitionRedirectType_SERVER_REDIRECT);
     }
   }
   sync_data.set_navigation_forward_back(
-      (transition_type_ & content::PAGE_TRANSITION_FORWARD_BACK) != 0);
+      (transition_type_ & ui::PAGE_TRANSITION_FORWARD_BACK) != 0);
   sync_data.set_navigation_from_address_bar(
-      (transition_type_ & content::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0);
+      (transition_type_ & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0);
   sync_data.set_navigation_home_page(
-      (transition_type_ & content::PAGE_TRANSITION_HOME_PAGE) != 0);
+      (transition_type_ & ui::PAGE_TRANSITION_HOME_PAGE) != 0);
   sync_data.set_navigation_chain_start(
-      (transition_type_ & content::PAGE_TRANSITION_CHAIN_START) != 0);
+      (transition_type_ & ui::PAGE_TRANSITION_CHAIN_START) != 0);
   sync_data.set_navigation_chain_end(
-      (transition_type_ & content::PAGE_TRANSITION_CHAIN_END) != 0);
+      (transition_type_ & ui::PAGE_TRANSITION_CHAIN_END) != 0);
 
   sync_data.set_unique_id(unique_id_);
   sync_data.set_timestamp_msec(syncer::TimeToProtoTime(timestamp_));
diff --git a/components/sessions/serialized_navigation_entry.h b/components/sessions/serialized_navigation_entry.h
index 0582c7e..6caee55 100644
--- a/components/sessions/serialized_navigation_entry.h
+++ b/components/sessions/serialized_navigation_entry.h
@@ -15,8 +15,8 @@
 #include "base/time/time.h"
 #include "components/sessions/sessions_export.h"
 #include "content/public/common/page_state.h"
-#include "content/public/common/page_transition_types.h"
 #include "content/public/common/referrer.h"
+#include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
 class Pickle;
@@ -102,7 +102,7 @@ class SESSIONS_EXPORT SerializedNavigationEntry {
   const GURL& favicon_url() const { return favicon_url_; }
   int http_status_code() const { return http_status_code_; }
   const content::Referrer& referrer() const { return referrer_; }
-  content::PageTransition transition_type() const {
+  ui::PageTransition transition_type() const {
     return transition_type_;
   }
   bool has_post_data() const { return has_post_data_; }
@@ -147,7 +147,7 @@ class SESSIONS_EXPORT SerializedNavigationEntry {
   GURL virtual_url_;
   base::string16 title_;
   content::PageState page_state_;
-  content::PageTransition transition_type_;
+  ui::PageTransition transition_type_;
   bool has_post_data_;
   int64 post_id_;
   GURL original_request_url_;
diff --git a/components/sessions/serialized_navigation_entry_test_helper.h b/components/sessions/serialized_navigation_entry_test_helper.h
index a653f22..1044b0c 100644
--- a/components/sessions/serialized_navigation_entry_test_helper.h
+++ b/components/sessions/serialized_navigation_entry_test_helper.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "content/public/common/page_transition_types.h"
 
 class GURL;
 
diff --git a/components/sessions/serialized_navigation_entry_unittest.cc b/components/sessions/serialized_navigation_entry_unittest.cc
index 2dcf3ad..25c4a26 100644
--- a/components/sessions/serialized_navigation_entry_unittest.cc
+++ b/components/sessions/serialized_navigation_entry_unittest.cc
@@ -16,12 +16,12 @@
 #include "base/time/time.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
-#include "content/public/common/page_transition_types.h"
 #include "content/public/common/referrer.h"
 #include "sync/protocol/session_specifics.pb.h"
 #include "sync/util/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
+#include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
 namespace sessions {
@@ -36,11 +36,11 @@ const GURL kVirtualURL("http://www.virtual-url.com");
 const base::string16 kTitle = base::ASCIIToUTF16("title");
 const content::PageState kPageState =
     content::PageState::CreateFromEncodedData("page state");
-const content::PageTransition kTransitionType =
-    static_cast<content::PageTransition>(
-        content::PAGE_TRANSITION_AUTO_SUBFRAME |
-        content::PAGE_TRANSITION_HOME_PAGE |
-        content::PAGE_TRANSITION_CLIENT_REDIRECT);
+const ui::PageTransition kTransitionType =
+    ui::PageTransitionFromInt(
+        ui::PAGE_TRANSITION_AUTO_SUBFRAME |
+        ui::PAGE_TRANSITION_HOME_PAGE |
+        ui::PAGE_TRANSITION_CLIENT_REDIRECT);
 const bool kHasPostData = true;
 const int64 kPostID = 100;
 const GURL kOriginalRequestURL("http://www.original-request.com");
@@ -113,7 +113,7 @@ TEST(SerializedNavigationEntryTest, DefaultInitializer) {
   EXPECT_EQ(GURL(), navigation.virtual_url());
   EXPECT_TRUE(navigation.title().empty());
   EXPECT_FALSE(navigation.page_state().IsValid());
-  EXPECT_EQ(content::PAGE_TRANSITION_TYPED, navigation.transition_type());
+  EXPECT_EQ(ui::PAGE_TRANSITION_TYPED, navigation.transition_type());
   EXPECT_FALSE(navigation.has_post_data());
   EXPECT_EQ(-1, navigation.post_id());
   EXPECT_EQ(GURL(), navigation.original_request_url());
@@ -239,7 +239,7 @@ TEST(SerializedNavigationEntryTest, ToNavigationEntry) {
   EXPECT_EQ(kTitle, new_navigation_entry->GetTitle());
   EXPECT_EQ(kPageState, new_navigation_entry->GetPageState());
   EXPECT_EQ(kPageID, new_navigation_entry->GetPageID());
-  EXPECT_EQ(content::PAGE_TRANSITION_RELOAD,
+  EXPECT_EQ(ui::PAGE_TRANSITION_RELOAD,
             new_navigation_entry->GetTransitionType());
   EXPECT_EQ(kHasPostData, new_navigation_entry->GetHasPostData());
   EXPECT_EQ(kPostID, new_navigation_entry->GetPostID());
@@ -323,18 +323,18 @@ TEST(SerializedNavigationEntryTest, LastNavigationRedirectUrl) {
 TEST(SerializedNavigationEntryTest, TransitionTypes) {
   scoped_ptr<content::NavigationEntry> navigation_entry(
       MakeNavigationEntryForTest());
-  for (uint32 core_type = content::PAGE_TRANSITION_LINK;
-       core_type != content::PAGE_TRANSITION_LAST_CORE; ++core_type) {
+  for (uint32 core_type = ui::PAGE_TRANSITION_LINK;
+       core_type != ui::PAGE_TRANSITION_LAST_CORE; ++core_type) {
     // Because qualifier is a uint32, left shifting will eventually overflow
     // and hit zero again. SERVER_REDIRECT, as the last qualifier and also
     // in place of the sign bit, is therefore the last transition before
     // breaking.
-    for (uint32 qualifier = content::PAGE_TRANSITION_FORWARD_BACK;
+    for (uint32 qualifier = ui::PAGE_TRANSITION_FORWARD_BACK;
          qualifier != 0; qualifier <<= 1) {
       if (qualifier == 0x08000000)
         continue;  // 0x08000000 is not a valid qualifier.
-      content::PageTransition transition =
-          static_cast<content::PageTransition>(core_type | qualifier);
+      ui::PageTransition transition =
+          ui::PageTransitionFromInt(core_type | qualifier);
 
       navigation_entry->SetTransitionType(transition);
       const SerializedNavigationEntry& navigation =
@@ -343,7 +343,7 @@ TEST(SerializedNavigationEntryTest, TransitionTypes) {
       const sync_pb::TabNavigation& sync_data = navigation.ToSyncData();
       const SerializedNavigationEntry& constructed_nav =
           SerializedNavigationEntry::FromSyncData(kIndex, sync_data);
-      const content::PageTransition constructed_transition =
+      const ui::PageTransition constructed_transition =
           constructed_nav.transition_type();
 
       EXPECT_EQ(transition, constructed_transition);