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

chrome/browser/instant/instant_loader.h

 // 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.
 
 #ifndef CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/timer.h"
 #include "chrome/browser/instant/instant_commit_type.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "chrome/common/instant_types.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
-#include "content/common/page_transition_types.h"
+#include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"
 
 class InstantLoaderDelegate;
 class InstantLoaderManagerTest;
 class TabContents;
 class TabContentsWrapper;
 class TemplateURL;
 
 // InstantLoader does the loading of a particular URL for InstantController.
@@ skipping 14 matching lines @@
 
   InstantLoader(InstantLoaderDelegate* delegate, TemplateURLID id);
   virtual ~InstantLoader();
 
   // Invoked to load a URL. |tab_contents| is the TabContents the preview is
   // going to be shown on top of and potentially replace. Returns true if the
   // arguments differ from the last call to |Update|.
   bool 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);
 
   // Sets the bounds of the omnibox (in screen coordinates). The bounds are
   // remembered until the preview is committed or destroyed. This is only used
   // when showing results for a search provider that supports instant.
   void SetOmniboxBounds(const gfx::Rect& bounds);
 
   // Returns true if the mouse is down as the result of activating the preview
@@ skipping 109 matching lines @@
   // Called to set up the |preview_contents_| based on |tab_contents| when it is
   // created or replaced.
   void SetupPreviewContents(TabContentsWrapper* tab_contents);
 
   // Creates and sets the preview TabContentsWrapper.
   void CreatePreviewContents(TabContentsWrapper* tab_contents);
 
   // Creates and loads the |template_url|'s instant URL.
   void LoadInstantURL(TabContentsWrapper* tab_contents,
                       const TemplateURL* template_url,
-                      PageTransition::Type transition_type,
+                      content::PageTransition transition_type,
                       const string16& user_text,
                       bool verbatim);
 
   InstantLoaderDelegate* delegate_;
 
   // If we're showing instant results this is the ID of the TemplateURL driving
   // the results. A value of 0 means there is no TemplateURL.
   const TemplateURLID template_url_id_;
 
   // The url we're displaying.
@@ skipping 23 matching lines @@
 
   // See description above setter.
   gfx::Rect omnibox_bounds_;
 
   // Last bounds passed to the page.
   gfx::Rect last_omnibox_bounds_;
 
   scoped_ptr<FrameLoadObserver> frame_load_observer_;
 
   // Transition type of the match last passed to Update.
-  PageTransition::Type last_transition_type_;
+  content::PageTransition last_transition_type_;
 
   // Timer used to update the bounds of the omnibox.
   base::OneShotTimer<InstantLoader> update_bounds_timer_;
 
   // Used to get notifications about renderers coming and going.
   NotificationRegistrar registrar_;
 
   // Last value of verbatim passed to |Update|.
   bool verbatim_;
 
   // True if the page needs to be reloaded.
   bool needs_reload_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantLoader);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_