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

chrome/browser/sessions/session_types.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_SESSIONS_SESSION_TYPES_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "chrome/browser/sessions/session_id.h"
-#include "content/common/page_transition_types.h"
+#include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 
 class NavigationEntry;
 class Profile;
 
 // TabNavigation  -------------------------------------------------------------
 
 // TabNavigation corresponds to the parts of NavigationEntry needed to restore
 // the NavigationEntry during session restore and tab restore.
 //
 // TabNavigation is cheap and supports copy semantics.
 class TabNavigation {
  public:
   enum TypeMask {
     HAS_POST_DATA = 1
   };
 
   TabNavigation();
   TabNavigation(int index,
                 const GURL& virtual_url,
                 const GURL& referrer,
                 const string16& title,
                 const std::string& state,
-                PageTransition::Type transition);
+                content::PageTransition transition);
   TabNavigation(const TabNavigation& tab);
   ~TabNavigation();
   TabNavigation& operator=(const TabNavigation& tab);
 
   // Converts this TabNavigation into a NavigationEntry with a page id of
   // |page_id|. The caller owns the returned NavigationEntry.
   NavigationEntry* ToNavigationEntry(int page_id, Profile* profile) const;
 
   // Resets this TabNavigation from |entry|.
   void SetFromNavigationEntry(const NavigationEntry& entry);
 
   // Virtual URL of the page. See NavigationEntry::virtual_url() for details.
   void set_virtual_url(const GURL& url) { virtual_url_ = url; }
   const GURL& virtual_url() const { return virtual_url_; }
 
   // The referrer.
   const GURL& referrer() const { return referrer_; }
 
   // The title of the page.
   const string16& title() const { return title_; }
 
   // State bits.
   const std::string& state() const { return state_; }
 
   // Transition type.
-  void set_transition(PageTransition::Type transition) {
+  void set_transition(content::PageTransition transition) {
     transition_ = transition;
   }
-  PageTransition::Type transition() const { return transition_; }
+  content::PageTransition transition() const { return transition_; }
 
   // A mask used for arbitrary boolean values needed to represent a
   // NavigationEntry. Currently only contains HAS_POST_DATA or 0.
   void set_type_mask(int type_mask) { type_mask_ = type_mask; }
   int type_mask() const { return type_mask_; }
 
   // The index in the NavigationController. If this is -1, it means this
   // TabNavigation is bogus.
   //
   // This is used when determining the selected TabNavigation and only useful
   // by BaseSessionService and SessionService.
   void set_index(int index) { index_ = index; }
   int index() const { return index_; }
 
   // Converts a set of TabNavigations into a set of NavigationEntrys. The
   // caller owns the NavigationEntrys.
   static void CreateNavigationEntriesFromTabNavigations(
       Profile* profile,
       const std::vector<TabNavigation>& navigations,
       std::vector<NavigationEntry*>* entries);
 
  private:
   friend class BaseSessionService;
 
   GURL virtual_url_;
   GURL referrer_;
   string16 title_;
   std::string state_;
-  PageTransition::Type transition_;
+  content::PageTransition transition_;
   int type_mask_;
 
   int index_;
 };
 
 // SessionTab ----------------------------------------------------------------
 
 // SessionTab corresponds to a NavigationController.
 struct SessionTab {
   SessionTab();
@@ skipping 80 matching lines @@
   std::vector<SessionTab*> tabs;
 
   // Is the window maximized, minimized, or normal?
   ui::WindowShowState show_state;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SessionWindow);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_