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

content/public/renderer/navigation_state.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 CONTENT_PUBLIC_RENDERER_NAVIGATION_STATE_H_
 #define CONTENT_PUBLIC_RENDERER_NAVIGATION_STATE_H_
 #pragma once
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
-#include "content/common/page_transition_types.h"
+#include "content/public/common/page_transition_types.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 
 namespace webkit_glue {
 struct PasswordForm;
 class AltErrorPageResourceFetcher;
 }
 
 namespace content {
 
@@ skipping 14 matching lines @@
     LINK_LOAD_CACHE_STALE_OK,  // back/forward or encoding change.
     LINK_LOAD_CACHE_ONLY,      // Allow stale data (avoid doing a re-post)
     kLoadTypeMax               // Bounding value for this enum.
   };
 
   virtual ~NavigationState();
 
   static NavigationState* CreateBrowserInitiated(
       int32 pending_page_id,
       int pending_history_list_offset,
-      PageTransition::Type transition_type,
+      content::PageTransition transition_type,
       base::Time request_time) {
     return new NavigationState(transition_type, request_time, false,
                                pending_page_id,
                                pending_history_list_offset);
   }
 
   static NavigationState* CreateContentInitiated() {
     // We assume navigations initiated by content are link clicks.
-    return new NavigationState(PageTransition::LINK, base::Time(), true, -1,
-                               -1);
+    return new NavigationState(
+        content::PAGE_TRANSITION_LINK, base::Time(), true, -1, -1);
   }
 
   static NavigationState* FromDataSource(WebKit::WebDataSource* ds) {
     return static_cast<NavigationState*>(ds->extraData());
   }
 
   // Contains the page_id for this navigation or -1 if there is none yet.
   int32 pending_page_id() const { return pending_page_id_; }
 
   // If pending_page_id() is not -1, then this contains the corresponding
   // offset of the page in the back/forward history list.
   int pending_history_list_offset() const {
     return pending_history_list_offset_;
   }
 
   // Contains the transition type that the browser specified when it
   // initiated the load.
-  PageTransition::Type transition_type() const { return transition_type_; }
-  void set_transition_type(PageTransition::Type type) {
+  content::PageTransition transition_type() const { return transition_type_; }
+  void set_transition_type(content::PageTransition type) {
     transition_type_ = type;
   }
 
   // Record the nature of this load, for use when histogramming page load times.
   LoadType load_type() const { return load_type_; }
   void set_load_type(LoadType load_type) { load_type_ = load_type; }
 
   // The time that this navigation was requested.
   const base::Time& request_time() const {
     return request_time_;
@@ skipping 168 matching lines @@
   bool was_prefetcher() const { return was_prefetcher_; }
 
   void set_was_referred_by_prefetcher(bool value) {
     was_referred_by_prefetcher_ = value;
   }
   bool was_referred_by_prefetcher() const {
     return was_referred_by_prefetcher_;
   }
 
  private:
-  NavigationState(PageTransition::Type transition_type,
+  NavigationState(content::PageTransition transition_type,
                   const base::Time& request_time,
                   bool is_content_initiated,
                   int32 pending_page_id,
                   int pending_history_list_offset);
 
-  PageTransition::Type transition_type_;
+  content::PageTransition transition_type_;
   LoadType load_type_;
   base::Time request_time_;
   base::Time start_load_time_;
   base::Time commit_load_time_;
   base::Time finish_document_load_time_;
   base::Time finish_load_time_;
   base::Time first_paint_time_;
   base::Time first_paint_after_load_time_;
   bool load_histograms_recorded_;
   bool web_timing_histograms_recorded_;
@@ skipping 24 matching lines @@
   // A prefetcher is a page that contains link rel=prefetch elements.
   bool was_prefetcher_;
   bool was_referred_by_prefetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationState);
 };
 
 #endif  // CONTENT_PUBLIC_RENDERER_NAVIGATION_STATE_H_
 
 }  // namespace content