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

chrome/browser/search_engines/template_url_service_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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/test/mock_time_provider.h"
@@ skipping 824 matching lines @@
   };
 
   ChangeModelToLoadState();
   AddKeywordWithDate("x", false, "http://x/foo?q={searchTerms}",
       "http://sugg1", "http://icon1", "UTF-8;UTF-16", "name", false, Time(),
       Time());
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
     history::URLVisitedDetails details;
     details.row = history::URLRow(GURL(data[i].url));
-    details.transition = 0;
+    details.transition = content::PageTransitionFromInt(0);
     model()->UpdateKeywordSearchTermsForURL(details);
     EXPECT_EQ(data[i].term, GetAndClearSearchTerm());
   }
 }
 
 TEST_F(TemplateURLServiceTest, DontUpdateKeywordSearchForNonReplaceable) {
   struct TestData {
     const std::string url;
   } data[] = {
     { "http://foo/" },
     { "http://x/bar?q=xx" },
     { "http://x/foo?y=xx" },
   };
 
   ChangeModelToLoadState();
   AddKeywordWithDate("x", false, "http://x/foo", "http://sugg1",
       "http://icon1", "UTF-8;UTF-16", "name", false, Time(), Time());
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
     history::URLVisitedDetails details;
     details.row = history::URLRow(GURL(data[i].url));
-    details.transition = 0;
+    details.transition = content::PageTransitionFromInt(0);
     model()->UpdateKeywordSearchTermsForURL(details);
     ASSERT_EQ(string16(), GetAndClearSearchTerm());
   }
 }
 
 TEST_F(TemplateURLServiceTest, ChangeGoogleBaseValue) {
   // NOTE: Do not do a VerifyLoad() here as it will load the prepopulate data,
   // which also has a {google:baseURL} keyword in it, which will confuse this
   // test.
   ChangeModelToLoadState();
@@ skipping 48 matching lines @@
       "keyword", false, "http://foo.com/foo?query={searchTerms}",
       "http://sugg1", "http://icon1", "UTF-8;UTF-16", "keyword",
       true, base::Time::Now(), base::Time::Now());
 
   // Add a visit that matches the url of the keyword.
   HistoryService* history =
       profile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
   history->AddPage(
       GURL(t_url->url()->ReplaceSearchTerms(*t_url, ASCIIToUTF16("blah"), 0,
                                             string16())),
-      NULL, 0, GURL(), PageTransition::KEYWORD, history::RedirectList(),
-      history::SOURCE_BROWSED, false);
+      NULL, 0, GURL(), content::PAGE_TRANSITION_KEYWORD,
+      history::RedirectList(), history::SOURCE_BROWSED, false);
 
   // Wait for history to finish processing the request.
   profile()->BlockUntilHistoryProcessesPendingRequests();
 
   // Query history for the generated url.
   CancelableRequestConsumer consumer;
   QueryHistoryCallbackImpl callback;
   history->QueryURL(GURL("http://keyword"), true, &consumer,
       base::Bind(&QueryHistoryCallbackImpl::Callback,
                  base::Unretained(&callback)));
 
   // Wait for the request to be processed.
   profile()->BlockUntilHistoryProcessesPendingRequests();
 
   // And make sure the url and visit were added.
   EXPECT_TRUE(callback.success);
   EXPECT_NE(0, callback.row.id());
   ASSERT_EQ(1U, callback.visits.size());
-  EXPECT_EQ(PageTransition::KEYWORD_GENERATED,
-            PageTransition::StripQualifier(callback.visits[0].transition));
+  EXPECT_EQ(content::PAGE_TRANSITION_KEYWORD_GENERATED,
+      content::PageTransitionStripQualifier(callback.visits[0].transition));
 }
 
 // Make sure that the load routine deletes prepopulated engines that no longer
 // exist in the prepopulate data.
 TEST_F(TemplateURLServiceTest, LoadDeletesUnusedProvider) {
   // Create a preloaded template url. Add it to a loaded model and wait for the
   // saves to finish.
   TemplateURL* t_url = CreatePreloadedTemplateURL();
   ChangeModelToLoadState();
   model()->Add(t_url);
@@ skipping 272 matching lines @@
   model()->SetDefaultSearchProvider(t_url);
   EXPECT_EQ(t_url, model()->GetDefaultSearchProvider());
 
   // Now reset the model again but load it after setting the preferences.
   ResetModel(false);
   SetManagedDefaultSearchPreferences(false, "", "", "", "", "", "");
   VerifyLoad();
   EXPECT_TRUE(model()->is_default_search_managed());
   EXPECT_TRUE(model()->GetDefaultSearchProvider() == NULL);
 }