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

chrome/browser/instant/instant_loader.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/instant/instant_loader.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 26 matching lines @@
 #include "content/browser/tab_contents/provisional_load_details.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/common/content_notification_types.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_source.h"
-#include "content/common/page_transition_types.h"
 #include "content/common/renderer_preferences.h"
 #include "net/http/http_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace {
 
 // Number of ms to delay before updating the omnibox bounds. This is only used
 // when the bounds of the omnibox shrinks. If the bounds grows, we update
 // immediately.
@@ skipping 506 matching lines @@
     loader_->CommitInstantLoader();
 }
 
 // InstantLoader ---------------------------------------------------------------
 
 InstantLoader::InstantLoader(InstantLoaderDelegate* delegate, TemplateURLID id)
     : delegate_(delegate),
       template_url_id_(id),
       ready_(false),
       http_status_ok_(true),
-      last_transition_type_(PageTransition::LINK),
+      last_transition_type_(content::PAGE_TRANSITION_LINK),
       verbatim_(false),
       needs_reload_(false) {
 }
 
 InstantLoader::~InstantLoader() {
   registrar_.RemoveAll();
 
   // Delete the TabContents before the delegate as the TabContents holds a
   // reference to the delegate.
   preview_contents_.reset();
 }
 
 bool InstantLoader::Update(TabContentsWrapper* tab_contents,
                            const TemplateURL* template_url,
                            const GURL& url,
-                           PageTransition::Type transition_type,
+                           content::PageTransition transition_type,
                            const string16& user_text,
                            bool verbatim,
                            string16* suggested_text) {
   DCHECK(!url.is_empty() && url.is_valid());
 
   // Strip leading ?.
   string16 new_user_text =
       !user_text.empty() && (UTF16ToWide(user_text)[0] == L'?') ?
       user_text.substr(1) : user_text;
 
@@ skipping 165 matching lines @@
                                         const TemplateURL* template_url) {
   DCHECK(template_url_id_ == template_url->id());
 
   // If we already have a |preview_contents_|, future search queries will be
   // issued into it (see the "if (!created_preview_contents)" block in |Update|
   // above), so there is no need to load the |template_url|'s instant URL.
   if (preview_contents_.get())
     return;
 
   CreatePreviewContents(tab_contents);
-  LoadInstantURL(tab_contents, template_url, PageTransition::GENERATED,
+  LoadInstantURL(tab_contents, template_url, content::PAGE_TRANSITION_GENERATED,
                  string16(), true);
 }
 
 bool InstantLoader::IsNavigationPending() const {
   return preview_contents_.get() &&
       preview_contents_->controller().pending_entry();
 }
 
 void InstantLoader::Observe(int type,
                             const NotificationSource& source,
@@ skipping 230 matching lines @@
           tab_contents->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
   preview_contents_.reset(new TabContentsWrapper(new_contents));
   preview_tab_contents_delegate_.reset(new TabContentsDelegateImpl(this));
   SetupPreviewContents(tab_contents);
 
   preview_contents_->tab_contents()->ShowContents();
 }
 
 void InstantLoader::LoadInstantURL(TabContentsWrapper* tab_contents,
                                    const TemplateURL* template_url,
-                                   PageTransition::Type transition_type,
+                                   content::PageTransition transition_type,
                                    const string16& user_text,
                                    bool verbatim) {
   preview_tab_contents_delegate_->PrepareForNewLoad();
 
   // Load the instant URL. We don't reflect the url we load in url() as
   // callers expect that we're loading the URL they tell us to.
   //
   // This uses an empty string for the replacement text as the url doesn't
   // really have the search params, but we need to use the replace
   // functionality so that embeded tags (like {google:baseURL}) are escaped
   // correctly.
   // TODO(sky): having to use a replaceable url is a bit of a hack here.
   GURL instant_url(template_url->instant_url()->ReplaceSearchTermsUsingProfile(
       tab_contents->profile(), *template_url, string16(), -1, string16()));
   CommandLine* cl = CommandLine::ForCurrentProcess();
   if (cl->HasSwitch(switches::kInstantURL))
     instant_url = GURL(cl->GetSwitchValueASCII(switches::kInstantURL));
   preview_contents_->controller().LoadURL(instant_url, GURL(), transition_type,
                                           std::string());
   RenderViewHost* host = preview_contents_->render_view_host();
   host->Send(new ChromeViewMsg_SearchBoxChange(
       host->routing_id(), user_text, verbatim, 0, 0));
   frame_load_observer_.reset(new FrameLoadObserver(
       this, preview_contents()->tab_contents(), user_text, verbatim));
 }