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, 8 insertions, 15 deletions

diff --git a/components/omnibox/DEPS b/components/omnibox/DEPS
index 7163423..c8b3323 100644
--- a/components/omnibox/DEPS
+++ b/components/omnibox/DEPS
@@ -10,10 +10,3 @@ include_rules = [
   "+ui/base",
   "+url",
 ]
-
-specific_include_rules = {
-  "autocomplete_match.\h": [
-    # For content::PageTransition enum. crbug.com/372373
-    "!content/public/common/page_transition_types.h",
-  ],
-}
diff --git a/components/omnibox/autocomplete_match.cc b/components/omnibox/autocomplete_match.cc
index f1c31f2..8a73913 100644
--- a/components/omnibox/autocomplete_match.cc
+++ b/components/omnibox/autocomplete_match.cc
@@ -42,7 +42,7 @@ AutocompleteMatch::AutocompleteMatch()
       typed_count(-1),
       deletable(false),
       allowed_to_be_default_match(false),
-      transition(content::PAGE_TRANSITION_GENERATED),
+      transition(ui::PAGE_TRANSITION_GENERATED),
       is_history_what_you_typed_match(false),
       type(AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED),
       from_previous(false) {
@@ -57,7 +57,7 @@ AutocompleteMatch::AutocompleteMatch(AutocompleteProvider* provider,
       typed_count(-1),
       deletable(deletable),
       allowed_to_be_default_match(false),
-      transition(content::PAGE_TRANSITION_TYPED),
+      transition(ui::PAGE_TRANSITION_TYPED),
       is_history_what_you_typed_match(false),
       type(type),
       from_previous(false) {
@@ -435,7 +435,7 @@ void AutocompleteMatch::GetKeywordUIState(
 
 base::string16 AutocompleteMatch::GetSubstitutingExplicitlyInvokedKeyword(
     TemplateURLService* template_url_service) const {
-  if (transition != content::PAGE_TRANSITION_KEYWORD ||
+  if (transition != ui::PAGE_TRANSITION_KEYWORD ||
       template_url_service == NULL) {
     return base::string16();
   }
diff --git a/components/omnibox/autocomplete_match.h b/components/omnibox/autocomplete_match.h
index 118d939..cb1f6e4 100644
--- a/components/omnibox/autocomplete_match.h
+++ b/components/omnibox/autocomplete_match.h
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "components/omnibox/autocomplete_match_type.h"
 #include "components/search_engines/template_url.h"
-#include "content/public/common/page_transition_types.h"
+#include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
 class AutocompleteProvider;
@@ -324,7 +324,7 @@ struct AutocompleteMatch {
   // The transition type to use when the user opens this match.  By default
   // this is TYPED.  Providers whose matches do not look like URLs should set
   // it to GENERATED.
-  content::PageTransition transition;
+  ui::PageTransition transition;
 
   // True when this match is the "what you typed" match from the history
   // system.
diff --git a/components/omnibox/autocomplete_result.cc b/components/omnibox/autocomplete_result.cc
index 41ab4d0..3548855 100644
--- a/components/omnibox/autocomplete_result.cc
+++ b/components/omnibox/autocomplete_result.cc
@@ -373,7 +373,7 @@ GURL AutocompleteResult::ComputeAlternateNavUrl(
     const AutocompleteMatch& match) {
   return ((input.type() == metrics::OmniboxInputType::UNKNOWN) &&
           (AutocompleteMatch::IsSearchType(match.type)) &&
-          (match.transition != content::PAGE_TRANSITION_KEYWORD) &&
+          (match.transition != ui::PAGE_TRANSITION_KEYWORD) &&
           (input.canonicalized_url() != match.destination_url)) ?
       input.canonicalized_url() : GURL();
 }
diff --git a/components/omnibox/base_search_provider.cc b/components/omnibox/base_search_provider.cc
index dfc26a5..76792e5 100644
--- a/components/omnibox/base_search_provider.cc
+++ b/components/omnibox/base_search_provider.cc
@@ -268,7 +268,7 @@ AutocompleteMatch BaseSearchProvider::CreateSearchSuggestion(
 
   // Search results don't look like URLs.
   match.transition = suggestion.from_keyword_provider() ?
-      content::PAGE_TRANSITION_KEYWORD : content::PAGE_TRANSITION_GENERATED;
+      ui::PAGE_TRANSITION_KEYWORD : ui::PAGE_TRANSITION_GENERATED;
 
   return match;
 }
diff --git a/components/omnibox/keyword_provider.cc b/components/omnibox/keyword_provider.cc
index 8677144..d8754e9 100644
--- a/components/omnibox/keyword_provider.cc
+++ b/components/omnibox/keyword_provider.cc
@@ -403,7 +403,7 @@ AutocompleteMatch KeywordProvider::CreateAutocompleteMatch(
   FillInURLAndContents(remaining_input, template_url, &match);
 
   match.keyword = keyword;
-  match.transition = content::PAGE_TRANSITION_KEYWORD;
+  match.transition = ui::PAGE_TRANSITION_KEYWORD;
 
   return match;
 }