Switch to standard integer types in content/browser/.

content/browser/frame_host/navigation_entry_impl.h

 // Copyright 2013 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_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "content/browser/frame_host/frame_navigation_entry.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/frame_message_enums.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/ssl_status.h"
 
@@ skipping 68 matching lines @@
 #endif
   void SetReferrer(const Referrer& referrer) override;
   const Referrer& GetReferrer() const override;
   void SetVirtualURL(const GURL& url) override;
   const GURL& GetVirtualURL() const override;
   void SetTitle(const base::string16& title) override;
   const base::string16& GetTitle() const override;
   void SetPageState(const PageState& state) override;
   PageState GetPageState() const override;
   void SetPageID(int page_id) override;
-  int32 GetPageID() const override;
+  int32_t GetPageID() const override;
   const base::string16& GetTitleForDisplay(
       const std::string& languages) const override;
   bool IsViewSourceMode() const override;
   void SetTransitionType(ui::PageTransition transition_type) override;
   ui::PageTransition GetTransitionType() const override;
   const GURL& GetUserTypedURL() const override;
   void SetHasPostData(bool has_post_data) override;
   bool GetHasPostData() const override;
-  void SetPostID(int64 post_id) override;
-  int64 GetPostID() const override;
+  void SetPostID(int64_t post_id) override;
+  int64_t GetPostID() const override;
   void SetBrowserInitiatedPostData(const base::RefCountedMemory* data) override;
   const base::RefCountedMemory* GetBrowserInitiatedPostData() const override;
   const FaviconStatus& GetFavicon() const override;
   FaviconStatus& GetFavicon() override;
   const SSLStatus& GetSSL() const override;
   SSLStatus& GetSSL() override;
   void SetOriginalRequestURL(const GURL& original_url) override;
   const GURL& GetOriginalRequestURL() const override;
   void SetIsOverridingUserAgent(bool override) override;
   bool GetIsOverridingUserAgent() const override;
@@ skipping 59 matching lines @@
   }
 
   // Finds the TreeNode associated with |frame_tree_node_id| to add or update
   // its FrameNavigationEntry.  A new FrameNavigationEntry is added if none
   // exists, or else the existing one (which might be shared with other
   // NavigationEntries) is updated with the given parameters.
   // Does nothing if there is no entry already and |url| is about:blank, since
   // that does not count as a real commit.
   void AddOrUpdateFrameEntry(FrameTreeNode* frame_tree_node,
                              const std::string& frame_unique_name,
-                             int64 item_sequence_number,
-                             int64 document_sequence_number,
+                             int64_t item_sequence_number,
+                             int64_t document_sequence_number,
                              SiteInstanceImpl* site_instance,
                              const GURL& url,
                              const Referrer& referrer,
                              const PageState& page_state);
 
   // Returns the FrameNavigationEntry corresponding to |frame_tree_node|, if
   // there is one in this NavigationEntry.
   FrameNavigationEntry* GetFrameEntry(FrameTreeNode* frame_tree_node) const;
 
   // Returns the FrameNavigationEntry corresponding to the frame with the given
@@ skipping 179 matching lines @@
 
   // See the accessors above for descriptions.
   int unique_id_;
   // TODO(creis): Persist bindings_. http://crbug.com/173672.
   int bindings_;
   PageType page_type_;
   GURL virtual_url_;
   bool update_virtual_url_with_url_;
   base::string16 title_;
   FaviconStatus favicon_;
-  int32 page_id_;
+  int32_t page_id_;
   SSLStatus ssl_;
   ui::PageTransition transition_type_;
   GURL user_typed_url_;
   bool has_post_data_;
-  int64 post_id_;
+  int64_t post_id_;
   RestoreType restore_type_;
   GURL original_request_url_;
   bool is_overriding_user_agent_;
   base::Time timestamp_;
   int http_status_code_;
 
   // This member is not persisted with session restore because it is transient.
   // If the post request succeeds, this field is cleared since the same
   // information is stored in |content_state_| above. It is also only shallow
   // copied with compiler provided copy constructor.
@@ skipping 93 matching lines @@
   // persisted, unless specific data is taken out/put back in at save/restore
   // time (see TabNavigation for an example of this).
   std::map<std::string, base::string16> extra_data_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationEntryImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_