diff options
| author | avi <avi@chromium.org> | 2015-12-24 17:48:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-25 01:50:00 +0000 |
| commit | 652869c276104ba02e827df6ee9a119c78e121e0 (patch) | |
| tree | 3a5386dadb1e95f20de592f809ed6469e3566316 | |
| parent | 107c2c78e4053ef3bb35f790db72359cb1068ea7 (diff) | |
| download | chromium_src-652869c276104ba02e827df6ee9a119c78e121e0.zip chromium_src-652869c276104ba02e827df6ee9a119c78e121e0.tar.gz chromium_src-652869c276104ba02e827df6ee9a119c78e121e0.tar.bz2 | |
Switch to standard integer types in content/public/.
BUG=138542
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1548073002
Cr-Commit-Position: refs/heads/master@{#366845}
197 files changed, 555 insertions, 353 deletions
diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc index a7dfe022a..3c979be 100644 --- a/content/public/app/content_main_delegate.cc +++ b/content/public/app/content_main_delegate.cc @@ -4,6 +4,8 @@ #include "content/public/app/content_main_delegate.h" +#include "build/build_config.h" + #if !defined(CHROME_MULTIPLE_DLL_CHILD) #include "content/public/browser/content_browser_client.h" #endif diff --git a/content/public/browser/android/compositor_client.h b/content/public/browser/android/compositor_client.h index 86e34ae..05f15a7 100644 --- a/content/public/browser/android/compositor_client.h +++ b/content/public/browser/android/compositor_client.h @@ -5,6 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_ANDROID_COMPOSITOR_CLIENT_H_ #define CONTENT_PUBLIC_BROWSER_ANDROID_COMPOSITOR_CLIENT_H_ +#include "base/macros.h" #include "content/common/content_export.h" namespace content { diff --git a/content/public/browser/android/synchronous_compositor.h b/content/public/browser/android/synchronous_compositor.h index beb652d..e0d09d8 100644 --- a/content/public/browser/android/synchronous_compositor.h +++ b/content/public/browser/android/synchronous_compositor.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_ANDROID_SYNCHRONOUS_COMPOSITOR_H_ #define CONTENT_PUBLIC_BROWSER_ANDROID_SYNCHRONOUS_COMPOSITOR_H_ +#include <stddef.h> + #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "gpu/command_buffer/service/in_process_command_buffer.h" diff --git a/content/public/browser/android/synchronous_compositor_client.h b/content/public/browser/android/synchronous_compositor_client.h index d5fcc80..0fbd2a7 100644 --- a/content/public/browser/android/synchronous_compositor_client.h +++ b/content/public/browser/android/synchronous_compositor_client.h @@ -5,8 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_ANDROID_SYNCHRONOUS_COMPOSITOR_CLIENT_H_ #define CONTENT_PUBLIC_BROWSER_ANDROID_SYNCHRONOUS_COMPOSITOR_CLIENT_H_ -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/time/time.h" #include "ui/gfx/geometry/size_f.h" #include "ui/gfx/geometry/vector2d_f.h" diff --git a/content/public/browser/background_sync_controller.h b/content/public/browser/background_sync_controller.h index 13db94c..475ffd3 100644 --- a/content/public/browser/background_sync_controller.h +++ b/content/public/browser/background_sync_controller.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_BACKGROUND_SYNC_CONTROLLER_H_ #define CONTENT_PUBLIC_BROWSER_BACKGROUND_SYNC_CONTROLLER_H_ +#include <stdint.h> + #include "content/common/content_export.h" #include "url/gurl.h" diff --git a/content/public/browser/browser_context.h b/content/public/browser/browser_context.h index cff0985..9897d4d 100644 --- a/content/public/browser/browser_context.h +++ b/content/public/browser/browser_context.h @@ -5,6 +5,9 @@ #ifndef CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_ #define CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/callback_forward.h" #include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" @@ -104,7 +107,7 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData { static void DeliverPushMessage( BrowserContext* browser_context, const GURL& origin, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const std::string& data, const base::Callback<void(PushDeliveryStatus)>& callback); diff --git a/content/public/browser/browser_main_parts.h b/content/public/browser/browser_main_parts.h index d976253..25dcaec 100644 --- a/content/public/browser/browser_main_parts.h +++ b/content/public/browser/browser_main_parts.h @@ -5,7 +5,6 @@ #ifndef CONTENT_PUBLIC_BROWSER_BROWSER_MAIN_PARTS_H_ #define CONTENT_PUBLIC_BROWSER_BROWSER_MAIN_PARTS_H_ -#include "base/basictypes.h" #include "content/common/content_export.h" namespace content { diff --git a/content/public/browser/browser_main_runner.h b/content/public/browser/browser_main_runner.h index 9eb6afb..ee8bc42 100644 --- a/content/public/browser/browser_main_runner.h +++ b/content/public/browser/browser_main_runner.h @@ -5,7 +5,6 @@ #ifndef CONTENT_PUBLIC_BROWSER_BROWSER_MAIN_RUNNER_H_ #define CONTENT_PUBLIC_BROWSER_BROWSER_MAIN_RUNNER_H_ -#include "base/basictypes.h" #include "content/common/content_export.h" namespace content { diff --git a/content/public/browser/browser_message_filter.cc b/content/public/browser/browser_message_filter.cc index 9b4cbd1..b2482cd 100644 --- a/content/public/browser/browser_message_filter.cc +++ b/content/public/browser/browser_message_filter.cc @@ -8,8 +8,10 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/process/process_handle.h" #include "base/task_runner.h" +#include "build/build_config.h" #include "content/browser/browser_child_process_host_impl.h" #include "content/public/browser/user_metrics.h" #include "content/public/common/content_switches.h" @@ -45,7 +47,7 @@ class BrowserMessageFilter::Internal : public IPC::MessageFilter { filter_->OnChannelClosing(); } - void OnChannelConnected(int32 peer_pid) override { + void OnChannelConnected(int32_t peer_pid) override { filter_->peer_process_ = base::Process::OpenWithExtraPrivileges(peer_pid); filter_->OnChannelConnected(peer_pid); } @@ -80,7 +82,7 @@ class BrowserMessageFilter::Internal : public IPC::MessageFilter { } bool GetSupportedMessageClasses( - std::vector<uint32>* supported_message_classes) const override { + std::vector<uint32_t>* supported_message_classes) const override { supported_message_classes->assign( filter_->message_classes_to_filter().begin(), filter_->message_classes_to_filter().end()); @@ -100,13 +102,13 @@ class BrowserMessageFilter::Internal : public IPC::MessageFilter { DISALLOW_COPY_AND_ASSIGN(Internal); }; -BrowserMessageFilter::BrowserMessageFilter(uint32 message_class_to_filter) +BrowserMessageFilter::BrowserMessageFilter(uint32_t message_class_to_filter) : internal_(nullptr), sender_(nullptr), message_classes_to_filter_(1, message_class_to_filter) {} BrowserMessageFilter::BrowserMessageFilter( - const uint32* message_classes_to_filter, + const uint32_t* message_classes_to_filter, size_t num_message_classes_to_filter) : internal_(nullptr), sender_(nullptr), diff --git a/content/public/browser/browser_message_filter.h b/content/public/browser/browser_message_filter.h index 183ccba..9092ecf 100644 --- a/content/public/browser/browser_message_filter.h +++ b/content/public/browser/browser_message_filter.h @@ -5,8 +5,12 @@ #ifndef CONTENT_PUBLIC_BROWSER_BROWSER_MESSAGE_FILTER_H_ #define CONTENT_PUBLIC_BROWSER_BROWSER_MESSAGE_FILTER_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "base/process/process.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/browser/browser_thread.h" #include "ipc/ipc_channel_proxy.h" @@ -33,8 +37,8 @@ class CONTENT_EXPORT BrowserMessageFilter BrowserMessageFilter, BrowserMessageFilterTraits>, public IPC::Sender { public: - explicit BrowserMessageFilter(uint32 message_class_to_filter); - BrowserMessageFilter(const uint32* message_classes_to_filter, + explicit BrowserMessageFilter(uint32_t message_class_to_filter); + BrowserMessageFilter(const uint32_t* message_classes_to_filter, size_t num_message_classes_to_filter); // These match the corresponding IPC::MessageFilter methods and are always @@ -42,7 +46,7 @@ class CONTENT_EXPORT BrowserMessageFilter virtual void OnFilterAdded(IPC::Sender* sender) {} virtual void OnFilterRemoved() {} virtual void OnChannelClosing() {} - virtual void OnChannelConnected(int32 peer_pid) {} + virtual void OnChannelConnected(int32_t peer_pid) {} // Called when the message filter is about to be deleted. This gives // derived classes the option of controlling which thread they're deleted @@ -97,7 +101,7 @@ class CONTENT_EXPORT BrowserMessageFilter // error details to UMA, so use the bad_message.h for your module instead. virtual void ShutdownForBadMessage(); - const std::vector<uint32>& message_classes_to_filter() const { + const std::vector<uint32_t>& message_classes_to_filter() const { return message_classes_to_filter_; } @@ -127,7 +131,7 @@ class CONTENT_EXPORT BrowserMessageFilter IPC::Sender* sender_; base::Process peer_process_; - std::vector<uint32> message_classes_to_filter_; + std::vector<uint32_t> message_classes_to_filter_; }; struct BrowserMessageFilterTraits { diff --git a/content/public/browser/browser_thread.h b/content/public/browser/browser_thread.h index a68903d..1a451ad 100644 --- a/content/public/browser/browser_thread.h +++ b/content/public/browser/browser_thread.h @@ -7,10 +7,10 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/task_runner_util.h" #include "base/time/time.h" diff --git a/content/public/browser/cache_storage_usage_info.h b/content/public/browser/cache_storage_usage_info.h index de457e0..b6680e0 100644 --- a/content/public/browser/cache_storage_usage_info.h +++ b/content/public/browser/cache_storage_usage_info.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_CACHE_STORAGE_USAGE_INFO_H_ #define CONTENT_PUBLIC_BROWSER_CACHE_STORAGE_USAGE_INFO_H_ +#include <stdint.h> + #include "base/time/time.h" #include "content/common/content_export.h" #include "url/gurl.h" @@ -14,7 +16,7 @@ namespace content { // Used to report per-origin storage info for Cache Storage API usage. struct CONTENT_EXPORT CacheStorageUsageInfo { CacheStorageUsageInfo(const GURL& origin, - int64 total_size_bytes, + int64_t total_size_bytes, const base::Time& last_modified) : origin(origin), total_size_bytes(total_size_bytes), @@ -24,7 +26,7 @@ struct CONTENT_EXPORT CacheStorageUsageInfo { GURL origin; // The total size, including resources, in bytes. - int64 total_size_bytes; + int64_t total_size_bytes; // Last modification time of the data for this origin. base::Time last_modified; diff --git a/content/public/browser/child_process_security_policy.h b/content/public/browser/child_process_security_policy.h index c1e6bb5..9a2becf 100644 --- a/content/public/browser/child_process_security_policy.h +++ b/content/public/browser/child_process_security_policy.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "content/common/content_export.h" #include "url/gurl.h" #include "url/origin.h" diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc index 9e80301..8b2de9b 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -5,6 +5,7 @@ #include "content/public/browser/content_browser_client.h" #include "base/files/file_path.h" +#include "build/build_config.h" #include "content/public/browser/client_certificate_delegate.h" #include "content/public/common/sandbox_type.h" #include "media/base/cdm_factory.h" diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index 0f80710..0cf8938 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ +#include <stddef.h> + #include <map> #include <string> #include <utility> @@ -15,6 +17,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/values.h" +#include "build/build_config.h" #include "content/public/browser/certificate_request_result_type.h" #include "content/public/browser/navigation_throttle.h" #include "content/public/common/content_client.h" diff --git a/content/public/browser/desktop_media_id.cc b/content/public/browser/desktop_media_id.cc index 1ec49b7..523c61d 100644 --- a/content/public/browser/desktop_media_id.cc +++ b/content/public/browser/desktop_media_id.cc @@ -4,9 +4,12 @@ #include "content/public/browser/desktop_media_id.h" +#include <stdint.h> + #include <vector> #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" @@ -115,14 +118,14 @@ DesktopMediaID DesktopMediaID::Parse(const std::string& str) { return DesktopMediaID(); } - int64 id; + int64_t id; if (!base::StringToInt64(parts[1], &id)) return DesktopMediaID(); DesktopMediaID media_id(type, id); #if defined(USE_AURA) - int64 aura_id; + int64_t aura_id; if (!base::StringToInt64(parts[2], &aura_id)) return DesktopMediaID(); media_id.aura_id = aura_id; diff --git a/content/public/browser/desktop_media_id.h b/content/public/browser/desktop_media_id.h index 921dc95..3f2971e 100644 --- a/content/public/browser/desktop_media_id.h +++ b/content/public/browser/desktop_media_id.h @@ -8,7 +8,6 @@ #include <string> #include <tuple> -#include "base/basictypes.h" #include "content/common/content_export.h" #if defined(USE_AURA) diff --git a/content/public/browser/devtools_agent_host.h b/content/public/browser/devtools_agent_host.h index 164fae5..7473ef3d 100644 --- a/content/public/browser/devtools_agent_host.h +++ b/content/public/browser/devtools_agent_host.h @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/content/public/browser/devtools_agent_host_client.h b/content/public/browser/devtools_agent_host_client.h index 90d7a73..be5d337 100644 --- a/content/public/browser/devtools_agent_host_client.h +++ b/content/public/browser/devtools_agent_host_client.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "content/common/content_export.h" namespace content { diff --git a/content/public/browser/download_destination_observer.h b/content/public/browser/download_destination_observer.h index dbe6cce..b7b5e62 100644 --- a/content/public/browser/download_destination_observer.h +++ b/content/public/browser/download_destination_observer.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_DOWNLOAD_DESTINATION_OBSERVER_H_ #define CONTENT_PUBLIC_BROWSER_DOWNLOAD_DESTINATION_OBSERVER_H_ +#include <stdint.h> + #include <string> #include "content/public/browser/download_interrupt_reasons.h" @@ -23,8 +25,8 @@ namespace content { // Note that this interface does not deal with cross-thread lifetime issues. class DownloadDestinationObserver { public: - virtual void DestinationUpdate(int64 bytes_so_far, - int64 bytes_per_sec, + virtual void DestinationUpdate(int64_t bytes_so_far, + int64_t bytes_per_sec, const std::string& hash_state) = 0; virtual void DestinationError(DownloadInterruptReason reason) = 0; diff --git a/content/public/browser/download_item.h b/content/public/browser/download_item.h index ed6cd3e..d3a7798 100644 --- a/content/public/browser/download_item.h +++ b/content/public/browser/download_item.h @@ -17,6 +17,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_DOWNLOAD_ITEM_H_ #define CONTENT_PUBLIC_BROWSER_DOWNLOAD_ITEM_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> @@ -78,7 +80,7 @@ class CONTENT_EXPORT DownloadItem : public base::SupportsUserData { // Callback used with AcquireFileAndDeleteDownload(). typedef base::Callback<void(const base::FilePath&)> AcquireFileCallback; - static const uint32 kInvalidId; + static const uint32_t kInvalidId; static const char kEmptyFileHash[]; @@ -152,7 +154,7 @@ class CONTENT_EXPORT DownloadItem : public base::SupportsUserData { // State accessors ----------------------------------------------------------- - virtual uint32 GetId() const = 0; + virtual uint32_t GetId() const = 0; virtual DownloadState GetState() const = 0; // Returns the most recent interrupt reason for this download. Returns @@ -266,7 +268,7 @@ class CONTENT_EXPORT DownloadItem : public base::SupportsUserData { virtual bool TimeRemaining(base::TimeDelta* remaining) const = 0; // Simple speed estimate in bytes/s - virtual int64 CurrentSpeed() const = 0; + virtual int64_t CurrentSpeed() const = 0; // Rough percent complete, -1 means we don't know (== we didn't receive a // total size). @@ -275,8 +277,8 @@ class CONTENT_EXPORT DownloadItem : public base::SupportsUserData { // Returns true if this download has saved all of its data. virtual bool AllDataSaved() const = 0; - virtual int64 GetTotalBytes() const = 0; - virtual int64 GetReceivedBytes() const = 0; + virtual int64_t GetTotalBytes() const = 0; + virtual int64_t GetReceivedBytes() const = 0; virtual base::Time GetStartTime() const = 0; virtual base::Time GetEndTime() const = 0; diff --git a/content/public/browser/download_manager.h b/content/public/browser/download_manager.h index de30a20..ca367eb 100644 --- a/content/public/browser/download_manager.h +++ b/content/public/browser/download_manager.h @@ -27,10 +27,11 @@ #ifndef CONTENT_PUBLIC_BROWSER_DOWNLOAD_MANAGER_H_ #define CONTENT_PUBLIC_BROWSER_DOWNLOAD_MANAGER_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/files/file_path.h" #include "base/sequenced_task_runner_helpers.h" @@ -146,7 +147,7 @@ class CONTENT_EXPORT DownloadManager : public base::SupportsUserData::Data { // Called by the embedder, after creating the download manager, to let it know // about downloads from previous runs of the browser. virtual DownloadItem* CreateDownloadItem( - uint32 id, + uint32_t id, const base::FilePath& current_path, const base::FilePath& target_path, const std::vector<GURL>& url_chain, @@ -157,8 +158,8 @@ class CONTENT_EXPORT DownloadManager : public base::SupportsUserData::Data { const base::Time& end_time, const std::string& etag, const std::string& last_modified, - int64 received_bytes, - int64 total_bytes, + int64_t received_bytes, + int64_t total_bytes, DownloadItem::DownloadState state, DownloadDangerType danger_type, DownloadInterruptReason interrupt_reason, @@ -184,7 +185,7 @@ class CONTENT_EXPORT DownloadManager : public base::SupportsUserData::Data { // Get the download item for |id| if present, no matter what type of download // it is or state it's in. - virtual DownloadItem* GetDownload(uint32 id) = 0; + virtual DownloadItem* GetDownload(uint32_t id) = 0; }; } // namespace content diff --git a/content/public/browser/download_manager_delegate.h b/content/public/browser/download_manager_delegate.h index 89be2df..13b39572 100644 --- a/content/public/browser/download_manager_delegate.h +++ b/content/public/browser/download_manager_delegate.h @@ -5,7 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_DOWNLOAD_MANAGER_DELEGATE_H_ #define CONTENT_PUBLIC_BROWSER_DOWNLOAD_MANAGER_DELEGATE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/callback.h" #include "base/files/file_path.h" #include "base/logging.h" @@ -51,7 +52,7 @@ typedef base::Callback<void(bool)> DownloadOpenDelayedCallback; // Called with the result of CheckForFileExistence(). typedef base::Callback<void(bool result)> CheckForFileExistenceCallback; -typedef base::Callback<void(uint32)> DownloadIdCallback; +typedef base::Callback<void(uint32_t)> DownloadIdCallback; // Browser's download manager: manages all downloads and destination view. class CONTENT_EXPORT DownloadManagerDelegate { diff --git a/content/public/browser/download_save_info.h b/content/public/browser/download_save_info.h index 0912461..231783d 100644 --- a/content/public/browser/download_save_info.h +++ b/content/public/browser/download_save_info.h @@ -5,8 +5,11 @@ #ifndef CONTENT_PUBLIC_BROWSER_DOWNLOAD_SAVE_INFO_H_ #define CONTENT_PUBLIC_BROWSER_DOWNLOAD_SAVE_INFO_H_ +#include <stdint.h> + #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "content/common/content_export.h" namespace content { @@ -32,7 +35,7 @@ struct CONTENT_EXPORT DownloadSaveInfo { base::File file; // The file offset at which to start the download. May be 0. - int64 offset; + int64_t offset; // The state of the hash at the start of the download. May be empty. std::string hash_state; diff --git a/content/public/browser/download_url_parameters.h b/content/public/browser/download_url_parameters.h index bd7af54..d9c0039 100644 --- a/content/public/browser/download_url_parameters.h +++ b/content/public/browser/download_url_parameters.h @@ -5,11 +5,13 @@ #ifndef CONTENT_PUBLIC_BROWSER_DOWNLOAD_URL_PARAMETERS_H_ #define CONTENT_PUBLIC_BROWSER_DOWNLOAD_URL_PARAMETERS_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/download_interrupt_reasons.h" #include "content/public/browser/download_save_info.h" @@ -84,7 +86,7 @@ class CONTENT_EXPORT DownloadUrlParameters { void set_prefer_cache(bool prefer_cache) { prefer_cache_ = prefer_cache; } - void set_post_id(int64 post_id) { post_id_ = post_id; } + void set_post_id(int64_t post_id) { post_id_ = post_id; } void set_callback(const OnStartedCallback& callback) { callback_ = callback; } @@ -94,7 +96,7 @@ class CONTENT_EXPORT DownloadUrlParameters { void set_suggested_name(const base::string16& suggested_name) { save_info_.suggested_name = suggested_name; } - void set_offset(int64 offset) { save_info_.offset = offset; } + void set_offset(int64_t offset) { save_info_.offset = offset; } void set_hash_state(const std::string& hash_state) { save_info_.hash_state = hash_state; } @@ -112,7 +114,7 @@ class CONTENT_EXPORT DownloadUrlParameters { const std::string& etag() const { return etag_; } const std::string& method() const { return method_; } const std::string& post_body() const { return post_body_; } - int64 post_id() const { return post_id_; } + int64_t post_id() const { return post_id_; } bool prefer_cache() const { return prefer_cache_; } const Referrer& referrer() const { return referrer_; } const std::string& referrer_encoding() const { return referrer_encoding_; } @@ -136,7 +138,7 @@ class CONTENT_EXPORT DownloadUrlParameters { const base::string16& suggested_name() const { return save_info_.suggested_name; } - int64 offset() const { return save_info_.offset; } + int64_t offset() const { return save_info_.offset; } const std::string& hash_state() const { return save_info_.hash_state; } bool prompt() const { return save_info_.prompt_for_save_location; } const GURL& url() const { return url_; } @@ -154,7 +156,7 @@ class CONTENT_EXPORT DownloadUrlParameters { std::string etag_; std::string method_; std::string post_body_; - int64 post_id_; + int64_t post_id_; bool prefer_cache_; Referrer referrer_; std::string referrer_encoding_; diff --git a/content/public/browser/file_descriptor_info.h b/content/public/browser/file_descriptor_info.h index 76c546e..255ac2c 100644 --- a/content/public/browser/file_descriptor_info.h +++ b/content/public/browser/file_descriptor_info.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_FILE_DESCRIPTOR_INFO_H_ #define CONTENT_PUBLIC_BROWSER_FILE_DESCRIPTOR_INFO_H_ +#include <stddef.h> + #include "base/files/file.h" #include "base/process/launch.h" diff --git a/content/public/browser/histogram_fetcher.h b/content/public/browser/histogram_fetcher.h index 1cec991..3b03344 100644 --- a/content/public/browser/histogram_fetcher.h +++ b/content/public/browser/histogram_fetcher.h @@ -5,7 +5,6 @@ #ifndef CONTENT_PUBLIC_BROWSER_HISTOGRAM_FETCHER_H_ #define CONTENT_PUBLIC_BROWSER_HISTOGRAM_FETCHER_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/time/time.h" #include "content/common/content_export.h" diff --git a/content/public/browser/host_zoom_map.h b/content/public/browser/host_zoom_map.h index a4aca1d..22ab44a 100644 --- a/content/public/browser/host_zoom_map.h +++ b/content/public/browser/host_zoom_map.h @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/callback_list.h" #include "content/common/content_export.h" diff --git a/content/public/browser/indexed_db_context.h b/content/public/browser/indexed_db_context.h index 136c30c..2bd0112 100644 --- a/content/public/browser/indexed_db_context.h +++ b/content/public/browser/indexed_db_context.h @@ -5,10 +5,11 @@ #ifndef CONTENT_PUBLIC_BROWSER_INDEXED_DB_CONTEXT_H_ #define CONTENT_PUBLIC_BROWSER_INDEXED_DB_CONTEXT_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" @@ -29,7 +30,7 @@ class IndexedDBContext : public base::RefCountedThreadSafe<IndexedDBContext> { // Methods used in response to QuotaManager requests. virtual std::vector<IndexedDBInfo> GetAllOriginsInfo() = 0; - virtual int64 GetOriginDiskUsage(const GURL& origin_url) = 0; + virtual int64_t GetOriginDiskUsage(const GURL& origin_url) = 0; // Deletes all indexed db files for the given origin. virtual void DeleteForOrigin(const GURL& origin_url) = 0; diff --git a/content/public/browser/indexed_db_info.h b/content/public/browser/indexed_db_info.h index c40b323..fbc7ad89 100644 --- a/content/public/browser/indexed_db_info.h +++ b/content/public/browser/indexed_db_info.h @@ -5,6 +5,9 @@ #ifndef CONTENT_PUBLIC_BROWSER_INDEXED_DB_INFO_H_ #define CONTENT_PUBLIC_BROWSER_INDEXED_DB_INFO_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/files/file_path.h" #include "base/time/time.h" #include "content/common/content_export.h" @@ -14,7 +17,7 @@ namespace content { struct CONTENT_EXPORT IndexedDBInfo { IndexedDBInfo(const GURL& origin, - int64 size, + int64_t size, const base::Time& last_modified, size_t connection_count) : origin(origin), @@ -23,7 +26,7 @@ struct CONTENT_EXPORT IndexedDBInfo { connection_count(connection_count) {} GURL origin; - int64 size; + int64_t size; base::Time last_modified; size_t connection_count; }; diff --git a/content/public/browser/load_from_memory_cache_details.h b/content/public/browser/load_from_memory_cache_details.h index dfd1740..38cf66f 100644 --- a/content/public/browser/load_from_memory_cache_details.h +++ b/content/public/browser/load_from_memory_cache_details.h @@ -6,7 +6,6 @@ #define CONTENT_PUBLIC_BROWSER_LOAD_FROM_MEMORY_CACHE_DETAILS_H_ #include <string> -#include "base/basictypes.h" #include "content/public/common/resource_type.h" #include "net/cert/cert_status_flags.h" #include "url/gurl.h" diff --git a/content/public/browser/local_storage_usage_info.h b/content/public/browser/local_storage_usage_info.h index 1eff1b9..4b56501 100644 --- a/content/public/browser/local_storage_usage_info.h +++ b/content/public/browser/local_storage_usage_info.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_LOCAL_STORAGE_USAGE_INFO_H_ #define CONTENT_PUBLIC_BROWSER_LOCAL_STORAGE_USAGE_INFO_H_ +#include <stddef.h> + #include "base/time/time.h" #include "content/common/content_export.h" #include "url/gurl.h" diff --git a/content/public/browser/message_port_provider.h b/content/public/browser/message_port_provider.h index cf82ec7..95e4fe6 100644 --- a/content/public/browser/message_port_provider.h +++ b/content/public/browser/message_port_provider.h @@ -7,7 +7,6 @@ #include <vector> -#include "base/basictypes.h" #include "base/macros.h" #include "base/strings/string16.h" #include "content/common/content_export.h" diff --git a/content/public/browser/native_web_keyboard_event.h b/content/public/browser/native_web_keyboard_event.h index cf19bcb..fabb2fe 100644 --- a/content/public/browser/native_web_keyboard_event.h +++ b/content/public/browser/native_web_keyboard_event.h @@ -5,7 +5,6 @@ #ifndef CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_ #define CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/strings/string16.h" #include "build/build_config.h" diff --git a/content/public/browser/navigation_controller.cc b/content/public/browser/navigation_controller.cc index 6287fe5..f8ab05f 100644 --- a/content/public/browser/navigation_controller.cc +++ b/content/public/browser/navigation_controller.cc @@ -5,6 +5,7 @@ #include "content/public/browser/navigation_controller.h" #include "base/memory/ref_counted_memory.h" +#include "build/build_config.h" namespace content { diff --git a/content/public/browser/navigation_controller.h b/content/public/browser/navigation_controller.h index 4be76e7..78d18df 100644 --- a/content/public/browser/navigation_controller.h +++ b/content/public/browser/navigation_controller.h @@ -5,12 +5,15 @@ #ifndef CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ #define CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> #include "base/memory/ref_counted.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/browser/global_request_id.h" #include "content/public/browser/session_storage_namespace.h" @@ -190,7 +193,7 @@ class NavigationController { // On Android, for a load triggered by an intent, the time Chrome received // the original intent that prompted the load (in milliseconds active time // since boot). - int64 intent_received_timestamp; + int64_t intent_received_timestamp; // When Chrome launches the intent chooser, user can select Chrome itself to // open the intent. In this case, we should carry over the user gesture. @@ -407,11 +410,11 @@ class NavigationController { // Sets the max restored page ID this NavigationController has seen, if it // was restored from a previous session. - virtual void SetMaxRestoredPageID(int32 max_id) = 0; + virtual void SetMaxRestoredPageID(int32_t max_id) = 0; // Returns the largest restored page ID seen in this navigation controller, // if it was restored from a previous session. (-1 otherwise) - virtual int32 GetMaxRestoredPageID() const = 0; + virtual int32_t GetMaxRestoredPageID() const = 0; // Returns true if a reload happens when activated (SetActive(true) is // invoked). This is true for session/tab restore, cloned tabs and tabs that diff --git a/content/public/browser/navigation_entry.h b/content/public/browser/navigation_entry.h index af9d548..008b15163 100644 --- a/content/public/browser/navigation_entry.h +++ b/content/public/browser/navigation_entry.h @@ -5,12 +5,15 @@ #ifndef CONTENT_PUBLIC_BROWSER_NAVIGATION_ENTRY_H_ #define CONTENT_PUBLIC_BROWSER_NAVIGATION_ENTRY_H_ +#include <stdint.h> + #include <string> #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/time/time.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/common/page_type.h" #include "content/public/common/referrer.h" @@ -101,7 +104,7 @@ class NavigationEntry { // renderer generated for the page and is how we can tell new versus // renavigations. virtual void SetPageID(int page_id) = 0; - virtual int32 GetPageID() const = 0; + virtual int32_t GetPageID() const = 0; // Page-related helpers ------------------------------------------------------ @@ -146,8 +149,8 @@ class NavigationEntry { virtual bool GetHasPostData() const = 0; // The Post identifier associated with the page. - virtual void SetPostID(int64 post_id) = 0; - virtual int64 GetPostID() const = 0; + virtual void SetPostID(int64_t post_id) = 0; + virtual int64_t GetPostID() const = 0; // Holds the raw post data of a browser initiated post request. // For efficiency, this should be cleared when content_state is populated diff --git a/content/public/browser/notification_details.h b/content/public/browser/notification_details.h index 235586a..6d71721 100644 --- a/content/public/browser/notification_details.h +++ b/content/public/browser/notification_details.h @@ -8,7 +8,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_NOTIFICATION_DETAILS_H_ #define CONTENT_PUBLIC_BROWSER_NOTIFICATION_DETAILS_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "content/common/content_export.h" namespace content { diff --git a/content/public/browser/notification_registrar.cc b/content/public/browser/notification_registrar.cc index af82710..21a2167 100644 --- a/content/public/browser/notification_registrar.cc +++ b/content/public/browser/notification_registrar.cc @@ -4,6 +4,8 @@ #include "content/public/browser/notification_registrar.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h" diff --git a/content/public/browser/notification_registrar.h b/content/public/browser/notification_registrar.h index 89d8795..9097f8f 100644 --- a/content/public/browser/notification_registrar.h +++ b/content/public/browser/notification_registrar.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/threading/non_thread_safe.h" #include "content/common/content_export.h" diff --git a/content/public/browser/notification_source.h b/content/public/browser/notification_source.h index 954b03c..60c216c 100644 --- a/content/public/browser/notification_source.h +++ b/content/public/browser/notification_source.h @@ -8,7 +8,6 @@ #ifndef CONTENT_PUBLIC_BROWSER_NOTIFICATION_SOURCE_H_ #define CONTENT_PUBLIC_BROWSER_NOTIFICATION_SOURCE_H_ -#include "base/basictypes.h" #include "content/common/content_export.h" namespace content { diff --git a/content/public/browser/overscroll_configuration.h b/content/public/browser/overscroll_configuration.h index 2d4c6df5..bb26529 100644 --- a/content/public/browser/overscroll_configuration.h +++ b/content/public/browser/overscroll_configuration.h @@ -5,7 +5,6 @@ #ifndef CONTENT_PUBLIC_BROWSER_OVERSCROLL_CONFIGURATION_H_ #define CONTENT_PUBLIC_BROWSER_OVERSCROLL_CONFIGURATION_H_ -#include "base/basictypes.h" #include "content/common/content_export.h" namespace content { diff --git a/content/public/browser/plugin_service.h b/content/public/browser/plugin_service.h index 0fb20e9..3fa7623 100644 --- a/content/public/browser/plugin_service.h +++ b/content/public/browser/plugin_service.h @@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "content/common/content_export.h" class GURL; diff --git a/content/public/browser/power_save_blocker.h b/content/public/browser/power_save_blocker.h index 813c878..5f0f628 100644 --- a/content/public/browser/power_save_blocker.h +++ b/content/public/browser/power_save_blocker.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" diff --git a/content/public/browser/presentation_session_message.h b/content/public/browser/presentation_session_message.h index d3192c0..788b136 100644 --- a/content/public/browser/presentation_session_message.h +++ b/content/public/browser/presentation_session_message.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_PRESENTATION_SESSION_MESSAGE_H_ #define CONTENT_PUBLIC_BROWSER_PRESENTATION_SESSION_MESSAGE_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/content/public/browser/push_messaging_service.cc b/content/public/browser/push_messaging_service.cc index a1918ac..b345f9d 100644 --- a/content/public/browser/push_messaging_service.cc +++ b/content/public/browser/push_messaging_service.cc @@ -46,7 +46,7 @@ void CallClosureFromIO(const base::Closure& callback, void GetUserDataOnIO( scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_wrapper, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const std::string& key, const PushMessagingService::StringCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -57,7 +57,8 @@ void GetUserDataOnIO( void SetNotificationsShownOnIO( scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_wrapper, - int64 service_worker_registration_id, const GURL& origin, + int64_t service_worker_registration_id, + const GURL& origin, const std::string& data, const PushMessagingService::ResultCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -69,7 +70,7 @@ void SetNotificationsShownOnIO( void ClearPushSubscriptionIDOnIO( scoped_refptr<ServiceWorkerContextWrapper> service_worker_context, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const base::Closure& callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -93,7 +94,7 @@ scoped_refptr<ServiceWorkerContextWrapper> GetServiceWorkerContext( // static void PushMessagingService::GetNotificationsShownByLastFewPushes( ServiceWorkerContext* service_worker_context, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const StringCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); scoped_refptr<ServiceWorkerContextWrapper> wrapper = @@ -109,7 +110,7 @@ void PushMessagingService::GetNotificationsShownByLastFewPushes( // static void PushMessagingService::SetNotificationsShownByLastFewPushes( ServiceWorkerContext* service_worker_context, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const GURL& origin, const std::string& notifications_shown, const ResultCallback& callback) { @@ -128,7 +129,7 @@ void PushMessagingService::SetNotificationsShownByLastFewPushes( // static void PushMessagingService::GetSenderId(BrowserContext* browser_context, const GURL& origin, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const StringCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); BrowserThread::PostTask( @@ -145,7 +146,7 @@ void PushMessagingService::GetSenderId(BrowserContext* browser_context, void PushMessagingService::ClearPushSubscriptionID( BrowserContext* browser_context, const GURL& origin, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const base::Closure& callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); BrowserThread::PostTask( diff --git a/content/public/browser/render_frame_host.h b/content/public/browser/render_frame_host.h index 0fcb180..a5c0424 100644 --- a/content/public/browser/render_frame_host.h +++ b/content/public/browser/render_frame_host.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback_forward.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/common/console_message_level.h" #include "ipc/ipc_listener.h" diff --git a/content/public/browser/render_process_host.h b/content/public/browser/render_process_host.h index 77f817b..96f6dd5 100644 --- a/content/public/browser/render_process_host.h +++ b/content/public/browser/render_process_host.h @@ -5,9 +5,11 @@ #ifndef CONTENT_PUBLIC_BROWSER_RENDER_PROCESS_HOST_H_ #define CONTENT_PUBLIC_BROWSER_RENDER_PROCESS_HOST_H_ +#include <stddef.h> +#include <stdint.h> + #include <list> -#include "base/basictypes.h" #include "base/id_map.h" #include "base/process/kill.h" #include "base/process/process_handle.h" @@ -78,8 +80,8 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::Sender, // Used for refcounting, each holder of this object must AddRoute and // RemoveRoute. This object should be allocated on the heap; when no // listeners own it any more, it will delete itself. - virtual void AddRoute(int32 routing_id, IPC::Listener* listener) = 0; - virtual void RemoveRoute(int32 routing_id) = 0; + virtual void AddRoute(int32_t routing_id, IPC::Listener* listener) = 0; + virtual void RemoveRoute(int32_t routing_id) = 0; // Add and remove observers for lifecycle events. The order in which // notifications are sent to observers is undefined. Observers must be sure to @@ -233,7 +235,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::Sender, virtual void SetWebRtcLogMessageCallback( base::Callback<void(const std::string&)> callback) = 0; - typedef base::Callback<void(scoped_ptr<uint8[]> packet_header, + typedef base::Callback<void(scoped_ptr<uint8_t[]> packet_header, size_t header_length, size_t packet_length, bool incoming)> WebRtcRtpPacketCallback; diff --git a/content/public/browser/render_process_host_factory.h b/content/public/browser/render_process_host_factory.h index aeec359..ea359dd 100644 --- a/content/public/browser/render_process_host_factory.h +++ b/content/public/browser/render_process_host_factory.h @@ -5,7 +5,6 @@ #ifndef CONTENT_PUBLIC_BROWSER_RENDER_PROCESS_HOST_FACTORY_H_ #define CONTENT_PUBLIC_BROWSER_RENDER_PROCESS_HOST_FACTORY_H_ -#include "base/basictypes.h" #include "content/common/content_export.h" namespace content { diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h index 585ec51..44acef8 100644 --- a/content/public/browser/render_view_host.h +++ b/content/public/browser/render_view_host.h @@ -6,6 +6,7 @@ #define CONTENT_PUBLIC_BROWSER_RENDER_VIEW_HOST_H_ #include "base/callback_forward.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/common/file_chooser_params.h" #include "content/public/common/page_zoom.h" diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h index be57cfa..d569786 100644 --- a/content/public/browser/render_widget_host.h +++ b/content/public/browser/render_widget_host.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_RENDER_WIDGET_HOST_H_ #define CONTENT_PUBLIC_BROWSER_RENDER_WIDGET_HOST_H_ +#include <stdint.h> + #include "base/callback.h" #include "content/common/content_export.h" #include "content/public/browser/native_web_keyboard_event.h" @@ -103,7 +105,7 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Sender { public: // Returns the RenderWidgetHost given its ID and the ID of its render process. // Returns nullptr if the IDs do not correspond to a live RenderWidgetHost. - static RenderWidgetHost* FromID(int32 process_id, int32 routing_id); + static RenderWidgetHost* FromID(int32_t process_id, int32_t routing_id); // Returns an iterator to iterate over the global list of active render widget // hosts. diff --git a/content/public/browser/render_widget_host_view.h b/content/public/browser/render_widget_host_view.h index d503fa9..9b48ddb 100644 --- a/content/public/browser/render_widget_host_view.h +++ b/content/public/browser/render_widget_host_view.h @@ -5,14 +5,14 @@ #ifndef CONTENT_PUBLIC_BROWSER_RENDER_WIDGET_HOST_VIEW_H_ #define CONTENT_PUBLIC_BROWSER_RENDER_WIDGET_HOST_VIEW_H_ -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "content/common/content_export.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkRegion.h" -#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/gfx/native_widget_types.h" class GURL; diff --git a/content/public/browser/resource_context.h b/content/public/browser/resource_context.h index 3a3fafe..e96f7c2 100644 --- a/content/public/browser/resource_context.h +++ b/content/public/browser/resource_context.h @@ -5,9 +5,10 @@ #ifndef CONTENT_PUBLIC_BROWSER_RESOURCE_CONTEXT_H_ #define CONTENT_PUBLIC_BROWSER_RESOURCE_CONTEXT_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/supports_user_data.h" @@ -49,7 +50,7 @@ class CONTENT_EXPORT ResourceContext : public base::SupportsUserData { // Create a platform KeygenHandler and pass it to |callback|. The |callback| // may be run synchronously. virtual void CreateKeygenHandler( - uint32 key_size_in_bits, + uint32_t key_size_in_bits, const std::string& challenge_string, const GURL& url, const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback); diff --git a/content/public/browser/resource_dispatcher_host.h b/content/public/browser/resource_dispatcher_host.h index 6259b23..d8b2495 100644 --- a/content/public/browser/resource_dispatcher_host.h +++ b/content/public/browser/resource_dispatcher_host.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_RESOURCE_DISPATCHER_HOST_H_ #define CONTENT_PUBLIC_BROWSER_RESOURCE_DISPATCHER_HOST_H_ +#include <stdint.h> + #include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/download_interrupt_reasons.h" @@ -58,7 +60,7 @@ class CONTENT_EXPORT ResourceDispatcherHost { bool prefer_cache, bool do_not_prompt_for_login, scoped_ptr<DownloadSaveInfo> save_info, - uint32 download_id, + uint32_t download_id, const DownloadStartedCallback& started_callback) = 0; // Clears the ResourceDispatcherHostLoginDelegate associated with the request. diff --git a/content/public/browser/resource_dispatcher_host_delegate.h b/content/public/browser/resource_dispatcher_host_delegate.h index 05c55c4..1226d15 100644 --- a/content/public/browser/resource_dispatcher_host_delegate.h +++ b/content/public/browser/resource_dispatcher_host_delegate.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" diff --git a/content/public/browser/resource_dispatcher_host_login_delegate.h b/content/public/browser/resource_dispatcher_host_login_delegate.h index 0db8b8a..a6b3b2b 100644 --- a/content/public/browser/resource_dispatcher_host_login_delegate.h +++ b/content/public/browser/resource_dispatcher_host_login_delegate.h @@ -5,7 +5,6 @@ #ifndef CONTENT_PUBLIC_BROWSER_RESOURCE_DISPATCHER_HOST_LOGIN_DELEGATE_H_ #define CONTENT_PUBLIC_BROWSER_RESOURCE_DISPATCHER_HOST_LOGIN_DELEGATE_H_ -#include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" diff --git a/content/public/browser/resource_request_info.h b/content/public/browser/resource_request_info.h index 91deb56..e65bce0 100644 --- a/content/public/browser/resource_request_info.h +++ b/content/public/browser/resource_request_info.h @@ -5,7 +5,6 @@ #ifndef CONTENT_PUBLIC_BROWSER_RESOURCE_REQUEST_INFO_H_ #define CONTENT_PUBLIC_BROWSER_RESOURCE_REQUEST_INFO_H_ -#include "base/basictypes.h" #include "base/callback_forward.h" #include "content/common/content_export.h" #include "content/public/common/resource_type.h" diff --git a/content/public/browser/service_worker_context.h b/content/public/browser/service_worker_context.h index bac9ab6..2d721ca 100644 --- a/content/public/browser/service_worker_context.h +++ b/content/public/browser/service_worker_context.h @@ -8,7 +8,6 @@ #include <set> #include <string> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "content/public/browser/service_worker_usage_info.h" #include "url/gurl.h" diff --git a/content/public/browser/service_worker_usage_info.h b/content/public/browser/service_worker_usage_info.h index 06fec61..4c69d95 100644 --- a/content/public/browser/service_worker_usage_info.h +++ b/content/public/browser/service_worker_usage_info.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_SERVICE_WORKER_USAGE_INFO_H_ #define CONTENT_PUBLIC_BROWSER_SERVICE_WORKER_USAGE_INFO_H_ +#include <stdint.h> + #include <vector> #include "content/common/content_export.h" diff --git a/content/public/browser/session_storage_namespace.h b/content/public/browser/session_storage_namespace.h index 78110af..f7858ce 100644 --- a/content/public/browser/session_storage_namespace.h +++ b/content/public/browser/session_storage_namespace.h @@ -5,10 +5,11 @@ #ifndef CONTENT_PUBLIC_BROWSER_SESSION_STORAGE_NAMESPACE_H_ #define CONTENT_PUBLIC_BROWSER_SESSION_STORAGE_NAMESPACE_H_ +#include <stdint.h> + #include <map> #include <string> -#include "base/basictypes.h" #include "base/memory/ref_counted.h" namespace content { @@ -20,7 +21,7 @@ class SessionStorageNamespace public: // Returns the ID of the |SessionStorageNamespace|. The ID is unique among all // SessionStorageNamespace objects, but not unique across browser runs. - virtual int64 id() const = 0; + virtual int64_t id() const = 0; // Returns the persistent ID for the |SessionStorageNamespace|. The ID is // unique across browser runs. diff --git a/content/public/browser/site_instance.h b/content/public/browser/site_instance.h index 7a30518..6cf9217 100644 --- a/content/public/browser/site_instance.h +++ b/content/public/browser/site_instance.h @@ -5,7 +5,9 @@ #ifndef CONTENT_PUBLIC_BROWSER_SITE_INSTANCE_H_ #define CONTENT_PUBLIC_BROWSER_SITE_INSTANCE_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "url/gurl.h" @@ -72,7 +74,7 @@ class RenderProcessHost; class CONTENT_EXPORT SiteInstance : public base::RefCounted<SiteInstance> { public: // Returns a unique ID for this SiteInstance. - virtual int32 GetId() = 0; + virtual int32_t GetId() = 0; // Whether this SiteInstance has a running process associated with it. // This may return true before the first call to GetProcess(), in cases where diff --git a/content/public/browser/speech_recognition_event_listener.h b/content/public/browser/speech_recognition_event_listener.h index 8c16f90..3da7413 100644 --- a/content/public/browser/speech_recognition_event_listener.h +++ b/content/public/browser/speech_recognition_event_listener.h @@ -5,7 +5,6 @@ #ifndef CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_EVENT_LISTENER_H_ #define CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_EVENT_LISTENER_H_ -#include "base/basictypes.h" #include "content/common/content_export.h" #include "content/public/common/speech_recognition_result.h" diff --git a/content/public/browser/speech_recognition_session_config.cc b/content/public/browser/speech_recognition_session_config.cc index 4022fcc..7bfdf5a 100644 --- a/content/public/browser/speech_recognition_session_config.cc +++ b/content/public/browser/speech_recognition_session_config.cc @@ -5,7 +5,7 @@ #include "content/public/browser/speech_recognition_session_config.h" namespace { -const uint32 kDefaultMaxHypotheses = 1; +const uint32_t kDefaultMaxHypotheses = 1; } namespace content { diff --git a/content/public/browser/speech_recognition_session_config.h b/content/public/browser/speech_recognition_session_config.h index e5343e2..964f94f 100644 --- a/content/public/browser/speech_recognition_session_config.h +++ b/content/public/browser/speech_recognition_session_config.h @@ -5,9 +5,10 @@ #ifndef CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_SESSION_CONFIG_H_ #define CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_SESSION_CONFIG_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" @@ -34,7 +35,7 @@ struct CONTENT_EXPORT SpeechRecognitionSessionConfig { bool filter_profanities; bool continuous; bool interim_results; - uint32 max_hypotheses; + uint32_t max_hypotheses; std::string auth_token; std::string auth_scope; scoped_refptr<SpeechRecognitionSessionPreamble> preamble; diff --git a/content/public/browser/storage_partition.h b/content/public/browser/storage_partition.h index 0a3a2c7..b749378 100644 --- a/content/public/browser/storage_partition.h +++ b/content/public/browser/storage_partition.h @@ -5,9 +5,10 @@ #ifndef CONTENT_PUBLIC_BROWSER_STORAGE_PARTITION_H_ #define CONTENT_PUBLIC_BROWSER_STORAGE_PARTITION_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/files/file_path.h" #include "base/time/time.h" @@ -79,7 +80,7 @@ class CONTENT_EXPORT StoragePartition { virtual PlatformNotificationContext* GetPlatformNotificationContext() = 0; virtual BackgroundSyncContext* GetBackgroundSyncContext() = 0; - enum : uint32 { + enum : uint32_t { REMOVE_DATA_MASK_APPCACHE = 1 << 0, REMOVE_DATA_MASK_COOKIES = 1 << 1, REMOVE_DATA_MASK_FILE_SYSTEMS = 1 << 2, @@ -114,8 +115,8 @@ class CONTENT_EXPORT StoragePartition { // about. This will no longer be the case when we resolve // http://crbug.com/159193. Remove |request_context_getter| when that bug // is fixed. - virtual void ClearDataForOrigin(uint32 remove_mask, - uint32 quota_storage_remove_mask, + virtual void ClearDataForOrigin(uint32_t remove_mask, + uint32_t quota_storage_remove_mask, const GURL& storage_origin, net::URLRequestContextGetter* rq_context, const base::Closure& callback) = 0; @@ -133,8 +134,8 @@ class CONTENT_EXPORT StoragePartition { // otherwise the callback can be null (base::Callback::is_null() == true). // |callback| is called when data deletion is done or at least the deletion is // scheduled. - virtual void ClearData(uint32 remove_mask, - uint32 quota_storage_remove_mask, + virtual void ClearData(uint32_t remove_mask, + uint32_t quota_storage_remove_mask, const GURL& storage_origin, const OriginMatcherFunction& origin_matcher, const base::Time begin, diff --git a/content/public/browser/trace_uploader.h b/content/public/browser/trace_uploader.h index 24e99e2..6b1ffb1 100644 --- a/content/public/browser/trace_uploader.h +++ b/content/public/browser/trace_uploader.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_TRACE_UPLOADER_H_ #define CONTENT_PUBLIC_BROWSER_TRACE_UPLOADER_H_ +#include <stdint.h> + #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" @@ -21,7 +23,7 @@ class TraceUploader { typedef base::Callback<void(bool, const std::string&)> UploadDoneCallback; // Call this to update the progress UI with the current bytes uploaded, // as well as the total. - typedef base::Callback<void(int64, int64)> UploadProgressCallback; + typedef base::Callback<void(int64_t, int64_t)> UploadProgressCallback; virtual ~TraceUploader() {} diff --git a/content/public/browser/tracing_controller.h b/content/public/browser/tracing_controller.h index bfd3c42..c910377 100644 --- a/content/public/browser/tracing_controller.h +++ b/content/public/browser/tracing_controller.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_TRACING_CONTROLLER_H_ #define CONTENT_PUBLIC_BROWSER_TRACING_CONTROLLER_H_ +#include <stddef.h> + #include <set> #include <string> diff --git a/content/public/browser/utility_process_host.h b/content/public/browser/utility_process_host.h index 5fb2d1d..3e5252f 100644 --- a/content/public/browser/utility_process_host.h +++ b/content/public/browser/utility_process_host.h @@ -8,6 +8,7 @@ #include "base/environment.h" #include "base/process/launch.h" #include "base/threading/thread.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "ipc/ipc_sender.h" diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h index c9fa8a01..6f68c96 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h @@ -5,14 +5,16 @@ #ifndef CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ +#include <stdint.h> + #include <set> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/files/file_path.h" #include "base/process/kill.h" #include "base/strings/string16.h" #include "base/supports_user_data.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/browser/invalidate_type.h" #include "content/public/browser/navigation_controller.h" @@ -293,11 +295,11 @@ class WebContents : public PageNavigator, // this WebContents. Page IDs are specific to a given SiteInstance and // WebContents, corresponding to a specific RenderView in the renderer. // Page IDs increase with each new page that is loaded by a tab. - virtual int32 GetMaxPageID() = 0; + virtual int32_t GetMaxPageID() = 0; // The max page ID for any page that the given SiteInstance has loaded in // this WebContents. - virtual int32 GetMaxPageIDForSiteInstance(SiteInstance* site_instance) = 0; + virtual int32_t GetMaxPageIDForSiteInstance(SiteInstance* site_instance) = 0; // Returns the SiteInstance associated with the current page. virtual SiteInstance* GetSiteInstance() const = 0; @@ -324,8 +326,8 @@ class WebContents : public PageNavigator, virtual const base::string16& GetLoadStateHost() const = 0; // Returns the upload progress. - virtual uint64 GetUploadSize() const = 0; - virtual uint64 GetUploadPosition() const = 0; + virtual uint64_t GetUploadSize() const = 0; + virtual uint64_t GetUploadPosition() const = 0; // Returns the character encoding of the page. virtual const std::string& GetEncoding() const = 0; @@ -524,8 +526,7 @@ class WebContents : public PageNavigator, // Generate an MHTML representation of the current page in the given file. virtual void GenerateMHTML( const base::FilePath& file, - const base::Callback<void( - int64 /* size of the file */)>& callback) = 0; + const base::Callback<void(int64_t /* size of the file */)>& callback) = 0; // Returns the contents MIME type after a navigation. virtual const std::string& GetContentsMimeType() const = 0; diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc index 306f6ea..e247f5b 100644 --- a/content/public/browser/web_contents_delegate.cc +++ b/content/public/browser/web_contents_delegate.cc @@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/memory/singleton.h" +#include "build/build_config.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/security_style_explanations.h" #include "content/public/browser/web_contents.h" @@ -74,9 +75,9 @@ bool WebContentsDelegate::ShouldPreserveAbortedURLs(WebContents* source) { } bool WebContentsDelegate::AddMessageToConsole(WebContents* source, - int32 level, + int32_t level, const base::string16& message, - int32 line_no, + int32_t line_no, const base::string16& source_id) { return false; } diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h index d8f6ac2..6379fe4 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h @@ -5,12 +5,14 @@ #ifndef CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_DELEGATE_H_ #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_DELEGATE_H_ +#include <stdint.h> + #include <set> #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/browser/bluetooth_chooser.h" #include "content/public/browser/invalidate_type.h" @@ -190,9 +192,9 @@ class CONTENT_EXPORT WebContentsDelegate { // handled the message. If false is returned the default logging mechanism // will be used for the message. virtual bool AddMessageToConsole(WebContents* source, - int32 level, + int32_t level, const base::string16& message, - int32 line_no, + int32_t line_no, const base::string16& source_id); // Tells us that we've finished firing this tab's beforeunload event. diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h index f77f911..5a55b72 100644 --- a/content/public/browser/web_contents_observer.h +++ b/content/public/browser/web_contents_observer.h @@ -5,6 +5,9 @@ #ifndef CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_OBSERVER_H_ #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_OBSERVER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/process/kill.h" #include "base/process/process_handle.h" #include "content/common/content_export.h" diff --git a/content/public/browser/web_ui.h b/content/public/browser/web_ui.h index 0cf7989..663afd1 100644 --- a/content/public/browser/web_ui.h +++ b/content/public/browser/web_ui.h @@ -7,7 +7,6 @@ #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/strings/string16.h" #include "content/common/content_export.h" diff --git a/content/public/browser/web_ui_controller.h b/content/public/browser/web_ui_controller.h index 2bfba48..64d7cef 100644 --- a/content/public/browser/web_ui_controller.h +++ b/content/public/browser/web_ui_controller.h @@ -5,7 +5,6 @@ #ifndef CONTENT_PUBLIC_BROWSER_WEB_UI_CONTROLLER_H_ #define CONTENT_PUBLIC_BROWSER_WEB_UI_CONTROLLER_H_ -#include "base/basictypes.h" #include "base/strings/string16.h" #include "content/common/content_export.h" diff --git a/content/public/browser/web_ui_message_handler.h b/content/public/browser/web_ui_message_handler.h index b6908769..3f306ef 100644 --- a/content/public/browser/web_ui_message_handler.h +++ b/content/public/browser/web_ui_message_handler.h @@ -5,7 +5,6 @@ #ifndef CONTENT_PUBLIC_BROWSER_WEB_UI_MESSAGE_HANDLER_H_ #define CONTENT_PUBLIC_BROWSER_WEB_UI_MESSAGE_HANDLER_H_ -#include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/strings/string16.h" #include "content/common/content_export.h" diff --git a/content/public/child/child_thread.h b/content/public/child/child_thread.h index 4a29667..6afc0cb 100644 --- a/content/public/child/child_thread.h +++ b/content/public/child/child_thread.h @@ -5,6 +5,7 @@ #ifndef CONTENT_PUBLIC_CHILD_CHILD_THREAD_H_ #define CONTENT_PUBLIC_CHILD_CHILD_THREAD_H_ +#include "build/build_config.h" #include "content/common/content_export.h" #include "ipc/ipc_sender.h" diff --git a/content/public/child/fixed_received_data.h b/content/public/child/fixed_received_data.h index 8acba46..c872c2d 100644 --- a/content/public/child/fixed_received_data.h +++ b/content/public/child/fixed_received_data.h @@ -5,8 +5,11 @@ #ifndef CONTENT_PUBLIC_CHILD_FIXED_RECEIVED_DATA_H_ #define CONTENT_PUBLIC_CHILD_FIXED_RECEIVED_DATA_H_ +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "content/common/content_export.h" #include "content/public/child/request_peer.h" diff --git a/content/public/child/image_decoder_utils.h b/content/public/child/image_decoder_utils.h index c85893d..1b9ca36 100644 --- a/content/public/child/image_decoder_utils.h +++ b/content/public/child/image_decoder_utils.h @@ -5,7 +5,8 @@ #ifndef CONTENT_PUBLIC_CHILD_IMAGE_DECODER_UTILS_H_ #define CONTENT_PUBLIC_CHILD_IMAGE_DECODER_UTILS_H_ -#include "base/basictypes.h" +#include <stddef.h> + #include "content/common/content_export.h" class SkBitmap; diff --git a/content/public/child/request_peer.h b/content/public/child/request_peer.h index ed09c92..c12c19e 100644 --- a/content/public/child/request_peer.h +++ b/content/public/child/request_peer.h @@ -5,9 +5,10 @@ #ifndef CONTENT_PUBLIC_CHILD_REQUEST_PEER_H_ #define CONTENT_PUBLIC_CHILD_REQUEST_PEER_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" @@ -57,7 +58,7 @@ class CONTENT_EXPORT RequestPeer { // Called as upload progress is made. // note: only for requests with upload progress enabled. - virtual void OnUploadProgress(uint64 position, uint64 size) = 0; + virtual void OnUploadProgress(uint64_t position, uint64_t size) = 0; // Called when a redirect occurs. The implementation may return false to // suppress the redirect. The ResourceResponseInfo provides information about @@ -94,7 +95,7 @@ class CONTENT_EXPORT RequestPeer { bool stale_copy_in_cache, const std::string& security_info, const base::TimeTicks& completion_time, - int64 total_transfer_size) = 0; + int64_t total_transfer_size) = 0; // This is a combined notification of // - OnReceivedResponse, @@ -114,7 +115,7 @@ class CONTENT_EXPORT RequestPeer { bool stale_copy_in_cache, const std::string& security_info, const base::TimeTicks& completion_time, - int64 total_transfer_size) = 0; + int64_t total_transfer_size) = 0; protected: virtual ~RequestPeer() {} diff --git a/content/public/common/appcache_info.h b/content/public/common/appcache_info.h index 436b193a..75b5499 100644 --- a/content/public/common/appcache_info.h +++ b/content/public/common/appcache_info.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_COMMON_APPCACHE_INFO_H_ #define CONTENT_PUBLIC_COMMON_APPCACHE_INFO_H_ +#include <stdint.h> + #include <vector> #include "base/time/time.h" @@ -14,9 +16,9 @@ namespace content { static const int kAppCacheNoHostId = 0; -static const int64 kAppCacheNoCacheId = 0; -static const int64 kAppCacheNoResponseId = 0; -static const int64 kAppCacheUnknownCacheId = -1; +static const int64_t kAppCacheNoCacheId = 0; +static const int64_t kAppCacheNoResponseId = 0; +static const int64_t kAppCacheUnknownCacheId = -1; enum AppCacheStatus { APPCACHE_STATUS_UNCACHED, @@ -36,10 +38,10 @@ struct CONTENT_EXPORT AppCacheInfo { base::Time creation_time; base::Time last_update_time; base::Time last_access_time; - int64 cache_id; - int64 group_id; + int64_t cache_id; + int64_t group_id; AppCacheStatus status; - int64 size; + int64_t size; bool is_complete; }; diff --git a/content/public/common/browser_plugin_guest_mode.h b/content/public/common/browser_plugin_guest_mode.h index a6e9d53..c77a1e8 100644 --- a/content/public/common/browser_plugin_guest_mode.h +++ b/content/public/common/browser_plugin_guest_mode.h @@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_COMMON_BROWSER_PLUGIN_GUEST_MODE_H_ #define CONTENT_PUBLIC_COMMON_BROWSER_PLUGIN_GUEST_MODE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/common/content_export.h" namespace content { diff --git a/content/public/common/child_process_host.h b/content/public/common/child_process_host.h index 0544a5a..9975faf 100644 --- a/content/public/common/child_process_host.h +++ b/content/public/common/child_process_host.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_COMMON_CHILD_PROCESS_HOST_H_ #define CONTENT_PUBLIC_COMMON_CHILD_PROCESS_HOST_H_ +#include <stdint.h> + #include "base/files/scoped_file.h" #include "build/build_config.h" #include "content/common/content_export.h" @@ -37,7 +39,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Sender { // This value is used as the tracing id of the browser process for identifying // cross-process shared memory segments when tracing. // Note: In single-process mode all the clients of tracing will use this id. - static uint64 kBrowserTracingProcessId; + static uint64_t kBrowserTracingProcessId; // Used to create a child process host. The delegate must outlive this object. static ChildProcessHost* Create(ChildProcessHostDelegate* delegate); diff --git a/content/public/common/child_process_sandbox_support_linux.h b/content/public/common/child_process_sandbox_support_linux.h index 9e1cde2..88bcbe3 100644 --- a/content/public/common/child_process_sandbox_support_linux.h +++ b/content/public/common/child_process_sandbox_support_linux.h @@ -5,6 +5,7 @@ #ifndef CONTENT_PUBLIC_COMMON_CHILD_PROCESS_SANDBOX_SUPPORT_LINUX_H_ #define CONTENT_PUBLIC_COMMON_CHILD_PROCESS_SANDBOX_SUPPORT_LINUX_H_ +#include <stddef.h> #include <stdint.h> #include <string> diff --git a/content/public/common/common_param_traits.cc b/content/public/common/common_param_traits.cc index ab16aea1..2764719 100644 --- a/content/public/common/common_param_traits.cc +++ b/content/public/common/common_param_traits.cc @@ -68,7 +68,7 @@ bool ParamTraits<url::Origin>::Read(const Message* m, bool unique; std::string scheme; std::string host; - uint16 port; + uint16_t port; if (!ReadParam(m, iter, &unique) || !ReadParam(m, iter, &scheme) || !ReadParam(m, iter, &host) || !ReadParam(m, iter, &port)) { *p = url::Origin(); @@ -101,7 +101,7 @@ bool ParamTraits<net::HostPortPair>::Read(const Message* m, base::PickleIterator* iter, param_type* r) { std::string host; - uint16 port; + uint16_t port; if (!ReadParam(m, iter, &host) || !ReadParam(m, iter, &port)) return false; @@ -123,7 +123,7 @@ bool ParamTraits<net::IPEndPoint>::Read(const Message* m, base::PickleIterator* iter, param_type* p) { net::IPAddressNumber address; - uint16 port; + uint16_t port; if (!ReadParam(m, iter, &address) || !ReadParam(m, iter, &port)) return false; if (address.size() && diff --git a/content/public/common/common_param_traits.h b/content/public/common/common_param_traits.h index 170caad..bd349c8 100644 --- a/content/public/common/common_param_traits.h +++ b/content/public/common/common_param_traits.h @@ -14,9 +14,12 @@ #ifndef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_H_ #define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_H_ +#include <stdint.h> + #include <string> #include "base/memory/ref_counted.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/common/common_param_traits_macros.h" #include "ipc/ipc_message_utils.h" @@ -93,7 +96,7 @@ struct ParamTraits<gfx::NativeWindow> { static bool Read(const Message* m, base::PickleIterator* iter, param_type* r) { #if defined(OS_WIN) - return iter->ReadUInt32(reinterpret_cast<uint32*>(r)); + return iter->ReadUInt32(reinterpret_cast<uint32_t*>(r)); #else const char *data; int data_size = 0; diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h index 49a9c5d..e836e1b 100644 --- a/content/public/common/common_param_traits_macros.h +++ b/content/public/common/common_param_traits_macros.h @@ -8,6 +8,7 @@ #ifndef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ #define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ +#include "build/build_config.h" #include "content/public/common/console_message_level.h" #include "content/public/common/referrer.h" #include "content/public/common/security_style.h" diff --git a/content/public/common/content_client.cc b/content/public/common/content_client.cc index 3c8d235..e7f50c8 100644 --- a/content/public/common/content_client.cc +++ b/content/public/common/content_client.cc @@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/strings/string_piece.h" +#include "build/build_config.h" #include "content/public/common/origin_util.h" #include "content/public/common/user_agent.h" #include "ui/gfx/image/image.h" diff --git a/content/public/common/content_client.h b/content/public/common/content_client.h index 0c4d09a..9d51d5b 100644 --- a/content/public/common/content_client.h +++ b/content/public/common/content_client.h @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/strings/string16.h" #include "base/strings/string_piece.h" #include "build/build_config.h" diff --git a/content/public/common/content_descriptors.h b/content/public/common/content_descriptors.h index 9b1ecc0..17d160e 100644 --- a/content/public/common/content_descriptors.h +++ b/content/public/common/content_descriptors.h @@ -5,6 +5,7 @@ #ifndef CONTENT_PUBLIC_COMMON_CONTENT_DESCRIPTORS_H_ #define CONTENT_PUBLIC_COMMON_CONTENT_DESCRIPTORS_H_ +#include "build/build_config.h" #include "ipc/ipc_descriptors.h" // This is a list of global descriptor keys to be used with the diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc index a9e9acf..31987e0 100644 --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" #include "content/public/common/content_features.h" namespace features { diff --git a/content/public/common/content_ipc_logging.h b/content/public/common/content_ipc_logging.h index 83fe898..4508428 100644 --- a/content/public/common/content_ipc_logging.h +++ b/content/public/common/content_ipc_logging.h @@ -7,6 +7,8 @@ #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. +#include <stdint.h> + #include "content/common/content_export.h" #include "ipc/ipc_logging.h" @@ -21,7 +23,7 @@ namespace content { // content::RegisterIPCLogger(msg_id, logger) // // to register IPC messages with the logging system. -CONTENT_EXPORT void RegisterIPCLogger(uint32 msg_id, LogFunction logger); +CONTENT_EXPORT void RegisterIPCLogger(uint32_t msg_id, LogFunction logger); #endif diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index ceb611e..0f97ee2 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" #include "content/public/common/content_switches.h" namespace switches { diff --git a/content/public/common/context_menu_params.h b/content/public/common/context_menu_params.h index f3d89c9..46510e8 100644 --- a/content/public/common/context_menu_params.h +++ b/content/public/common/context_menu_params.h @@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/common/menu_item.h" #include "content/public/common/page_state.h" diff --git a/content/public/common/drop_data.h b/content/public/common/drop_data.h index 3bc08df..e589184b 100644 --- a/content/public/common/drop_data.h +++ b/content/public/common/drop_data.h @@ -9,6 +9,8 @@ #ifndef CONTENT_PUBLIC_COMMON_DROP_DATA_H_ #define CONTENT_PUBLIC_COMMON_DROP_DATA_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> @@ -27,7 +29,7 @@ struct CONTENT_EXPORT DropData { ~FileSystemFileInfo() {} GURL url; - int64 size; + int64_t size; }; DropData(); diff --git a/content/public/common/file_chooser_file_info.h b/content/public/common/file_chooser_file_info.h index 24d116d..d2bb5e0 100644 --- a/content/public/common/file_chooser_file_info.h +++ b/content/public/common/file_chooser_file_info.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_COMMON_FILE_CHOOSER_FILE_INFO_H_ #define CONTENT_PUBLIC_COMMON_FILE_CHOOSER_FILE_INFO_H_ +#include <stdint.h> + #include "base/files/file_path.h" #include "base/time/time.h" #include "content/common/content_export.h" @@ -25,7 +27,7 @@ struct CONTENT_EXPORT FileChooserFileInfo { // For non-native files. GURL file_system_url; base::Time modification_time; - int64 length; + int64_t length; bool is_directory; }; diff --git a/content/public/common/file_chooser_params.h b/content/public/common/file_chooser_params.h index cb9d934..ef43f7b 100644 --- a/content/public/common/file_chooser_params.h +++ b/content/public/common/file_chooser_params.h @@ -9,6 +9,7 @@ #include "base/files/file_path.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "url/gurl.h" diff --git a/content/public/common/frame_navigate_params.h b/content/public/common/frame_navigate_params.h index 9e006c0..2c80fd2 100644 --- a/content/public/common/frame_navigate_params.h +++ b/content/public/common/frame_navigate_params.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_COMMON_FRAME_NAVIGATE_PARAMS_H_ #define CONTENT_PUBLIC_COMMON_FRAME_NAVIGATE_PARAMS_H_ +#include <stdint.h> + #include <string> #include <vector> @@ -25,7 +27,7 @@ struct CONTENT_EXPORT FrameNavigateParams { // anytime a new session history entry is created. This means you'll get new // page IDs for user actions, and the old page IDs will be reloaded when // iframes are loaded automatically. - int32 page_id; + int32_t page_id; // The unique ID of the NavigationEntry for browser-initiated navigations. // This value was given to the render process in the HistoryNavigationParams @@ -39,13 +41,13 @@ struct CONTENT_EXPORT FrameNavigateParams { // The item sequence number identifies each stop in the session history. It // is unique within the renderer process and makes a best effort to be unique // across browser sessions (using a renderer process timestamp). - int64 item_sequence_number; + int64_t item_sequence_number; // The document sequence number is used to identify cross-document navigations // in session history. It increments for each new document and is unique in // the same way as |item_sequence_number|. In-page navigations get a new item // sequence number but the same document sequence number. - int64 document_sequence_number; + int64_t document_sequence_number; // URL of the page being loaded. GURL url; diff --git a/content/public/common/gpu_memory_stats.h b/content/public/common/gpu_memory_stats.h index feb9ded..cb28b23 100644 --- a/content/public/common/gpu_memory_stats.h +++ b/content/public/common/gpu_memory_stats.h @@ -8,9 +8,10 @@ // Provides access to the GPU information for the system // on which chrome is currently running. +#include <stddef.h> + #include <map> -#include "base/basictypes.h" #include "base/process/process.h" #include "content/common/content_export.h" diff --git a/content/public/common/main_function_params.h b/content/public/common/main_function_params.h index e2756e7..913e9b2 100644 --- a/content/public/common/main_function_params.h +++ b/content/public/common/main_function_params.h @@ -11,6 +11,7 @@ #include "base/callback_forward.h" #include "base/command_line.h" +#include "build/build_config.h" #if defined(OS_WIN) namespace sandbox { diff --git a/content/public/common/manifest.h b/content/public/common/manifest.h index 8305884..35671b8 100644 --- a/content/public/common/manifest.h +++ b/content/public/common/manifest.h @@ -5,6 +5,9 @@ #ifndef CONTENT_PUBLIC_COMMON_MANIFEST_H_ #define CONTENT_PUBLIC_COMMON_MANIFEST_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/strings/nullable_string16.h" diff --git a/content/public/common/media_stream_request.cc b/content/public/common/media_stream_request.cc index 7eadf9a..72a4b16 100644 --- a/content/public/common/media_stream_request.cc +++ b/content/public/common/media_stream_request.cc @@ -5,6 +5,7 @@ #include "content/public/common/media_stream_request.h" #include "base/logging.h" +#include "build/build_config.h" namespace content { diff --git a/content/public/common/media_stream_request.h b/content/public/common/media_stream_request.h index ed3f84d..c4b6a7e 100644 --- a/content/public/common/media_stream_request.h +++ b/content/public/common/media_stream_request.h @@ -5,11 +5,12 @@ #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ +#include <stddef.h> + #include <map> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" diff --git a/content/public/common/page_state.cc b/content/public/common/page_state.cc index 258eb77..01240db 100644 --- a/content/public/common/page_state.cc +++ b/content/public/common/page_state.cc @@ -4,6 +4,8 @@ #include "content/public/common/page_state.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/strings/utf_string_conversions.h" #include "content/common/page_state_serialization.h" diff --git a/content/public/common/pepper_plugin_info.h b/content/public/common/pepper_plugin_info.h index 893e28a..253d821 100644 --- a/content/public/common/pepper_plugin_info.h +++ b/content/public/common/pepper_plugin_info.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_COMMON_PEPPER_PLUGIN_INFO_H_ #define CONTENT_PUBLIC_COMMON_PEPPER_PLUGIN_INFO_H_ +#include <stdint.h> + #include <string> #include <vector> @@ -63,7 +65,7 @@ struct CONTENT_EXPORT PepperPluginInfo { EntryPoints internal_entry_points; // Permission bits from ppapi::Permission. - uint32 permissions; + uint32_t permissions; }; } // namespace content diff --git a/content/public/common/platform_notification_data.h b/content/public/common/platform_notification_data.h index 12f4eee..4a9609e 100644 --- a/content/public/common/platform_notification_data.h +++ b/content/public/common/platform_notification_data.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_COMMON_PLATFORM_NOTIFICATION_DATA_H_ #define CONTENT_PUBLIC_COMMON_PLATFORM_NOTIFICATION_DATA_H_ +#include <stddef.h> + #include <string> #include <vector> diff --git a/content/public/common/renderer_preferences.cc b/content/public/common/renderer_preferences.cc index 02cd439..9bb824c 100644 --- a/content/public/common/renderer_preferences.cc +++ b/content/public/common/renderer_preferences.cc @@ -4,6 +4,7 @@ #include "content/public/common/renderer_preferences.h" +#include "build/build_config.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/font_render_params.h" diff --git a/content/public/common/renderer_preferences.h b/content/public/common/renderer_preferences.h index a03b9c1..975394a 100644 --- a/content/public/common/renderer_preferences.h +++ b/content/public/common/renderer_preferences.h @@ -12,10 +12,13 @@ #ifndef CONTENT_PUBLIC_COMMON_RENDERER_PREFERENCES_H_ #define CONTENT_PUBLIC_COMMON_RENDERER_PREFERENCES_H_ +#include <stdint.h> + #include <string> #include <vector> #include "base/strings/string16.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/font_render_params.h" @@ -141,31 +144,31 @@ struct CONTENT_EXPORT RendererPreferences { // The default system font settings for caption, small caption, menu and // status messages. Used only by Windows. base::string16 caption_font_family_name; - int32 caption_font_height; + int32_t caption_font_height; base::string16 small_caption_font_family_name; - int32 small_caption_font_height; + int32_t small_caption_font_height; base::string16 menu_font_family_name; - int32 menu_font_height; + int32_t menu_font_height; base::string16 status_font_family_name; - int32 status_font_height; + int32_t status_font_height; base::string16 message_font_family_name; - int32 message_font_height; + int32_t message_font_height; // The width of a vertical scroll bar in dips. - int32 vertical_scroll_bar_width_in_dips; + int32_t vertical_scroll_bar_width_in_dips; // The height of a horizontal scroll bar in dips. - int32 horizontal_scroll_bar_height_in_dips; + int32_t horizontal_scroll_bar_height_in_dips; // The height of the arrow bitmap on a vertical scroll bar in dips. - int32 arrow_bitmap_height_vertical_scroll_bar_in_dips; + int32_t arrow_bitmap_height_vertical_scroll_bar_in_dips; // The width of the arrow bitmap on a horizontal scroll bar in dips. - int32 arrow_bitmap_width_horizontal_scroll_bar_in_dips; + int32_t arrow_bitmap_width_horizontal_scroll_bar_in_dips; #endif // The default font size used for rendering on Linux. diff --git a/content/public/common/resource_devtools_info.h b/content/public/common/resource_devtools_info.h index bf17b1b..51326c0 100644 --- a/content/public/common/resource_devtools_info.h +++ b/content/public/common/resource_devtools_info.h @@ -5,10 +5,11 @@ #ifndef CONTENT_PUBLIC_COMMON_RESOURCE_DEVTOOLS_INFO_H_ #define CONTENT_PUBLIC_COMMON_RESOURCE_DEVTOOLS_INFO_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/strings/string_split.h" #include "content/common/content_export.h" @@ -24,7 +25,7 @@ struct ResourceDevToolsInfo : base::RefCounted<ResourceDevToolsInfo> { scoped_refptr<ResourceDevToolsInfo> DeepCopy() const; - int32 http_status_code; + int32_t http_status_code; std::string http_status_text; HeadersVector request_headers; HeadersVector response_headers; diff --git a/content/public/common/resource_response_info.h b/content/public/common/resource_response_info.h index 8b81f6d..e7b7c7a 100644 --- a/content/public/common/resource_response_info.h +++ b/content/public/common/resource_response_info.h @@ -5,9 +5,10 @@ #ifndef CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_INFO_H_ #define CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_INFO_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" @@ -54,14 +55,14 @@ struct ResourceResponseInfo { bool has_major_certificate_errors; // Content length if available. -1 if not available - int64 content_length; + int64_t content_length; // Length of the encoded data transferred over the network. In case there is // no data, contains -1. - int64 encoded_data_length; + int64_t encoded_data_length; // The appcache this response was loaded from, or kAppCacheNoCacheId. - int64 appcache_id; + int64_t appcache_id; // The manifest url of the appcache this response was loaded from. // Note: this value is only populated for main resource requests. diff --git a/content/public/common/sandboxed_process_launcher_delegate.cc b/content/public/common/sandboxed_process_launcher_delegate.cc index 59e577c..e0204c4 100644 --- a/content/public/common/sandboxed_process_launcher_delegate.cc +++ b/content/public/common/sandboxed_process_launcher_delegate.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" #include "content/public/common/sandboxed_process_launcher_delegate.h" namespace content { diff --git a/content/public/common/sandboxed_process_launcher_delegate.h b/content/public/common/sandboxed_process_launcher_delegate.h index 39e2cc8..a3aa4e0 100644 --- a/content/public/common/sandboxed_process_launcher_delegate.h +++ b/content/public/common/sandboxed_process_launcher_delegate.h @@ -8,6 +8,7 @@ #include "base/environment.h" #include "base/files/scoped_file.h" #include "base/process/process.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/common/sandbox_type.h" diff --git a/content/public/common/socket_permission_request.h b/content/public/common/socket_permission_request.h index 3db53b3..7316621 100644 --- a/content/public/common/socket_permission_request.h +++ b/content/public/common/socket_permission_request.h @@ -5,9 +5,10 @@ #ifndef CONTENT_PUBLIC_COMMON_SOCKET_PERMISSION_REQUEST_H_ #define CONTENT_PUBLIC_COMMON_SOCKET_PERMISSION_REQUEST_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" namespace content { @@ -29,15 +30,12 @@ struct SocketPermissionRequest { SocketPermissionRequest(OperationType type, const std::string& host, - uint16 port) - : type(type), - host(host), - port(port) { - } + uint16_t port) + : type(type), host(host), port(port) {} OperationType type; std::string host; - uint16 port; + uint16_t port; }; } // namespace content diff --git a/content/public/common/speech_recognition_grammar.h b/content/public/common/speech_recognition_grammar.h index 98dd77e..0621a56 100644 --- a/content/public/common/speech_recognition_grammar.h +++ b/content/public/common/speech_recognition_grammar.h @@ -7,7 +7,6 @@ #include <vector> -#include "base/basictypes.h" #include "content/common/content_export.h" namespace content { diff --git a/content/public/common/speech_recognition_result.h b/content/public/common/speech_recognition_result.h index aa1a02c..980abdd 100644 --- a/content/public/common/speech_recognition_result.h +++ b/content/public/common/speech_recognition_result.h @@ -7,7 +7,6 @@ #include <vector> -#include "base/basictypes.h" #include "base/strings/string16.h" #include "content/common/content_export.h" diff --git a/content/public/common/storage_quota_params.h b/content/public/common/storage_quota_params.h index 9ff61c2..f76c44e 100644 --- a/content/public/common/storage_quota_params.h +++ b/content/public/common/storage_quota_params.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_COMMON_STORAGE_QUOTA_PARAMS_H_ #define CONTENT_PUBLIC_COMMON_STORAGE_QUOTA_PARAMS_H_ +#include <stdint.h> + #include "content/common/content_export.h" #include "ipc/ipc_message.h" #include "storage/common/quota/quota_types.h" @@ -26,7 +28,7 @@ struct CONTENT_EXPORT StorageQuotaParams { int request_id; GURL origin_url; storage::StorageType storage_type; - uint64 requested_size; + uint64_t requested_size; // Request was made in the context of a user gesture. bool user_gesture; diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc index 3c592f7..b0f73f6 100644 --- a/content/public/common/url_constants.cc +++ b/content/public/common/url_constants.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" #include "content/public/common/url_constants.h" namespace content { diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h index 94ee05b..8efe57d 100644 --- a/content/public/common/url_constants.h +++ b/content/public/common/url_constants.h @@ -5,6 +5,7 @@ #ifndef CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_ #define CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_ +#include "build/build_config.h" #include "content/common/content_export.h" #include "url/url_constants.h" diff --git a/content/public/common/web_preferences.cc b/content/public/common/web_preferences.cc index 025c8c7..c887f9a8 100644 --- a/content/public/common/web_preferences.cc +++ b/content/public/common/web_preferences.cc @@ -4,9 +4,9 @@ #include "content/public/common/web_preferences.h" -#include "base/basictypes.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "third_party/WebKit/public/web/WebSettings.h" #include "third_party/icu/source/common/unicode/uchar.h" diff --git a/content/public/common/web_preferences.h b/content/public/common/web_preferences.h index faa5e70..fc1ee14 100644 --- a/content/public/common/web_preferences.h +++ b/content/public/common/web_preferences.h @@ -10,6 +10,7 @@ #include <vector> #include "base/strings/string16.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "ui/base/touch/touch_device.h" #include "url/gurl.h" diff --git a/content/public/common/webplugininfo.cc b/content/public/common/webplugininfo.cc index d12dfd7..95a7bfc 100644 --- a/content/public/common/webplugininfo.cc +++ b/content/public/common/webplugininfo.cc @@ -4,6 +4,8 @@ #include "content/public/common/webplugininfo.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h" diff --git a/content/public/common/webplugininfo.h b/content/public/common/webplugininfo.h index b21b9ea9..f487a4e 100644 --- a/content/public/common/webplugininfo.h +++ b/content/public/common/webplugininfo.h @@ -5,10 +5,11 @@ #ifndef CONTENT_PUBLIC_COMMON_WEBPLUGININFO_H_ #define CONTENT_PUBLIC_COMMON_WEBPLUGININFO_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "content/common/content_export.h" @@ -90,7 +91,7 @@ struct CONTENT_EXPORT WebPluginInfo { int type; // When type is PLUGIN_TYPE_PEPPER_* this indicates the permission bits. - int32 pepper_permissions; + int32_t pepper_permissions; }; } // namespace content diff --git a/content/public/common/window_container_type.cc b/content/public/common/window_container_type.cc index adbae30..aec4e18 100644 --- a/content/public/common/window_container_type.cc +++ b/content/public/common/window_container_type.cc @@ -4,6 +4,8 @@ #include "content/public/common/window_container_type.h" +#include <stddef.h> + #include "base/strings/string_util.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebVector.h" diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h index 59d448c..fd2f3af 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_ #define CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_ +#include <stddef.h> + #include <map> #include <string> #include <vector> diff --git a/content/public/renderer/context_menu_client.h b/content/public/renderer/context_menu_client.h index ceb10a0..1ae9d62 100644 --- a/content/public/renderer/context_menu_client.h +++ b/content/public/renderer/context_menu_client.h @@ -5,7 +5,6 @@ #ifndef CONTENT_PUBLIC_RENDERER_CONTEXT_MENU_CLIENT_H_ #define CONTENT_PUBLIC_RENDERER_CONTEXT_MENU_CLIENT_H_ -#include "base/basictypes.h" #include "content/common/content_export.h" namespace content { diff --git a/content/public/renderer/media_stream_audio_sink.h b/content/public/renderer/media_stream_audio_sink.h index 862c32b..3722b0e 100644 --- a/content/public/renderer/media_stream_audio_sink.h +++ b/content/public/renderer/media_stream_audio_sink.h @@ -7,7 +7,6 @@ #include <vector> -#include "base/basictypes.h" #include "base/time/time.h" #include "content/common/content_export.h" #include "content/public/renderer/media_stream_sink.h" diff --git a/content/public/renderer/pepper_plugin_instance.h b/content/public/renderer/pepper_plugin_instance.h index d397fbc..bd00e5b 100644 --- a/content/public/renderer/pepper_plugin_instance.h +++ b/content/public/renderer/pepper_plugin_instance.h @@ -5,7 +5,8 @@ #ifndef CONTENT_PUBLIC_RENDERER_PEPPER_PLUGIN_INSTANCE_H_ #define CONTENT_PUBLIC_RENDERER_PEPPER_PLUGIN_INSTANCE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/process/process_handle.h" #include "base/strings/string16.h" #include "content/common/content_export.h" diff --git a/content/public/renderer/platform_event_observer.h b/content/public/renderer/platform_event_observer.h index 083007c..a7d296c 100644 --- a/content/public/renderer/platform_event_observer.h +++ b/content/public/renderer/platform_event_observer.h @@ -6,6 +6,7 @@ #define CONTENT_PUBLIC_RENDERER_PLATFORM_EVENT_OBSERVER_H_ #include "base/logging.h" +#include "base/macros.h" #include "content/public/renderer/render_process_observer.h" #include "content/public/renderer/render_thread.h" diff --git a/content/public/renderer/render_frame.h b/content/public/renderer/render_frame.h index dc055ef..3450931 100644 --- a/content/public/renderer/render_frame.h +++ b/content/public/renderer/render_frame.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_RENDERER_RENDER_FRAME_H_ #define CONTENT_PUBLIC_RENDERER_RENDER_FRAME_H_ +#include <stddef.h> + #include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h index d59d41d..43182a6 100644 --- a/content/public/renderer/render_frame_observer.h +++ b/content/public/renderer/render_frame_observer.h @@ -5,8 +5,10 @@ #ifndef CONTENT_PUBLIC_RENDERER_RENDER_FRAME_OBSERVER_H_ #define CONTENT_PUBLIC_RENDERER_RENDER_FRAME_OBSERVER_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "content/common/content_export.h" #include "ipc/ipc_listener.h" @@ -94,8 +96,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener, virtual void DetailedConsoleMessageAdded(const base::string16& message, const base::string16& source, const base::string16& stack_trace, - int32 line_number, - int32 severity_level) {} + int32_t line_number, + int32_t severity_level) {} // Called when an interesting (from document lifecycle perspective), // compositor-driven layout had happened. This is a reasonable hook to use diff --git a/content/public/renderer/render_frame_observer_tracker.h b/content/public/renderer/render_frame_observer_tracker.h index 70b296f..563a5c2 100644 --- a/content/public/renderer/render_frame_observer_tracker.h +++ b/content/public/renderer/render_frame_observer_tracker.h @@ -29,6 +29,7 @@ #include <map> #include "base/lazy_instance.h" +#include "base/macros.h" namespace content { diff --git a/content/public/renderer/render_process_observer.h b/content/public/renderer/render_process_observer.h index 582a60f..f53ba65 100644 --- a/content/public/renderer/render_process_observer.h +++ b/content/public/renderer/render_process_observer.h @@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_RENDERER_RENDER_PROCESS_OBSERVER_H_ #define CONTENT_PUBLIC_RENDERER_RENDER_PROCESS_OBSERVER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/common/content_export.h" namespace IPC { diff --git a/content/public/renderer/render_thread.h b/content/public/renderer/render_thread.h index 929dd097..76cb48f 100644 --- a/content/public/renderer/render_thread.h +++ b/content/public/renderer/render_thread.h @@ -5,7 +5,9 @@ #ifndef CONTENT_PUBLIC_RENDERER_RENDER_THREAD_H_ #define CONTENT_PUBLIC_RENDERER_RENDER_THREAD_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/callback.h" #include "base/memory/shared_memory.h" #include "base/metrics/user_metrics_action.h" @@ -57,8 +59,8 @@ class CONTENT_EXPORT RenderThread : virtual public ChildThread { // Called to add or remove a listener for a particular message routing ID. // These methods normally get delegated to a MessageRouter. - virtual void AddRoute(int32 routing_id, IPC::Listener* listener) = 0; - virtual void RemoveRoute(int32 routing_id) = 0; + virtual void AddRoute(int32_t routing_id, IPC::Listener* listener) = 0; + virtual void RemoveRoute(int32_t routing_id) = 0; virtual int GenerateRoutingID() = 0; // These map to IPC::ChannelProxy methods. @@ -107,15 +109,15 @@ class CONTENT_EXPORT RenderThread : virtual public ChildThread { virtual void RegisterExtension(v8::Extension* extension) = 0; // Schedule a call to IdleHandler with the given initial delay. - virtual void ScheduleIdleHandler(int64 initial_delay_ms) = 0; + virtual void ScheduleIdleHandler(int64_t initial_delay_ms) = 0; // A task we invoke periodically to assist with idle cleanup. virtual void IdleHandler() = 0; // Get/Set the delay for how often the idle handler is called. - virtual int64 GetIdleNotificationDelayInMs() const = 0; + virtual int64_t GetIdleNotificationDelayInMs() const = 0; virtual void SetIdleNotificationDelayInMs( - int64 idle_notification_delay_in_ms) = 0; + int64_t idle_notification_delay_in_ms) = 0; virtual void UpdateHistograms(int sequence_number) = 0; diff --git a/content/public/renderer/render_view.h b/content/public/renderer/render_view.h index 6ddf867..baa051f 100644 --- a/content/public/renderer/render_view.h +++ b/content/public/renderer/render_view.h @@ -5,10 +5,12 @@ #ifndef CONTENT_PUBLIC_RENDERER_RENDER_VIEW_H_ #define CONTENT_PUBLIC_RENDERER_RENDER_VIEW_H_ +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/common/top_controls_state.h" #include "ipc/ipc_sender.h" diff --git a/content/public/renderer/render_view_observer.h b/content/public/renderer/render_view_observer.h index 0fcf959..5eeb45b 100644 --- a/content/public/renderer/render_view_observer.h +++ b/content/public/renderer/render_view_observer.h @@ -5,8 +5,8 @@ #ifndef CONTENT_PUBLIC_RENDERER_RENDER_VIEW_OBSERVER_H_ #define CONTENT_PUBLIC_RENDERER_RENDER_VIEW_OBSERVER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" diff --git a/content/public/renderer/render_view_observer_tracker.h b/content/public/renderer/render_view_observer_tracker.h index 0ef3016..a05ed94 100644 --- a/content/public/renderer/render_view_observer_tracker.h +++ b/content/public/renderer/render_view_observer_tracker.h @@ -29,6 +29,7 @@ #include <map> #include "base/lazy_instance.h" +#include "base/macros.h" namespace content { diff --git a/content/public/renderer/renderer_gamepad_provider.h b/content/public/renderer/renderer_gamepad_provider.h index f51586d..b3b4ce3 100644 --- a/content/public/renderer/renderer_gamepad_provider.h +++ b/content/public/renderer/renderer_gamepad_provider.h @@ -5,6 +5,7 @@ #ifndef CONTENT_PUBLIC_RENDERER_RENDERER_GAMEPAD_PROVIDER_H_ #define CONTENT_PUBLIC_RENDERER_RENDERER_GAMEPAD_PROVIDER_H_ +#include "base/macros.h" #include "content/public/renderer/platform_event_observer.h" namespace blink { diff --git a/content/public/test/async_file_test_helper.cc b/content/public/test/async_file_test_helper.cc index ccb16be..b92cd4c 100644 --- a/content/public/test/async_file_test_helper.cc +++ b/content/public/test/async_file_test_helper.cc @@ -73,11 +73,11 @@ void ReadDirectoryCallback(base::RunLoop* run_loop, } void DidGetUsageAndQuota(storage::QuotaStatusCode* status_out, - int64* usage_out, - int64* quota_out, + int64_t* usage_out, + int64_t* quota_out, storage::QuotaStatusCode status, - int64 usage, - int64 quota) { + int64_t usage, + int64_t quota) { if (status_out) *status_out = status; if (usage_out) @@ -88,7 +88,7 @@ void DidGetUsageAndQuota(storage::QuotaStatusCode* status_out, } // namespace -const int64 AsyncFileTestHelper::kDontCheckSize = -1; +const int64_t AsyncFileTestHelper::kDontCheckSize = -1; base::File::Error AsyncFileTestHelper::Copy( storage::FileSystemContext* context, @@ -239,7 +239,7 @@ base::File::Error AsyncFileTestHelper::GetPlatformPath( bool AsyncFileTestHelper::FileExists(storage::FileSystemContext* context, const storage::FileSystemURL& url, - int64 expected_size) { + int64_t expected_size) { base::File::Info file_info; base::File::Error result = GetMetadata(context, url, &file_info); if (result != base::File::FILE_OK || file_info.is_directory) @@ -258,8 +258,8 @@ storage::QuotaStatusCode AsyncFileTestHelper::GetUsageAndQuota( storage::QuotaManager* quota_manager, const GURL& origin, storage::FileSystemType type, - int64* usage, - int64* quota) { + int64_t* usage, + int64_t* quota) { storage::QuotaStatusCode status = storage::kQuotaStatusUnknown; quota_manager->GetUsageAndQuota( origin, diff --git a/content/public/test/async_file_test_helper.h b/content/public/test/async_file_test_helper.h index a153ce3..562e5a5 100644 --- a/content/public/test/async_file_test_helper.h +++ b/content/public/test/async_file_test_helper.h @@ -5,7 +5,9 @@ #ifndef CONTENT_PUBLIC_TEST_ASYNC_FILE_TEST_HELPER_H_ #define CONTENT_PUBLIC_TEST_ASYNC_FILE_TEST_HELPER_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "storage/browser/fileapi/file_system_operation.h" #include "storage/common/fileapi/file_system_types.h" #include "storage/common/quota/quota_status_code.h" @@ -28,7 +30,7 @@ class AsyncFileTestHelper { typedef storage::FileSystemOperation::CopyProgressCallback CopyProgressCallback; - static const int64 kDontCheckSize; + static const int64_t kDontCheckSize; // Performs Copy from |src| to |dest| and returns the status code. static base::File::Error Copy(storage::FileSystemContext* context, @@ -92,7 +94,7 @@ class AsyncFileTestHelper { // existence). static bool FileExists(storage::FileSystemContext* context, const storage::FileSystemURL& url, - int64 size); + int64_t size); // Returns true if a directory exists at |url|. static bool DirectoryExists(storage::FileSystemContext* context, @@ -103,8 +105,8 @@ class AsyncFileTestHelper { storage::QuotaManager* quota_manager, const GURL& origin, storage::FileSystemType type, - int64* usage, - int64* quota); + int64_t* usage, + int64_t* quota); }; } // namespace content diff --git a/content/public/test/browser_test.h b/content/public/test/browser_test.h index a9875b9..7f54606 100644 --- a/content/public/test/browser_test.h +++ b/content/public/test/browser_test.h @@ -14,6 +14,7 @@ #if defined(HAS_OUT_OF_PROC_TEST_RUNNER) #include "base/compiler_specific.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #define IN_PROC_BROWSER_TEST_( \ diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc index 2868983..c879e51f 100644 --- a/content/public/test/browser_test_base.cc +++ b/content/public/test/browser_test_base.cc @@ -4,15 +4,19 @@ #include "content/public/test/browser_test_base.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/debug/stack_trace.h" #include "base/i18n/icu_util.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/sys_info.h" #include "base/test/test_timeouts.h" +#include "build/build_config.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/tracing/tracing_controller_impl.h" #include "content/public/app/content_main.h" diff --git a/content/public/test/browser_test_base.h b/content/public/test/browser_test_base.h index 23abda8..3be8208 100644 --- a/content/public/test/browser_test_base.h +++ b/content/public/test/browser_test_base.h @@ -8,6 +8,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/threading/thread.h" +#include "build/build_config.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc index d326928..c4d37ac 100644 --- a/content/public/test/browser_test_utils.cc +++ b/content/public/test/browser_test_utils.cc @@ -4,10 +4,13 @@ #include "content/public/test/browser_test_utils.h" +#include <stddef.h> + #include "base/auto_reset.h" #include "base/bind.h" #include "base/command_line.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/process/kill.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" @@ -16,6 +19,7 @@ #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" #include "base/values.h" +#include "build/build_config.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/browser/web_contents/web_contents_view.h" diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h index 2d3f1a6..5d94052 100644 --- a/content/public/test/browser_test_utils.h +++ b/content/public/test/browser_test_utils.h @@ -12,9 +12,11 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/process/process.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "content/public/browser/browser_message_filter.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/content/public/test/content_browser_test.cc b/content/public/test/content_browser_test.cc index 9fb7b12..64208f7 100644 --- a/content/public/test/content_browser_test.cc +++ b/content/public/test/content_browser_test.cc @@ -9,6 +9,7 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" +#include "build/build_config.h" #include "content/public/browser/render_process_host.h" #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" diff --git a/content/public/test/content_browser_test.h b/content/public/test/content_browser_test.h index 91bd0df..6b58d61 100644 --- a/content/public/test/content_browser_test.h +++ b/content/public/test/content_browser_test.h @@ -6,6 +6,7 @@ #define CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_H_ #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_base.h" diff --git a/content/public/test/content_browser_test_utils.h b/content/public/test/content_browser_test_utils.h index 68ece15..19a0034 100644 --- a/content/public/test/content_browser_test_utils.h +++ b/content/public/test/content_browser_test_utils.h @@ -6,6 +6,7 @@ #define CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_UTILS_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/common/page_type.h" #include "ui/gfx/native_widget_types.h" diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc index b81448f..664eb69 100644 --- a/content/public/test/content_test_suite_base.cc +++ b/content/public/test/content_test_suite_base.cc @@ -4,12 +4,13 @@ #include "content/public/test/content_test_suite_base.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/statistics_recorder.h" #include "base/test/test_suite.h" #include "base/threading/sequenced_worker_pool.h" +#include "build/build_config.h" #include "content/browser/browser_thread_impl.h" #include "content/common/url_schemes.h" #include "content/gpu/in_process_gpu_thread.h" diff --git a/content/public/test/content_test_suite_base.h b/content/public/test/content_test_suite_base.h index dcbd085..225e57a 100644 --- a/content/public/test/content_test_suite_base.h +++ b/content/public/test/content_test_suite_base.h @@ -5,8 +5,8 @@ #ifndef CONTENT_PUBLIC_TEST_CONTENT_TEST_SUITE_BASE_H_ #define CONTENT_PUBLIC_TEST_CONTENT_TEST_SUITE_BASE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/test/test_suite.h" namespace content { diff --git a/content/public/test/download_test_observer.cc b/content/public/test/download_test_observer.cc index 96902a1..9d05e28 100644 --- a/content/public/test/download_test_observer.cc +++ b/content/public/test/download_test_observer.cc @@ -219,7 +219,7 @@ void DownloadTestObserver::SignalIfFinished() { base::MessageLoopForUI::current()->QuitWhenIdle(); } -void DownloadTestObserver::AcceptDangerousDownload(uint32 download_id) { +void DownloadTestObserver::AcceptDangerousDownload(uint32_t download_id) { // Download manager was shutdown before the UI thread could accept the // download. if (!download_manager_) @@ -229,7 +229,7 @@ void DownloadTestObserver::AcceptDangerousDownload(uint32 download_id) { download->ValidateDangerousDownload(); } -void DownloadTestObserver::DenyDangerousDownload(uint32 download_id) { +void DownloadTestObserver::DenyDangerousDownload(uint32_t download_id) { // Download manager was shutdown before the UI thread could deny the // download. if (!download_manager_) diff --git a/content/public/test/download_test_observer.h b/content/public/test/download_test_observer.h index a921555..c7e2095 100644 --- a/content/public/test/download_test_observer.h +++ b/content/public/test/download_test_observer.h @@ -5,11 +5,14 @@ #ifndef CONTENT_PUBLIC_TEST_DOWNLOAD_TEST_OBSERVER_H_ #define CONTENT_PUBLIC_TEST_DOWNLOAD_TEST_OBSERVER_H_ +#include <stddef.h> +#include <stdint.h> + #include <set> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/browser/download_interrupt_reasons.h" #include "content/public/browser/download_item.h" @@ -116,10 +119,10 @@ class DownloadTestObserver : public DownloadManager::Observer, void SignalIfFinished(); // Fake user click on "Accept". - void AcceptDangerousDownload(uint32 download_id); + void AcceptDangerousDownload(uint32_t download_id); // Fake user click on "Deny". - void DenyDangerousDownload(uint32 download_id); + void DenyDangerousDownload(uint32_t download_id); // The observed download manager. DownloadManager* download_manager_; @@ -160,7 +163,7 @@ class DownloadTestObserver : public DownloadManager::Observer, DangerousDownloadAction dangerous_download_action_; // Holds the download ids which were dangerous. - std::set<uint32> dangerous_downloads_seen_; + std::set<uint32_t> dangerous_downloads_seen_; base::WeakPtrFactory<DownloadTestObserver> weak_factory_; @@ -278,7 +281,7 @@ class DownloadTestItemCreationObserver void WaitForDownloadItemCreation(); - uint32 download_id() const { return download_id_; } + uint32_t download_id() const { return download_id_; } DownloadInterruptReason interrupt_reason() const { return interrupt_reason_; } bool started() const { return called_back_count_ > 0; } bool succeeded() const { @@ -296,7 +299,7 @@ class DownloadTestItemCreationObserver DownloadInterruptReason interrupt_reason); // The download creation information we received. - uint32 download_id_; + uint32_t download_id_; DownloadInterruptReason interrupt_reason_; // Count of callbacks. diff --git a/content/public/test/fake_speech_recognition_manager.h b/content/public/test/fake_speech_recognition_manager.h index 914a461..2c88f8d 100644 --- a/content/public/test/fake_speech_recognition_manager.h +++ b/content/public/test/fake_speech_recognition_manager.h @@ -6,6 +6,7 @@ #define CONTENT_PUBLIC_TEST_FAKE_SPEECH_RECOGNITION_MANAGER_H_ #include "base/callback_forward.h" +#include "base/macros.h" #include "content/public/browser/speech_recognition_event_listener.h" #include "content/public/browser/speech_recognition_manager.h" #include "content/public/browser/speech_recognition_session_config.h" diff --git a/content/public/test/javascript_test_observer.h b/content/public/test/javascript_test_observer.h index ea7f615..015ac0a 100644 --- a/content/public/test/javascript_test_observer.h +++ b/content/public/test/javascript_test_observer.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/content/public/test/layouttest_support.h b/content/public/test/layouttest_support.h index 95ada03..a3171ba 100644 --- a/content/public/test/layouttest_support.h +++ b/content/public/test/layouttest_support.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_TEST_LAYOUTTEST_SUPPORT_H_ #define CONTENT_PUBLIC_TEST_LAYOUTTEST_SUPPORT_H_ +#include <stddef.h> + #include <string> #include <vector> diff --git a/content/public/test/mock_blob_url_request_context.h b/content/public/test/mock_blob_url_request_context.h index 06acf24..41aba90 100644 --- a/content/public/test/mock_blob_url_request_context.h +++ b/content/public/test/mock_blob_url_request_context.h @@ -5,6 +5,7 @@ #ifndef CONTENT_PUBLIC_TEST_MOCK_BLOB_URL_REQUEST_CONTEXT_H_ #define CONTENT_PUBLIC_TEST_MOCK_BLOB_URL_REQUEST_CONTEXT_H_ +#include "base/macros.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job.h" #include "net/url_request/url_request_job_factory_impl.h" diff --git a/content/public/test/mock_download_item.h b/content/public/test/mock_download_item.h index 7d4ec36..a01f9bd 100644 --- a/content/public/test/mock_download_item.h +++ b/content/public/test/mock_download_item.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_TEST_MOCK_DOWNLOAD_ITEM_H_ #define CONTENT_PUBLIC_TEST_MOCK_DOWNLOAD_ITEM_H_ +#include <stdint.h> + #include "base/callback.h" #include "base/observer_list.h" #include "base/time/time.h" @@ -43,7 +45,7 @@ class MockDownloadItem : public DownloadItem { MOCK_METHOD0(Remove, void()); MOCK_METHOD0(OpenDownload, void()); MOCK_METHOD0(ShowDownloadInShell, void()); - MOCK_CONST_METHOD0(GetId, uint32()); + MOCK_CONST_METHOD0(GetId, uint32_t()); MOCK_CONST_METHOD0(GetState, DownloadState()); MOCK_CONST_METHOD0(GetLastReason, DownloadInterruptReason()); MOCK_CONST_METHOD0(IsPaused, bool()); @@ -79,11 +81,11 @@ class MockDownloadItem : public DownloadItem { MOCK_CONST_METHOD0(IsDangerous, bool()); MOCK_CONST_METHOD0(GetDangerType, DownloadDangerType()); MOCK_CONST_METHOD1(TimeRemaining, bool(base::TimeDelta*)); - MOCK_CONST_METHOD0(CurrentSpeed, int64()); + MOCK_CONST_METHOD0(CurrentSpeed, int64_t()); MOCK_CONST_METHOD0(PercentComplete, int()); MOCK_CONST_METHOD0(AllDataSaved, bool()); - MOCK_CONST_METHOD0(GetTotalBytes, int64()); - MOCK_CONST_METHOD0(GetReceivedBytes, int64()); + MOCK_CONST_METHOD0(GetTotalBytes, int64_t()); + MOCK_CONST_METHOD0(GetReceivedBytes, int64_t()); MOCK_CONST_METHOD0(GetStartTime, base::Time()); MOCK_CONST_METHOD0(GetEndTime, base::Time()); MOCK_METHOD0(CanShowInFolder, bool()); diff --git a/content/public/test/mock_download_manager.cc b/content/public/test/mock_download_manager.cc index e81ca93..7e477f0 100644 --- a/content/public/test/mock_download_manager.cc +++ b/content/public/test/mock_download_manager.cc @@ -10,7 +10,7 @@ namespace content { MockDownloadManager::CreateDownloadItemAdapter::CreateDownloadItemAdapter( - uint32 id, + uint32_t id, const base::FilePath& current_path, const base::FilePath& target_path, const std::vector<GURL>& url_chain, @@ -21,8 +21,8 @@ MockDownloadManager::CreateDownloadItemAdapter::CreateDownloadItemAdapter( const base::Time& end_time, const std::string& etag, const std::string& last_modified, - int64 received_bytes, - int64 total_bytes, + int64_t received_bytes, + int64_t total_bytes, DownloadItem::DownloadState state, DownloadDangerType danger_type, DownloadInterruptReason interrupt_reason, @@ -96,7 +96,7 @@ void MockDownloadManager::StartDownload( } DownloadItem* MockDownloadManager::CreateDownloadItem( - uint32 id, + uint32_t id, const base::FilePath& current_path, const base::FilePath& target_path, const std::vector<GURL>& url_chain, @@ -107,8 +107,8 @@ DownloadItem* MockDownloadManager::CreateDownloadItem( const base::Time& end_time, const std::string& etag, const std::string& last_modified, - int64 received_bytes, - int64 total_bytes, + int64_t received_bytes, + int64_t total_bytes, DownloadItem::DownloadState state, DownloadDangerType danger_type, DownloadInterruptReason interrupt_reason, diff --git a/content/public/test/mock_download_manager.h b/content/public/test/mock_download_manager.h index a55bcee..ae9511d 100644 --- a/content/public/test/mock_download_manager.h +++ b/content/public/test/mock_download_manager.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_TEST_MOCK_DOWNLOAD_MANAGER_H_ #define CONTENT_PUBLIC_TEST_MOCK_DOWNLOAD_MANAGER_H_ +#include <stdint.h> + #include <string> #include <vector> @@ -28,7 +30,7 @@ class MockDownloadManager : public DownloadManager { // Structure to make it possible to match more than 10 arguments on // CreateDownloadItem. struct CreateDownloadItemAdapter { - uint32 id; + uint32_t id; base::FilePath current_path; base::FilePath target_path; std::vector<GURL> url_chain; @@ -39,31 +41,30 @@ class MockDownloadManager : public DownloadManager { base::Time end_time; std::string etag; std::string last_modified; - int64 received_bytes; - int64 total_bytes; + int64_t received_bytes; + int64_t total_bytes; DownloadItem::DownloadState state; DownloadDangerType danger_type; DownloadInterruptReason interrupt_reason; bool opened; - CreateDownloadItemAdapter( - uint32 id, - const base::FilePath& current_path, - const base::FilePath& target_path, - const std::vector<GURL>& url_chain, - const GURL& referrer_url, - const std::string& mime_type, - const std::string& original_mime_type, - const base::Time& start_time, - const base::Time& end_time, - const std::string& etag, - const std::string& last_modified, - int64 received_bytes, - int64 total_bytes, - DownloadItem::DownloadState state, - DownloadDangerType danger_type, - DownloadInterruptReason interrupt_reason, - bool opened); + CreateDownloadItemAdapter(uint32_t id, + const base::FilePath& current_path, + const base::FilePath& target_path, + const std::vector<GURL>& url_chain, + const GURL& referrer_url, + const std::string& mime_type, + const std::string& original_mime_type, + const base::Time& start_time, + const base::Time& end_time, + const std::string& etag, + const std::string& last_modified, + int64_t received_bytes, + int64_t total_bytes, + DownloadItem::DownloadState state, + DownloadDangerType danger_type, + DownloadInterruptReason interrupt_reason, + bool opened); // Required by clang compiler. CreateDownloadItemAdapter(const CreateDownloadItemAdapter& rhs); ~CreateDownloadItemAdapter(); @@ -105,24 +106,23 @@ class MockDownloadManager : public DownloadManager { MOCK_METHOD1(RemoveObserver, void(Observer* observer)); // Redirects to mock method to get around gmock 10 argument limit. - DownloadItem* CreateDownloadItem( - uint32 id, - const base::FilePath& current_path, - const base::FilePath& target_path, - const std::vector<GURL>& url_chain, - const GURL& referrer_url, - const std::string& mime_type, - const std::string& original_mime_type, - const base::Time& start_time, - const base::Time& end_time, - const std::string& etag, - const std::string& last_modified, - int64 received_bytes, - int64 total_bytes, - DownloadItem::DownloadState state, - DownloadDangerType danger_type, - DownloadInterruptReason interrupt_reason, - bool opened) override; + DownloadItem* CreateDownloadItem(uint32_t id, + const base::FilePath& current_path, + const base::FilePath& target_path, + const std::vector<GURL>& url_chain, + const GURL& referrer_url, + const std::string& mime_type, + const std::string& original_mime_type, + const base::Time& start_time, + const base::Time& end_time, + const std::string& etag, + const std::string& last_modified, + int64_t received_bytes, + int64_t total_bytes, + DownloadItem::DownloadState state, + DownloadDangerType danger_type, + DownloadInterruptReason interrupt_reason, + bool opened) override; MOCK_METHOD1(MockCreateDownloadItem, DownloadItem*(CreateDownloadItemAdapter adapter)); @@ -131,7 +131,7 @@ class MockDownloadManager : public DownloadManager { MOCK_CONST_METHOD0(NonMaliciousInProgressCount, int()); MOCK_CONST_METHOD0(GetBrowserContext, BrowserContext*()); MOCK_METHOD0(CheckForHistoryFilesRemoval, void()); - MOCK_METHOD1(GetDownload, DownloadItem*(uint32 id)); + MOCK_METHOD1(GetDownload, DownloadItem*(uint32_t id)); }; } // namespace content diff --git a/content/public/test/mock_render_process_host.cc b/content/public/test/mock_render_process_host.cc index 5370dc3..076f028 100644 --- a/content/public/test/mock_render_process_host.cc +++ b/content/public/test/mock_render_process_host.cc @@ -82,7 +82,7 @@ void MockRenderProcessHost::SimulateCrash() { // predictable order for unittests which may assert against the order, we sort // the listeners by descending routing ID, instead of using the arbitrary // hash-map order like RenderProcessHostImpl. - std::vector<std::pair<int32, IPC::Listener*>> sorted_listeners_; + std::vector<std::pair<int32_t, IPC::Listener*>> sorted_listeners_; IDMap<IPC::Listener>::iterator iter(&listeners_); while (!iter.IsAtEnd()) { sorted_listeners_.push_back( @@ -109,13 +109,12 @@ int MockRenderProcessHost::GetNextRoutingID() { return ++prev_routing_id_; } -void MockRenderProcessHost::AddRoute( - int32 routing_id, - IPC::Listener* listener) { +void MockRenderProcessHost::AddRoute(int32_t routing_id, + IPC::Listener* listener) { listeners_.AddWithID(listener, routing_id); } -void MockRenderProcessHost::RemoveRoute(int32 routing_id) { +void MockRenderProcessHost::RemoveRoute(int32_t routing_id) { DCHECK(listeners_.Lookup(routing_id) != NULL); listeners_.Remove(routing_id); Cleanup(); @@ -347,8 +346,7 @@ bool MockRenderProcessHost::OnMessageReceived(const IPC::Message& msg) { return false; } -void MockRenderProcessHost::OnChannelConnected(int32 peer_pid) { -} +void MockRenderProcessHost::OnChannelConnected(int32_t peer_pid) {} MockRenderProcessHostFactory::MockRenderProcessHostFactory() {} diff --git a/content/public/test/mock_render_process_host.h b/content/public/test/mock_render_process_host.h index 88f3849..03a4b9e 100644 --- a/content/public/test/mock_render_process_host.h +++ b/content/public/test/mock_render_process_host.h @@ -5,7 +5,10 @@ #ifndef CONTENT_PUBLIC_TEST_MOCK_RENDER_PROCESS_HOST_H_ #define CONTENT_PUBLIC_TEST_MOCK_RENDER_PROCESS_HOST_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/observer_list.h" #include "content/public/browser/render_process_host.h" @@ -39,8 +42,8 @@ class MockRenderProcessHost : public RenderProcessHost { void EnableSendQueue() override; bool Init() override; int GetNextRoutingID() override; - void AddRoute(int32 routing_id, IPC::Listener* listener) override; - void RemoveRoute(int32 routing_id) override; + void AddRoute(int32_t routing_id, IPC::Listener* listener) override; + void RemoveRoute(int32_t routing_id) override; void AddObserver(RenderProcessHostObserver* observer) override; void RemoveObserver(RenderProcessHostObserver* observer) override; void ShutdownForBadMessage() override; @@ -107,7 +110,7 @@ class MockRenderProcessHost : public RenderProcessHost { // IPC::Listener via RenderProcessHost. bool OnMessageReceived(const IPC::Message& msg) override; - void OnChannelConnected(int32 peer_pid) override; + void OnChannelConnected(int32_t peer_pid) override; // Attaches the factory object so we can remove this object in its destructor // and prevent MockRenderProcessHostFacotry from deleting it. diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc index 28608d7..f5347f1 100644 --- a/content/public/test/mock_render_thread.cc +++ b/content/public/test/mock_render_thread.cc @@ -6,6 +6,7 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "content/common/frame_messages.h" #include "content/common/view_messages.h" #include "content/public/renderer/render_process_observer.h" @@ -79,11 +80,9 @@ MockRenderThread::GetIOMessageLoopProxy() { return scoped_refptr<base::SingleThreadTaskRunner>(); } -void MockRenderThread::AddRoute(int32 routing_id, IPC::Listener* listener) { -} +void MockRenderThread::AddRoute(int32_t routing_id, IPC::Listener* listener) {} -void MockRenderThread::RemoveRoute(int32 routing_id) { -} +void MockRenderThread::RemoveRoute(int32_t routing_id) {} int MockRenderThread::GenerateRoutingID() { NOTREACHED(); @@ -150,19 +149,17 @@ void MockRenderThread::RegisterExtension(v8::Extension* extension) { blink::WebScriptController::registerExtension(extension); } -void MockRenderThread::ScheduleIdleHandler(int64 initial_delay_ms) { -} +void MockRenderThread::ScheduleIdleHandler(int64_t initial_delay_ms) {} void MockRenderThread::IdleHandler() { } -int64 MockRenderThread::GetIdleNotificationDelayInMs() const { +int64_t MockRenderThread::GetIdleNotificationDelayInMs() const { return 0; } void MockRenderThread::SetIdleNotificationDelayInMs( - int64 idle_notification_delay_in_ms) { -} + int64_t idle_notification_delay_in_ms) {} void MockRenderThread::UpdateHistograms(int sequence_number) { } diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h index ed9ae46..f2b89cc 100644 --- a/content/public/test/mock_render_thread.h +++ b/content/public/test/mock_render_thread.h @@ -5,9 +5,13 @@ #ifndef CONTENT_PUBLIC_TEST_MOCK_RENDER_THREAD_H_ #define CONTENT_PUBLIC_TEST_MOCK_RENDER_THREAD_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/memory/shared_memory.h" #include "base/observer_list.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "cc/test/test_shared_bitmap_manager.h" #include "content/public/renderer/render_thread.h" #include "ipc/ipc_test_sink.h" @@ -49,8 +53,8 @@ class MockRenderThread : public RenderThread { std::string GetLocale() override; IPC::SyncMessageFilter* GetSyncMessageFilter() override; scoped_refptr<base::SingleThreadTaskRunner> GetIOMessageLoopProxy() override; - void AddRoute(int32 routing_id, IPC::Listener* listener) override; - void RemoveRoute(int32 routing_id) override; + void AddRoute(int32_t routing_id, IPC::Listener* listener) override; + void RemoveRoute(int32_t routing_id) override; int GenerateRoutingID() override; void AddFilter(IPC::MessageFilter* filter) override; void RemoveFilter(IPC::MessageFilter* filter) override; @@ -65,11 +69,11 @@ class MockRenderThread : public RenderThread { size_t buffer_size) override; cc::SharedBitmapManager* GetSharedBitmapManager() override; void RegisterExtension(v8::Extension* extension) override; - void ScheduleIdleHandler(int64 initial_delay_ms) override; + void ScheduleIdleHandler(int64_t initial_delay_ms) override; void IdleHandler() override; - int64 GetIdleNotificationDelayInMs() const override; + int64_t GetIdleNotificationDelayInMs() const override; void SetIdleNotificationDelayInMs( - int64 idle_notification_delay_in_ms) override; + int64_t idle_notification_delay_in_ms) override; void UpdateHistograms(int sequence_number) override; int PostTaskToAllWebWorkers(const base::Closure& closure) override; bool ResolveProxy(const GURL& url, std::string* proxy_list) override; @@ -83,25 +87,17 @@ class MockRenderThread : public RenderThread { ////////////////////////////////////////////////////////////////////////// // The following functions are called by the test itself. - void set_routing_id(int32 id) { - routing_id_ = id; - } + void set_routing_id(int32_t id) { routing_id_ = id; } - int32 opener_id() const { - return opener_id_; - } + int32_t opener_id() const { return opener_id_; } - void set_new_window_routing_id(int32 id) { - new_window_routing_id_ = id; - } + void set_new_window_routing_id(int32_t id) { new_window_routing_id_ = id; } void set_new_window_main_frame_widget_routing_id(int32_t id) { new_window_main_frame_widget_routing_id_ = id; } - void set_new_frame_routing_id(int32 id) { - new_frame_routing_id_ = id; - } + void set_new_frame_routing_id(int32_t id) { new_frame_routing_id_ = id; } // Simulates the Widget receiving a close message. This should result // on releasing the internal reference counts and destroying the internal @@ -146,16 +142,16 @@ class MockRenderThread : public RenderThread { IPC::TestSink sink_; // Routing id what will be assigned to the Widget. - int32 routing_id_; + int32_t routing_id_; // Opener id reported by the Widget. - int32 opener_id_; + int32_t opener_id_; // Routing id that will be assigned to a CreateWindow Widget. - int32 new_window_routing_id_; - int32 new_window_main_frame_routing_id_; + int32_t new_window_routing_id_; + int32_t new_window_main_frame_routing_id_; int32_t new_window_main_frame_widget_routing_id_; - int32 new_frame_routing_id_; + int32_t new_frame_routing_id_; // The last known good deserializer for sync messages. scoped_ptr<IPC::MessageReplyDeserializer> reply_deserializer_; diff --git a/content/public/test/mock_resource_context.h b/content/public/test/mock_resource_context.h index 91ec2d3..7ec1b5c 100644 --- a/content/public/test/mock_resource_context.h +++ b/content/public/test/mock_resource_context.h @@ -5,8 +5,8 @@ #ifndef CONTENT_PUBLIC_TEST_MOCK_RESOURCE_CONTEXT_H_ #define CONTENT_PUBLIC_TEST_MOCK_RESOURCE_CONTEXT_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/resource_context.h" diff --git a/content/public/test/mock_storage_client.cc b/content/public/test/mock_storage_client.cc index 8370e6c..9858999 100644 --- a/content/public/test/mock_storage_client.cc +++ b/content/public/test/mock_storage_client.cc @@ -4,7 +4,6 @@ #include "content/public/test/mock_storage_client.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/location.h" #include "base/memory/scoped_ptr.h" @@ -43,8 +42,9 @@ void MockStorageClient::Populate( MockStorageClient::~MockStorageClient() {} -void MockStorageClient::AddOriginAndNotify( - const GURL& origin_url, StorageType type, int64 size) { +void MockStorageClient::AddOriginAndNotify(const GURL& origin_url, + StorageType type, + int64_t size) { DCHECK(origin_data_.find(make_pair(origin_url, type)) == origin_data_.end()); DCHECK_GE(size, 0); origin_data_[make_pair(origin_url, type)] = size; @@ -52,8 +52,9 @@ void MockStorageClient::AddOriginAndNotify( id(), origin_url, type, size, IncrementMockTime()); } -void MockStorageClient::ModifyOriginAndNotify( - const GURL& origin_url, StorageType type, int64 delta) { +void MockStorageClient::ModifyOriginAndNotify(const GURL& origin_url, + StorageType type, + int64_t delta) { OriginDataMap::iterator find = origin_data_.find(make_pair(origin_url, type)); DCHECK(find != origin_data_.end()); find->second += delta; @@ -177,7 +178,7 @@ void MockStorageClient::RunDeleteOriginData( OriginDataMap::iterator itr = origin_data_.find(make_pair(origin_url, type)); if (itr != origin_data_.end()) { - int64 delta = itr->second; + int64_t delta = itr->second; quota_manager_proxy_-> NotifyStorageModified(id(), origin_url, type, -delta); origin_data_.erase(itr); diff --git a/content/public/test/mock_storage_client.h b/content/public/test/mock_storage_client.h index 09ac94b..a695027 100644 --- a/content/public/test/mock_storage_client.h +++ b/content/public/test/mock_storage_client.h @@ -5,12 +5,16 @@ #ifndef CONTENT_PUBLIC_TEST_MOCK_STORAGE_CLIENT_H_ #define CONTENT_PUBLIC_TEST_MOCK_STORAGE_CLIENT_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <set> #include <string> #include <utility> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "storage/browser/quota/quota_client.h" @@ -29,7 +33,7 @@ namespace content { struct MockOriginData { const char* origin; StorageType type; - int64 usage; + int64_t usage; }; // Mock storage class for testing. @@ -42,10 +46,12 @@ class MockStorageClient : public QuotaClient { ~MockStorageClient() override; // To add or modify mock data in this client. - void AddOriginAndNotify( - const GURL& origin_url, StorageType type, int64 size); - void ModifyOriginAndNotify( - const GURL& origin_url, StorageType type, int64 delta); + void AddOriginAndNotify(const GURL& origin_url, + StorageType type, + int64_t size); + void ModifyOriginAndNotify(const GURL& origin_url, + StorageType type, + int64_t delta); void TouchAllOriginsAndNotify(); void AddOriginToErrorSet(const GURL& origin_url, StorageType type); @@ -86,7 +92,7 @@ class MockStorageClient : public QuotaClient { scoped_refptr<QuotaManagerProxy> quota_manager_proxy_; const ID id_; - typedef std::map<std::pair<GURL, StorageType>, int64> OriginDataMap; + typedef std::map<std::pair<GURL, StorageType>, int64_t> OriginDataMap; OriginDataMap origin_data_; typedef std::set<std::pair<GURL, StorageType> > ErrorOriginSet; ErrorOriginSet error_origins_; diff --git a/content/public/test/nested_message_pump_android.h b/content/public/test/nested_message_pump_android.h index 4346c83..a282f7f 100644 --- a/content/public/test/nested_message_pump_android.h +++ b/content/public/test/nested_message_pump_android.h @@ -7,6 +7,7 @@ #include "base/android/jni_android.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/message_loop/message_pump_android.h" namespace content { diff --git a/content/public/test/ppapi_test_utils.cc b/content/public/test/ppapi_test_utils.cc index 6078594..5d8c3de 100644 --- a/content/public/test/ppapi_test_utils.cc +++ b/content/public/test/ppapi_test_utils.cc @@ -8,6 +8,7 @@ #include "base/files/file_util.h" #include "base/macros.h" #include "base/path_service.h" +#include "build/build_config.h" #include "content/public/common/content_switches.h" #include "ppapi/shared_impl/ppapi_constants.h" diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc index f1a16db..e16dc426 100644 --- a/content/public/test/render_view_test.cc +++ b/content/public/test/render_view_test.cc @@ -4,11 +4,14 @@ #include "content/public/test/render_view_test.h" +#include <stddef.h> + #include <cctype> #include "base/location.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" +#include "build/build_config.h" #include "components/scheduler/renderer/renderer_scheduler.h" #include "content/app/mojo/mojo_init.h" #include "content/common/dom_storage/dom_storage_types.h" @@ -60,14 +63,14 @@ using blink::WebURLRequest; namespace { -const int32 kRouteId = 5; -const int32 kMainFrameRouteId = 6; +const int32_t kRouteId = 5; +const int32_t kMainFrameRouteId = 6; // TODO(avi): Widget routing IDs should be distinct from the view routing IDs, // once RenderWidgetHost is distilled from RenderViewHostImpl. // https://crbug.com/545684 const int32_t kMainFrameWidgetRouteId = 5; -const int32 kNewWindowRouteId = 7; -const int32 kNewFrameRouteId = 10; +const int32_t kNewWindowRouteId = 7; +const int32_t kNewFrameRouteId = 10; const int32_t kNewFrameWidgetRouteId = 7; // Converts |ascii_character| into |key_code| and returns true on success. @@ -487,7 +490,7 @@ void RenderViewTest::Reload(const GURL& url) { FrameLoadWaiter(frame).Wait(); } -uint32 RenderViewTest::GetNavigationIPCType() { +uint32_t RenderViewTest::GetNavigationIPCType() { return FrameHostMsg_DidCommitProvisionalLoad::ID; } diff --git a/content/public/test/render_view_test.h b/content/public/test/render_view_test.h index 4d6f133..27cea17 100644 --- a/content/public/test/render_view_test.h +++ b/content/public/test/render_view_test.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_TEST_RENDER_VIEW_TEST_H_ #define CONTENT_PUBLIC_TEST_RENDER_VIEW_TEST_H_ +#include <stdint.h> + #include <string> #include "base/command_line.h" @@ -12,6 +14,7 @@ #include "base/message_loop/message_loop.h" #include "base/strings/string16.h" #include "base/test/test_io_thread.h" +#include "build/build_config.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/common/main_function_params.h" #include "content/public/common/page_state.h" @@ -137,7 +140,7 @@ class RenderViewTest : public testing::Test, blink::WebLeakDetectorClient { void Reload(const GURL& url); // Returns the IPC message ID of the navigation message. - uint32 GetNavigationIPCType(); + uint32_t GetNavigationIPCType(); // Resize the view. void Resize(gfx::Size new_size, diff --git a/content/public/test/render_widget_test.cc b/content/public/test/render_widget_test.cc index 1e9bd6e..d54611d 100644 --- a/content/public/test/render_widget_test.cc +++ b/content/public/test/render_widget_test.cc @@ -4,7 +4,6 @@ #include "content/public/test/render_widget_test.h" -#include "base/basictypes.h" #include "content/renderer/render_view_impl.h" namespace content { @@ -16,7 +15,7 @@ const int RenderWidgetTest::kSmallWidth = 600; const int RenderWidgetTest::kSmallHeight = 450; const int RenderWidgetTest::kTextPositionX = 800; const int RenderWidgetTest::kTextPositionY = 600; -const uint32 RenderWidgetTest::kRedARGB = 0xFFFF0000; +const uint32_t RenderWidgetTest::kRedARGB = 0xFFFF0000; RenderWidgetTest::RenderWidgetTest() {} diff --git a/content/public/test/render_widget_test.h b/content/public/test/render_widget_test.h index 3f1a071..b0e73b8 100644 --- a/content/public/test/render_widget_test.h +++ b/content/public/test/render_widget_test.h @@ -5,7 +5,8 @@ #ifndef CONTENT_PUBLIC_TEST_RENDER_WIDGET_TEST_H_ #define CONTENT_PUBLIC_TEST_RENDER_WIDGET_TEST_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/files/file_path.h" #include "content/public/test/render_view_test.h" @@ -35,7 +36,7 @@ class RenderWidgetTest : public RenderViewTest { static const int kSmallHeight; static const int kTextPositionX; static const int kTextPositionY; - static const uint32 kRedARGB; + static const uint32_t kRedARGB; }; } // namespace content diff --git a/content/public/test/sandbox_file_system_test_helper.cc b/content/public/test/sandbox_file_system_test_helper.cc index 9e52ee8..8d09d8b 100644 --- a/content/public/test/sandbox_file_system_test_helper.cc +++ b/content/public/test/sandbox_file_system_test_helper.cc @@ -95,22 +95,21 @@ FileSystemURL SandboxFileSystemTestHelper::CreateURL( return file_system_context_->CreateCrackedFileSystemURL(origin_, type_, path); } -int64 SandboxFileSystemTestHelper::GetCachedOriginUsage() const { +int64_t SandboxFileSystemTestHelper::GetCachedOriginUsage() const { return file_system_context_->GetQuotaUtil(type_) ->GetOriginUsageOnFileTaskRunner( file_system_context_.get(), origin_, type_); } -int64 SandboxFileSystemTestHelper::ComputeCurrentOriginUsage() { +int64_t SandboxFileSystemTestHelper::ComputeCurrentOriginUsage() { usage_cache()->CloseCacheFiles(); - int64 size = base::ComputeDirectorySize(GetOriginRootPath()); + int64_t size = base::ComputeDirectorySize(GetOriginRootPath()); if (base::PathExists(GetUsageCachePath())) size -= storage::FileSystemUsageCache::kUsageFileSize; return size; } -int64 -SandboxFileSystemTestHelper::ComputeCurrentDirectoryDatabaseUsage() { +int64_t SandboxFileSystemTestHelper::ComputeCurrentDirectoryDatabaseUsage() { return base::ComputeDirectorySize( GetOriginRootPath().AppendASCII("Paths")); } diff --git a/content/public/test/sandbox_file_system_test_helper.h b/content/public/test/sandbox_file_system_test_helper.h index 2edac67..6edbf97 100644 --- a/content/public/test/sandbox_file_system_test_helper.h +++ b/content/public/test/sandbox_file_system_test_helper.h @@ -5,6 +5,8 @@ #ifndef CONTENT_PUBLIC_TEST_SANDBOX_FILE_SYSTEM_TEST_HELPER_H_ #define CONTENT_PUBLIC_TEST_SANDBOX_FILE_SYSTEM_TEST_HELPER_H_ +#include <stdint.h> + #include <string> #include "base/files/file_path.h" @@ -66,12 +68,12 @@ class SandboxFileSystemTestHelper { } // This returns cached usage size returned by QuotaUtil. - int64 GetCachedOriginUsage() const; + int64_t GetCachedOriginUsage() const; // This doesn't work with OFSFU. - int64 ComputeCurrentOriginUsage(); + int64_t ComputeCurrentOriginUsage(); - int64 ComputeCurrentDirectoryDatabaseUsage(); + int64_t ComputeCurrentDirectoryDatabaseUsage(); storage::FileSystemOperationRunner* operation_runner(); storage::FileSystemOperationContext* NewOperationContext(); diff --git a/content/public/test/test_browser_context.h b/content/public/test/test_browser_context.h index 5550164..5c09bda 100644 --- a/content/public/test/test_browser_context.h +++ b/content/public/test/test_browser_context.h @@ -8,6 +8,7 @@ #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/browser_context.h" diff --git a/content/public/test/test_browser_thread.cc b/content/public/test/test_browser_thread.cc index 62d9eb8..7092c6c 100644 --- a/content/public/test/test_browser_thread.cc +++ b/content/public/test/test_browser_thread.cc @@ -4,6 +4,7 @@ #include "content/public/test/test_browser_thread.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/threading/thread.h" #include "content/browser/browser_thread_impl.h" diff --git a/content/public/test/test_browser_thread.h b/content/public/test/test_browser_thread.h index d3a2564..83b1985 100644 --- a/content/public/test/test_browser_thread.h +++ b/content/public/test/test_browser_thread.h @@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_TEST_TEST_BROWSER_THREAD_H_ #define CONTENT_PUBLIC_TEST_TEST_BROWSER_THREAD_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/browser_thread.h" diff --git a/content/public/test/test_browser_thread_bundle.h b/content/public/test/test_browser_thread_bundle.h index c3abfeb..c4047d2 100644 --- a/content/public/test/test_browser_thread_bundle.h +++ b/content/public/test/test_browser_thread_bundle.h @@ -32,6 +32,7 @@ #ifndef CONTENT_PUBLIC_TEST_TEST_BROWSER_THREAD_BUNDLE_H_ #define CONTENT_PUBLIC_TEST_TEST_BROWSER_THREAD_BUNDLE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace base { diff --git a/content/public/test/test_content_client_initializer.cc b/content/public/test/test_content_client_initializer.cc index 0c210d2..e19f4d8 100644 --- a/content/public/test/test_content_client_initializer.cc +++ b/content/public/test/test_content_client_initializer.cc @@ -4,6 +4,7 @@ #include "content/public/test/test_content_client_initializer.h" +#include "build/build_config.h" #include "content/browser/notification_service_impl.h" #include "content/public/common/content_client.h" #include "content/public/test/mock_render_process_host.h" diff --git a/content/public/test/test_content_client_initializer.h b/content/public/test/test_content_client_initializer.h index 0e85467..ff517c0 100644 --- a/content/public/test/test_content_client_initializer.h +++ b/content/public/test/test_content_client_initializer.h @@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_TEST_TEST_CONTENT_CLIENT_INITIALIZER_H_ #define CONTENT_PUBLIC_TEST_TEST_CONTENT_CLIENT_INITIALIZER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace content { diff --git a/content/public/test/test_download_request_handler.cc b/content/public/test/test_download_request_handler.cc index 1c89e0e..107cf1f 100644 --- a/content/public/test/test_download_request_handler.cc +++ b/content/public/test/test_download_request_handler.cc @@ -7,6 +7,7 @@ #include <inttypes.h> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/sequenced_task_runner.h" @@ -99,7 +100,7 @@ class TestDownloadRequestHandler::PartialResponseJob // URLRequestJob void Start() override; void GetResponseInfo(net::HttpResponseInfo* response_info) override; - int64 GetTotalReceivedBytes() const override; + int64_t GetTotalReceivedBytes() const override; bool GetMimeType(std::string* mime_type) const override; int GetResponseCode() const override; int ReadRawData(net::IOBuffer* buf, int buf_size) override; @@ -246,7 +247,7 @@ void TestDownloadRequestHandler::PartialResponseJob::GetResponseInfo( *response_info = response_info_; } -int64 TestDownloadRequestHandler::PartialResponseJob::GetTotalReceivedBytes() +int64_t TestDownloadRequestHandler::PartialResponseJob::GetTotalReceivedBytes() const { return offset_of_next_read_ - requested_range_begin_; } diff --git a/content/public/test/test_download_request_handler.h b/content/public/test/test_download_request_handler.h index 19209a2..1b8cea0 100644 --- a/content/public/test/test_download_request_handler.h +++ b/content/public/test/test_download_request_handler.h @@ -290,7 +290,7 @@ class TestDownloadRequestHandler : public base::NonThreadSafe { // // Note: Don't use this function to generate a cryptographically secure // pseudo-random sequence. - static void GetPatternBytes(int seed, int64 offset, int length, char* data); + static void GetPatternBytes(int seed, int64_t offset, int length, char* data); private: class Interceptor; diff --git a/content/public/test/test_file_error_injector.h b/content/public/test/test_file_error_injector.h index 306c7e2..f3ab979 100644 --- a/content/public/test/test_file_error_injector.h +++ b/content/public/test/test_file_error_injector.h @@ -5,13 +5,16 @@ #ifndef CONTENT_PUBLIC_TEST_TEST_FILE_ERROR_INJECTOR_H_ #define CONTENT_PUBLIC_TEST_TEST_FILE_ERROR_INJECTOR_H_ +#include <stddef.h> + #include <map> #include <set> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "content/public/browser/download_interrupt_reasons.h" #include "url/gurl.h" diff --git a/content/public/test/test_file_system_backend.cc b/content/public/test/test_file_system_backend.cc index 7ee7352..8ebe052 100644 --- a/content/public/test/test_file_system_backend.cc +++ b/content/public/test/test_file_system_backend.cc @@ -10,6 +10,7 @@ #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/sequenced_task_runner.h" @@ -93,21 +94,22 @@ class TestFileSystemBackend::QuotaUtil : public storage::FileSystemQuotaUtil, NOTREACHED(); } - int64 GetOriginUsageOnFileTaskRunner(FileSystemContext* context, - const GURL& origin_url, - storage::FileSystemType type) override { + int64_t GetOriginUsageOnFileTaskRunner( + FileSystemContext* context, + const GURL& origin_url, + storage::FileSystemType type) override { return usage_; } // FileUpdateObserver overrides. void OnStartUpdate(const FileSystemURL& url) override {} - void OnUpdate(const FileSystemURL& url, int64 delta) override { + void OnUpdate(const FileSystemURL& url, int64_t delta) override { usage_ += delta; } void OnEndUpdate(const FileSystemURL& url) override {} private: - int64 usage_; + int64_t usage_; DISALLOW_COPY_AND_ASSIGN(QuotaUtil); }; @@ -196,8 +198,8 @@ bool TestFileSystemBackend::HasInplaceCopyImplementation( scoped_ptr<storage::FileStreamReader> TestFileSystemBackend::CreateFileStreamReader( const FileSystemURL& url, - int64 offset, - int64 max_bytes_to_read, + int64_t offset, + int64_t max_bytes_to_read, const base::Time& expected_modification_time, FileSystemContext* context) const { return scoped_ptr<storage::FileStreamReader>( @@ -208,7 +210,7 @@ TestFileSystemBackend::CreateFileStreamReader( scoped_ptr<storage::FileStreamWriter> TestFileSystemBackend::CreateFileStreamWriter( const FileSystemURL& url, - int64 offset, + int64_t offset, FileSystemContext* context) const { return scoped_ptr<storage::FileStreamWriter>( new storage::SandboxFileStreamWriter( diff --git a/content/public/test/test_file_system_backend.h b/content/public/test/test_file_system_backend.h index d1f47e4..eff9a4f 100644 --- a/content/public/test/test_file_system_backend.h +++ b/content/public/test/test_file_system_backend.h @@ -5,7 +5,10 @@ #ifndef CONTENT_PUBLIC_TEST_TEST_FILE_SYSTEM_BACKEND_H_ #define CONTENT_PUBLIC_TEST_TEST_FILE_SYSTEM_BACKEND_H_ +#include <stdint.h> + #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "storage/browser/fileapi/async_file_util_adapter.h" @@ -55,13 +58,13 @@ class TestFileSystemBackend : public storage::FileSystemBackend { storage::FileSystemType type) const override; scoped_ptr<storage::FileStreamReader> CreateFileStreamReader( const storage::FileSystemURL& url, - int64 offset, - int64 max_bytes_to_read, + int64_t offset, + int64_t max_bytes_to_read, const base::Time& expected_modification_time, storage::FileSystemContext* context) const override; scoped_ptr<storage::FileStreamWriter> CreateFileStreamWriter( const storage::FileSystemURL& url, - int64 offset, + int64_t offset, storage::FileSystemContext* context) const override; storage::FileSystemQuotaUtil* GetQuotaUtil() override; const storage::UpdateObserverList* GetUpdateObservers( diff --git a/content/public/test/test_file_system_options.cc b/content/public/test/test_file_system_options.cc index c445496..7a020dd 100644 --- a/content/public/test/test_file_system_options.cc +++ b/content/public/test/test_file_system_options.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" #include "content/public/test/test_file_system_options.h" #include <string> diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc index 597818d..8052b98 100644 --- a/content/public/test/test_launcher.cc +++ b/content/public/test/test_launcher.cc @@ -4,6 +4,8 @@ #include "content/public/test/test_launcher.h" +#include <stddef.h> + #include <map> #include <set> #include <string> @@ -15,6 +17,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" @@ -27,6 +30,7 @@ #include "base/test/test_switches.h" #include "base/test/test_timeouts.h" #include "base/time/time.h" +#include "build/build_config.h" #include "content/public/app/content_main.h" #include "content/public/app/content_main_delegate.h" #include "content/public/common/content_switches.h" diff --git a/content/public/test/test_launcher.h b/content/public/test/test_launcher.h index 8e4ced4..3f399b0 100644 --- a/content/public/test/test_launcher.h +++ b/content/public/test/test_launcher.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" namespace base { diff --git a/content/public/test/test_navigation_observer.cc b/content/public/test/test_navigation_observer.cc index 671cde1..1371ba3 100644 --- a/content/public/test/test_navigation_observer.cc +++ b/content/public/test/test_navigation_observer.cc @@ -5,6 +5,7 @@ #include "content/public/test/test_navigation_observer.h" #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/stl_util.h" diff --git a/content/public/test/test_navigation_observer.h b/content/public/test/test_navigation_observer.h index 007e6c6..20ba4ee 100644 --- a/content/public/test/test_navigation_observer.h +++ b/content/public/test/test_navigation_observer.h @@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/test/test_utils.h" #include "ui/base/page_transition_types.h" diff --git a/content/public/test/test_notification_tracker.h b/content/public/test/test_notification_tracker.h index 786ec14..c861be6 100644 --- a/content/public/test/test_notification_tracker.h +++ b/content/public/test/test_notification_tracker.h @@ -5,9 +5,12 @@ #ifndef CONTENT_PUBLIC_TEST_TEST_NOTIFICATION_TRACKER_H_ #define CONTENT_PUBLIC_TEST_TEST_NOTIFICATION_TRACKER_H_ +#include <stddef.h> + #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc index d2c3c9c..9fe0e95 100644 --- a/content/public/test/test_renderer_host.cc +++ b/content/public/test/test_renderer_host.cc @@ -5,6 +5,7 @@ #include "content/public/test/test_renderer_host.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "content/browser/frame_host/navigation_entry_impl.h" #include "content/browser/renderer_host/render_view_host_factory.h" #include "content/browser/renderer_host/render_widget_host_impl.h" diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h index 4206c16..fae14cea 100644 --- a/content/public/test/test_renderer_host.h +++ b/content/public/test/test_renderer_host.h @@ -5,8 +5,12 @@ #ifndef CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ #define CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/test/test_browser_thread_bundle.h" @@ -155,7 +159,7 @@ class RenderViewHostTester { virtual bool CreateTestRenderView(const base::string16& frame_name, int opener_frame_route_id, int proxy_routing_id, - int32 max_page_id, + int32_t max_page_id, bool created_with_opener) = 0; // Makes the WasHidden/WasShown calls to the RenderWidget that diff --git a/content/public/test/test_synchronous_compositor_android.h b/content/public/test/test_synchronous_compositor_android.h index bc9aed0..b9f0c85 100644 --- a/content/public/test/test_synchronous_compositor_android.h +++ b/content/public/test/test_synchronous_compositor_android.h @@ -5,6 +5,9 @@ #ifndef CONTENT_PUBLIC_TEST_TEST_SYNCHRONOUS_COMPOSITOR_ANDROID_H_ #define CONTENT_PUBLIC_TEST_TEST_SYNCHRONOUS_COMPOSITOR_ANDROID_H_ +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/android/synchronous_compositor.h" #include "content/public/browser/android/synchronous_compositor_client.h" diff --git a/content/public/test/test_utils.cc b/content/public/test/test_utils.cc index 76d42aa..b2c9347 100644 --- a/content/public/test/test_utils.cc +++ b/content/public/test/test_utils.cc @@ -7,11 +7,13 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/location.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" +#include "build/build_config.h" #include "content/common/site_isolation_policy.h" #include "content/public/browser/browser_child_process_host_iterator.h" #include "content/public/browser/notification_service.h" diff --git a/content/public/test/test_utils.h b/content/public/test/test_utils.h index 74a53e5..545036a 100644 --- a/content/public/test/test_utils.h +++ b/content/public/test/test_utils.h @@ -6,6 +6,7 @@ #define CONTENT_PUBLIC_TEST_TEST_UTILS_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" diff --git a/content/public/test/unittest_test_suite.cc b/content/public/test/unittest_test_suite.cc index 573838a..10791ba 100644 --- a/content/public/test/unittest_test_suite.cc +++ b/content/public/test/unittest_test_suite.cc @@ -7,6 +7,7 @@ #include "base/logging.h" #include "base/rand_util.h" #include "base/test/test_suite.h" +#include "build/build_config.h" #include "third_party/WebKit/public/web/WebKit.h" #if defined(USE_AURA) diff --git a/content/public/test/unittest_test_suite.h b/content/public/test/unittest_test_suite.h index b59cdd0..680ea3c 100644 --- a/content/public/test/unittest_test_suite.h +++ b/content/public/test/unittest_test_suite.h @@ -5,8 +5,9 @@ #ifndef CONTENT_PUBLIC_TEST_UNITTEST_TEST_SUITE_H_ #define CONTENT_PUBLIC_TEST_UNITTEST_TEST_SUITE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" namespace base { class TestSuite; diff --git a/content/public/utility/utility_thread.h b/content/public/utility/utility_thread.h index acafd1a..c76efda 100644 --- a/content/public/utility/utility_thread.h +++ b/content/public/utility/utility_thread.h @@ -5,7 +5,6 @@ #ifndef CONTENT_PUBLIC_UTILITY_UTILITY_THREAD_H_ #define CONTENT_PUBLIC_UTILITY_UTILITY_THREAD_H_ -#include "base/basictypes.h" #include "content/public/child/child_thread.h" namespace content { |