diff --git a/DEPS b/DEPS index 92760bd..9d51ba8d 100644 --- a/DEPS +++ b/DEPS
@@ -43,7 +43,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': '96269b820ee77c68eaeb82eb5223329afbee9c82', + 'v8_revision': 'b54905dd98404ab97a254420619e1477a3c85fe3', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client # and whatever else without interference from each other.
diff --git a/base/test/data/pe_image/pe_image_test_32.dll b/base/test/data/pe_image/pe_image_test_32.dll index 118ce114..539d631 100755 --- a/base/test/data/pe_image/pe_image_test_32.dll +++ b/base/test/data/pe_image/pe_image_test_32.dll Binary files differ
diff --git a/base/test/data/pe_image/pe_image_test_64.dll b/base/test/data/pe_image/pe_image_test_64.dll index 70f8ea4..8801e238 100755 --- a/base/test/data/pe_image/pe_image_test_64.dll +++ b/base/test/data/pe_image/pe_image_test_64.dll Binary files differ
diff --git a/base/threading/non_thread_safe_unittest.cc b/base/threading/non_thread_safe_unittest.cc index 955c939d..2a27c3fb 100644 --- a/base/threading/non_thread_safe_unittest.cc +++ b/base/threading/non_thread_safe_unittest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "base/threading/simple_thread.h"
diff --git a/base/threading/platform_thread.h b/base/threading/platform_thread.h index 6b52cc4..e2b09bcb 100644 --- a/base/threading/platform_thread.h +++ b/base/threading/platform_thread.h
@@ -9,8 +9,10 @@ #ifndef BASE_THREADING_PLATFORM_THREAD_H_ #define BASE_THREADING_PLATFORM_THREAD_H_ +#include <stddef.h> + #include "base/base_export.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/base/threading/platform_thread_android.cc b/base/threading/platform_thread_android.cc index b6bea49..11a6ba8d 100644 --- a/base/threading/platform_thread_android.cc +++ b/base/threading/platform_thread_android.cc
@@ -5,6 +5,7 @@ #include "base/threading/platform_thread.h" #include <errno.h> +#include <stddef.h> #include <sys/prctl.h> #include <sys/resource.h> #include <sys/types.h>
diff --git a/base/threading/platform_thread_freebsd.cc b/base/threading/platform_thread_freebsd.cc index e29e865..fe69cdb 100644 --- a/base/threading/platform_thread_freebsd.cc +++ b/base/threading/platform_thread_freebsd.cc
@@ -6,11 +6,13 @@ #include <errno.h> #include <sched.h> +#include <stddef.h> #include "base/lazy_instance.h" #include "base/logging.h" #include "base/threading/thread_id_name_manager.h" #include "base/tracked_objects.h" +#include "build/build_config.h" #if !defined(OS_NACL) #include <pthread.h>
diff --git a/base/threading/platform_thread_linux.cc b/base/threading/platform_thread_linux.cc index 48cf7443..4057ede 100644 --- a/base/threading/platform_thread_linux.cc +++ b/base/threading/platform_thread_linux.cc
@@ -6,12 +6,14 @@ #include <errno.h> #include <sched.h> +#include <stddef.h> #include "base/lazy_instance.h" #include "base/logging.h" #include "base/threading/platform_thread_internal_posix.h" #include "base/threading/thread_id_name_manager.h" #include "base/tracked_objects.h" +#include "build/build_config.h" #if !defined(OS_NACL) #include <pthread.h>
diff --git a/base/threading/platform_thread_mac.mm b/base/threading/platform_thread_mac.mm index 1ecbcd6a..df11f85 100644 --- a/base/threading/platform_thread_mac.mm +++ b/base/threading/platform_thread_mac.mm
@@ -8,6 +8,7 @@ #include <mach/mach.h> #include <mach/mach_time.h> #include <mach/thread_policy.h> +#include <stddef.h> #include <sys/resource.h> #include <algorithm> @@ -17,6 +18,7 @@ #include "base/mac/mach_logging.h" #include "base/threading/thread_id_name_manager.h" #include "base/tracked_objects.h" +#include "build/build_config.h" namespace base {
diff --git a/base/threading/platform_thread_posix.cc b/base/threading/platform_thread_posix.cc index 0adb92d..39a0073 100644 --- a/base/threading/platform_thread_posix.cc +++ b/base/threading/platform_thread_posix.cc
@@ -7,6 +7,8 @@ #include <errno.h> #include <pthread.h> #include <sched.h> +#include <stddef.h> +#include <stdint.h> #include <sys/resource.h> #include <sys/time.h> @@ -16,6 +18,7 @@ #include "base/threading/platform_thread_internal_posix.h" #include "base/threading/thread_id_name_manager.h" #include "base/threading/thread_restrictions.h" +#include "build/build_config.h" #if defined(OS_LINUX) #include <sys/syscall.h> @@ -136,9 +139,9 @@ return pthread_self(); #elif defined(OS_NACL) && !defined(__GLIBC__) // Pointers are 32-bits in NaCl. - return reinterpret_cast<int32>(pthread_self()); + return reinterpret_cast<int32_t>(pthread_self()); #elif defined(OS_POSIX) - return reinterpret_cast<int64>(pthread_self()); + return reinterpret_cast<int64_t>(pthread_self()); #endif }
diff --git a/base/threading/platform_thread_unittest.cc b/base/threading/platform_thread_unittest.cc index 1ac08a7..52f8d1ba 100644 --- a/base/threading/platform_thread_unittest.cc +++ b/base/threading/platform_thread_unittest.cc
@@ -2,10 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/compiler_specific.h" #include "base/macros.h" #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_POSIX)
diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc index 25973bc..d5bd9be 100644 --- a/base/threading/platform_thread_win.cc +++ b/base/threading/platform_thread_win.cc
@@ -4,6 +4,8 @@ #include "base/threading/platform_thread.h" +#include <stddef.h> + #include "base/debug/alias.h" #include "base/debug/profiler.h" #include "base/logging.h"
diff --git a/base/threading/sequenced_task_runner_handle.h b/base/threading/sequenced_task_runner_handle.h index c638d2fb..838c83e 100644 --- a/base/threading/sequenced_task_runner_handle.h +++ b/base/threading/sequenced_task_runner_handle.h
@@ -6,6 +6,7 @@ #define BASE_THREADING_SEQUENCED_TASK_RUNNER_HANDLE_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" namespace base {
diff --git a/base/threading/sequenced_worker_pool.cc b/base/threading/sequenced_worker_pool.cc index ed79897..05490a9 100644 --- a/base/threading/sequenced_worker_pool.cc +++ b/base/threading/sequenced_worker_pool.cc
@@ -4,6 +4,8 @@ #include "base/threading/sequenced_worker_pool.h" +#include <stdint.h> + #include <list> #include <map> #include <set> @@ -16,6 +18,7 @@ #include "base/critical_closure.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" @@ -29,6 +32,7 @@ #include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "base/tracked_objects.h" +#include "build/build_config.h" #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" @@ -62,7 +66,7 @@ int sequence_token_id; int trace_id; - int64 sequence_task_number; + int64_t sequence_task_number; SequencedWorkerPool::WorkerShutdown shutdown_behavior; tracked_objects::Location posted_from; Closure task; @@ -213,10 +217,9 @@ // Create a process-wide unique ID to represent this task in trace events. This // will be mangled with a Process ID hash to reduce the likelyhood of colliding // with MessageLoop pointers on other processes. -uint64 GetTaskTraceID(const SequencedTask& task, - void* pool) { - return (static_cast<uint64>(task.trace_id) << 32) | - static_cast<uint64>(reinterpret_cast<intptr_t>(pool)); +uint64_t GetTaskTraceID(const SequencedTask& task, void* pool) { + return (static_cast<uint64_t>(task.trace_id) << 32) | + static_cast<uint64_t>(reinterpret_cast<intptr_t>(pool)); } } // namespace @@ -347,7 +350,7 @@ int LockedGetNamedTokenID(const std::string& name); // Called from within the lock, this returns the next sequence task number. - int64 LockedGetNextSequenceTaskNumber(); + int64_t LockedGetNextSequenceTaskNumber(); // Gets new task. There are 3 cases depending on the return value: // @@ -463,7 +466,7 @@ PendingTaskSet pending_tasks_; // The next sequence number for a new sequenced task. - int64 next_sequence_task_number_; + int64_t next_sequence_task_number_; // Number of tasks in the pending_tasks_ list that are marked as blocking // shutdown. @@ -941,7 +944,7 @@ return result.id_; } -int64 SequencedWorkerPool::Inner::LockedGetNextSequenceTaskNumber() { +int64_t SequencedWorkerPool::Inner::LockedGetNextSequenceTaskNumber() { lock_.AssertAcquired(); // We assume that we never create enough tasks to wrap around. return next_sequence_task_number_++;
diff --git a/base/threading/sequenced_worker_pool.h b/base/threading/sequenced_worker_pool.h index 9369fb7ad..1616b8f 100644 --- a/base/threading/sequenced_worker_pool.h +++ b/base/threading/sequenced_worker_pool.h
@@ -5,12 +5,14 @@ #ifndef BASE_THREADING_SEQUENCED_WORKER_POOL_H_ #define BASE_THREADING_SEQUENCED_WORKER_POOL_H_ +#include <stddef.h> + #include <cstddef> #include <string> #include "base/base_export.h" -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h"
diff --git a/base/threading/sequenced_worker_pool_unittest.cc b/base/threading/sequenced_worker_pool_unittest.cc index 901c336c..d081a4e 100644 --- a/base/threading/sequenced_worker_pool_unittest.cc +++ b/base/threading/sequenced_worker_pool_unittest.cc
@@ -4,10 +4,13 @@ #include "base/threading/sequenced_worker_pool.h" +#include <stddef.h> + #include <algorithm> #include "base/bind.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h"
diff --git a/base/threading/simple_thread.h b/base/threading/simple_thread.h index 2f0eb4d..3deeb10 100644 --- a/base/threading/simple_thread.h +++ b/base/threading/simple_thread.h
@@ -40,16 +40,17 @@ #ifndef BASE_THREADING_SIMPLE_THREAD_H_ #define BASE_THREADING_SIMPLE_THREAD_H_ -#include <string> +#include <stddef.h> + #include <queue> +#include <string> #include <vector> #include "base/base_export.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/threading/platform_thread.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" +#include "base/threading/platform_thread.h" namespace base {
diff --git a/base/threading/thread.cc b/base/threading/thread.cc index 9d1ca8ef..19bf49e4 100644 --- a/base/threading/thread.cc +++ b/base/threading/thread.cc
@@ -12,6 +12,7 @@ #include "base/threading/thread_id_name_manager.h" #include "base/threading/thread_local.h" #include "base/threading/thread_restrictions.h" +#include "build/build_config.h" #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h"
diff --git a/base/threading/thread.h b/base/threading/thread.h index c8a1c803..da985da 100644 --- a/base/threading/thread.h +++ b/base/threading/thread.h
@@ -5,10 +5,13 @@ #ifndef BASE_THREADING_THREAD_H_ #define BASE_THREADING_THREAD_H_ +#include <stddef.h> + #include <string> #include "base/base_export.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/message_loop/timer_slack.h" @@ -16,6 +19,7 @@ #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" +#include "build/build_config.h" namespace base {
diff --git a/base/threading/thread_checker_unittest.cc b/base/threading/thread_checker_unittest.cc index d42cbc2..fd98f76 100644 --- a/base/threading/thread_checker_unittest.cc +++ b/base/threading/thread_checker_unittest.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "base/threading/thread_checker.h" #include "base/threading/simple_thread.h" +#include "base/threading/thread_checker.h" #include "testing/gtest/include/gtest/gtest.h" // Duplicated from base/threading/thread_checker.h so that we can be
diff --git a/base/threading/thread_collision_warner.h b/base/threading/thread_collision_warner.h index de4e9c3..4699a91 100644 --- a/base/threading/thread_collision_warner.h +++ b/base/threading/thread_collision_warner.h
@@ -9,8 +9,8 @@ #include "base/atomicops.h" #include "base/base_export.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" // A helper class alongside macros to be used to verify assumptions about thread // safety of a class.
diff --git a/base/threading/thread_collision_warner_unittest.cc b/base/threading/thread_collision_warner_unittest.cc index d7ce79ec..79ca7e2 100644 --- a/base/threading/thread_collision_warner_unittest.cc +++ b/base/threading/thread_collision_warner_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/platform_thread.h"
diff --git a/base/threading/thread_id_name_manager.h b/base/threading/thread_id_name_manager.h index 1ba7e13..f469b60 100644 --- a/base/threading/thread_id_name_manager.h +++ b/base/threading/thread_id_name_manager.h
@@ -9,7 +9,7 @@ #include <string> #include "base/base_export.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "base/threading/platform_thread.h"
diff --git a/base/threading/thread_local.h b/base/threading/thread_local.h index df9c4b7..f40420cd 100644 --- a/base/threading/thread_local.h +++ b/base/threading/thread_local.h
@@ -52,8 +52,9 @@ #define BASE_THREADING_THREAD_LOCAL_H_ #include "base/base_export.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/threading/thread_local_storage.h" +#include "build/build_config.h" #if defined(OS_POSIX) #include <pthread.h>
diff --git a/base/threading/thread_local_posix.cc b/base/threading/thread_local_posix.cc index 75ea479..8bc46ad 100644 --- a/base/threading/thread_local_posix.cc +++ b/base/threading/thread_local_posix.cc
@@ -7,6 +7,7 @@ #include <pthread.h> #include "base/logging.h" +#include "build/build_config.h" #if !defined(OS_ANDROID)
diff --git a/base/threading/thread_local_storage.cc b/base/threading/thread_local_storage.cc index ffa236f0..a7eb5278 100644 --- a/base/threading/thread_local_storage.cc +++ b/base/threading/thread_local_storage.cc
@@ -6,6 +6,7 @@ #include "base/atomicops.h" #include "base/logging.h" +#include "build/build_config.h" using base::internal::PlatformThreadLocalStorage;
diff --git a/base/threading/thread_local_storage.h b/base/threading/thread_local_storage.h index fa79eda..013b0ae 100644 --- a/base/threading/thread_local_storage.h +++ b/base/threading/thread_local_storage.h
@@ -7,7 +7,8 @@ #include "base/atomicops.h" #include "base/base_export.h" -#include "base/basictypes.h" +#include "base/macros.h" +#include "build/build_config.h" #if defined(OS_WIN) #include <windows.h>
diff --git a/base/threading/thread_local_storage_unittest.cc b/base/threading/thread_local_storage_unittest.cc index bcc1d1b..322524b 100644 --- a/base/threading/thread_local_storage_unittest.cc +++ b/base/threading/thread_local_storage_unittest.cc
@@ -7,8 +7,10 @@ #include <process.h> #endif +#include "base/macros.h" #include "base/threading/simple_thread.h" #include "base/threading/thread_local_storage.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_WIN)
diff --git a/base/threading/thread_perftest.cc b/base/threading/thread_perftest.cc index d6fbc3e..5958f1a 100644 --- a/base/threading/thread_perftest.cc +++ b/base/threading/thread_perftest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/base_switches.h" #include "base/bind.h" #include "base/command_line.h"
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h index 66b8e8d4..f0d3faf6 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h
@@ -6,7 +6,7 @@ #define BASE_THREADING_THREAD_RESTRICTIONS_H_ #include "base/base_export.h" -#include "base/basictypes.h" +#include "base/macros.h" // See comment at top of thread_checker.h #if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
diff --git a/base/threading/thread_unittest.cc b/base/threading/thread_unittest.cc index 94220810..c9c6b90 100644 --- a/base/threading/thread_unittest.cc +++ b/base/threading/thread_unittest.cc
@@ -4,6 +4,8 @@ #include "base/threading/thread.h" +#include <stddef.h> + #include <vector> #include "base/bind.h" @@ -11,6 +13,7 @@ #include "base/single_thread_task_runner.h" #include "base/synchronization/waitable_event.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h"
diff --git a/base/threading/watchdog.h b/base/threading/watchdog.h index ea3be36..f806984 100644 --- a/base/threading/watchdog.h +++ b/base/threading/watchdog.h
@@ -22,6 +22,7 @@ #include "base/base_export.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/threading/platform_thread.h"
diff --git a/base/threading/watchdog_unittest.cc b/base/threading/watchdog_unittest.cc index 627f46d8..473f3ec 100644 --- a/base/threading/watchdog_unittest.cc +++ b/base/threading/watchdog_unittest.cc
@@ -5,6 +5,7 @@ #include "base/threading/watchdog.h" #include "base/logging.h" +#include "base/macros.h" #include "base/synchronization/spin_wait.h" #include "base/threading/platform_thread.h" #include "base/time/time.h"
diff --git a/base/threading/worker_pool.cc b/base/threading/worker_pool.cc index 71b1a2b..6e07b6ef 100644 --- a/base/threading/worker_pool.cc +++ b/base/threading/worker_pool.cc
@@ -8,6 +8,7 @@ #include "base/compiler_specific.h" #include "base/debug/leak_annotations.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/task_runner.h" #include "base/threading/post_task_and_reply_impl.h" #include "base/tracked_objects.h"
diff --git a/base/threading/worker_pool_posix.cc b/base/threading/worker_pool_posix.cc index ea9ece4..53ae4e6 100644 --- a/base/threading/worker_pool_posix.cc +++ b/base/threading/worker_pool_posix.cc
@@ -4,10 +4,13 @@ #include "base/threading/worker_pool_posix.h" +#include <stddef.h> + #include "base/bind.h" #include "base/callback.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/strings/stringprintf.h" #include "base/threading/platform_thread.h"
diff --git a/base/threading/worker_pool_posix.h b/base/threading/worker_pool_posix.h index dd0ffb65..f8971ac 100644 --- a/base/threading/worker_pool_posix.h +++ b/base/threading/worker_pool_posix.h
@@ -27,9 +27,9 @@ #include <queue> #include <string> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/pending_task.h"
diff --git a/base/threading/worker_pool_posix_unittest.cc b/base/threading/worker_pool_posix_unittest.cc index 364f07d..99a9369 100644 --- a/base/threading/worker_pool_posix_unittest.cc +++ b/base/threading/worker_pool_posix_unittest.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/callback.h" +#include "base/macros.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h"
diff --git a/base/threading/worker_pool_unittest.cc b/base/threading/worker_pool_unittest.cc index 9a9ab95..27af50b 100644 --- a/base/threading/worker_pool_unittest.cc +++ b/base/threading/worker_pool_unittest.cc
@@ -13,6 +13,7 @@ #include "base/test/test_timeouts.h" #include "base/threading/thread_checker_impl.h" #include "base/time/time.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h"
diff --git a/base/win/pe_image.cc b/base/win/pe_image.cc index 984e27d..4b5d620 100644 --- a/base/win/pe_image.cc +++ b/base/win/pe_image.cc
@@ -12,8 +12,6 @@ namespace base { namespace win { -// TODO(jschuh): crbug.com/167707 Make sure this code works on 64-bit. - // Structure to perform imports enumerations. struct EnumAllImportsStorage { PEImage::EnumImportsFunction callback; @@ -213,11 +211,7 @@ // Check for forwarded exports as a special case. if (exports <= function && exports + size > function) -#pragma warning(push) -#pragma warning(disable: 4312) - // This cast generates a warning because it is 32 bit specific. - return reinterpret_cast<FARPROC>(0xFFFFFFFF); -#pragma warning(pop) + return reinterpret_cast<FARPROC>(-1); return reinterpret_cast<FARPROC>(function); } @@ -456,14 +450,14 @@ iat = reinterpret_cast<PIMAGE_THUNK_DATA>( RVAToAddr(delay_descriptor->rvaIAT)); } else { -#pragma warning(push) -#pragma warning(disable: 4312) - // These casts generate warnings because they are 32 bit specific. - module_name = reinterpret_cast<LPCSTR>(delay_descriptor->rvaDLLName); - name_table = - reinterpret_cast<PIMAGE_THUNK_DATA>(delay_descriptor->rvaINT); - iat = reinterpret_cast<PIMAGE_THUNK_DATA>(delay_descriptor->rvaIAT); -#pragma warning(pop) + // Values in IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT are 32-bit, even on 64-bit + // platforms. See section 4.8 of PECOFF image spec rev 8.3. + module_name = reinterpret_cast<LPCSTR>( + static_cast<uintptr_t>(delay_descriptor->rvaDLLName)); + name_table = reinterpret_cast<PIMAGE_THUNK_DATA>( + static_cast<uintptr_t>(delay_descriptor->rvaINT)); + iat = reinterpret_cast<PIMAGE_THUNK_DATA>( + static_cast<uintptr_t>(delay_descriptor->rvaIAT)); } if (!callback(*this, delay_descriptor, module_name, name_table, iat, @@ -495,12 +489,8 @@ import = reinterpret_cast<PIMAGE_IMPORT_BY_NAME>( RVAToAddr(name_table->u1.ForwarderString)); } else { -#pragma warning(push) -#pragma warning(disable: 4312) - // This cast generates a warning because it is 32 bit specific. import = reinterpret_cast<PIMAGE_IMPORT_BY_NAME>( name_table->u1.ForwarderString); -#pragma warning(pop) } hint = import->Hint;
diff --git a/base/win/pe_image.h b/base/win/pe_image.h index ba21d85d..4c36bcf 100644 --- a/base/win/pe_image.h +++ b/base/win/pe_image.h
@@ -146,7 +146,7 @@ // Pre: 'f' is either a zero terminated string or ordinal. // Post: if 'f' is a non-forwarded export from image, 'p' is // the exported function. If 'f' is a forwarded export - // then p is the special value 0xFFFFFFFF. In this case + // then p is the special value -1. In this case // RVAToAddr(*GetExportEntry) can be used to resolve // the string that describes the forward. FARPROC GetProcAddress(LPCSTR function_name) const;
diff --git a/base/win/pe_image_test.cc b/base/win/pe_image_test.cc index e374598a..8591495 100644 --- a/base/win/pe_image_test.cc +++ b/base/win/pe_image_test.cc
@@ -7,6 +7,8 @@ #include <cfgmgr32.h> #include <shellapi.h> +#pragma comment(linker, "/export:FwdExport=KERNEL32.CreateFileA") + extern "C" { __declspec(dllexport) void ExportFunc1() {
diff --git a/base/win/pe_image_unittest.cc b/base/win/pe_image_unittest.cc index e20af22..35b8152 100644 --- a/base/win/pe_image_unittest.cc +++ b/base/win/pe_image_unittest.cc
@@ -8,6 +8,7 @@ #include "base/files/file_path.h" #include "base/path_service.h" +#include "base/scoped_native_library.h" #include "base/win/pe_image.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" @@ -102,26 +103,26 @@ const int sections = 6; const int imports_dlls = 2; const int delay_dlls = 2; - const int exports = 2; - const int imports = 69; + const int exports = 3; + const int imports = 70; const int delay_imports = 2; - const int relocs = 632; + const int relocs = 976; #else pe_image_test_path = pe_image_test_path.Append(FILE_PATH_LITERAL("pe_image_test_32.dll")); const int sections = 5; const int imports_dlls = 2; const int delay_dlls = 2; - const int exports = 2; + const int exports = 3; const int imports = 66; const int delay_imports = 2; - const int relocs = 1586; + const int relocs = 2114; #endif - HMODULE module = LoadLibrary(pe_image_test_path.value().c_str()); - ASSERT_TRUE(NULL != module); + ScopedNativeLibrary module(pe_image_test_path); + ASSERT_TRUE(module.is_valid()); - PEImage pe(module); + PEImage pe(module.get()); int count = 0; EXPECT_TRUE(pe.VerifyMagic()); @@ -151,16 +152,14 @@ count = 0; pe.EnumRelocs(RelocsCallback, &count); EXPECT_EQ(relocs, count); - - FreeLibrary(module); } // Tests that we can locate an specific exported symbol, by name and by ordinal. TEST(PEImageTest, RetrievesExports) { - HMODULE module = LoadLibrary(L"advapi32.dll"); - ASSERT_TRUE(NULL != module); + ScopedNativeLibrary module(FilePath(L"advapi32.dll")); + ASSERT_TRUE(module.is_valid()); - PEImage pe(module); + PEImage pe(module.get()); WORD ordinal; EXPECT_TRUE(pe.GetProcOrdinal("RegEnumKeyExW", &ordinal)); @@ -170,16 +169,44 @@ EXPECT_TRUE(address1 != NULL); EXPECT_TRUE(address2 != NULL); EXPECT_TRUE(address1 == address2); +} - FreeLibrary(module); +// Tests that we can locate a forwarded export. +TEST(PEImageTest, ForwardedExport) { + base::FilePath pe_image_test_path; + ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &pe_image_test_path)); + pe_image_test_path = pe_image_test_path.Append(FILE_PATH_LITERAL("pe_image")); + +#if defined(ARCH_CPU_64_BITS) + pe_image_test_path = + pe_image_test_path.Append(FILE_PATH_LITERAL("pe_image_test_64.dll")); +#else + pe_image_test_path = + pe_image_test_path.Append(FILE_PATH_LITERAL("pe_image_test_32.dll")); +#endif + + ScopedNativeLibrary module(pe_image_test_path); + + ASSERT_TRUE(module.is_valid()); + + PEImage pe(module.get()); + + FARPROC addr = pe.GetProcAddress("FwdExport"); + EXPECT_EQ(FARPROC(-1), addr); + + PDWORD export_entry = pe.GetExportEntry("FwdExport"); + EXPECT_NE(nullptr, export_entry); + PVOID fwd_addr = pe.RVAToAddr(*export_entry); + const char expected_fwd[] = "KERNEL32.CreateFileA"; + EXPECT_STREQ(expected_fwd, reinterpret_cast<char*>(fwd_addr)); } // Test that we can get debug id out of a module. TEST(PEImageTest, GetDebugId) { - HMODULE module = LoadLibrary(L"advapi32.dll"); - ASSERT_TRUE(NULL != module); + ScopedNativeLibrary module(FilePath(L"advapi32.dll")); + ASSERT_TRUE(module.is_valid()); - PEImage pe(module); + PEImage pe(module.get()); GUID guid = {0}; DWORD age = 0; EXPECT_TRUE(pe.GetDebugId(&guid, &age)); @@ -187,7 +214,6 @@ GUID empty_guid = {0}; EXPECT_TRUE(!IsEqualGUID(empty_guid, guid)); EXPECT_NE(0U, age); - FreeLibrary(module); } } // namespace win
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc index 15db4a5..e6fe5f91 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" +#include <stddef.h> +#include <stdint.h> + #include "ash/audio/sounds.h" #include "ash/autoclick/autoclick_controller.h" #include "ash/high_contrast/high_contrast_controller.h" @@ -16,6 +19,7 @@ #include "base/callback.h" #include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/metrics/histogram.h" @@ -1048,8 +1052,9 @@ IsVirtualKeyboardEnabled()); UMA_HISTOGRAM_BOOLEAN("Accessibility.CrosStickyKeys", IsStickyKeysEnabled()); if (MagnificationManager::Get()) { - uint32 type = MagnificationManager::Get()->IsMagnifierEnabled() ? - MagnificationManager::Get()->GetMagnifierType() : 0; + uint32_t type = MagnificationManager::Get()->IsMagnifierEnabled() + ? MagnificationManager::Get()->GetMagnifierType() + : 0; // '0' means magnifier is disabled. UMA_HISTOGRAM_ENUMERATION("Accessibility.CrosScreenMagnifier", type,
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.h b/chrome/browser/chromeos/accessibility/accessibility_manager.h index 9a905b9..ea9ebdc 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager.h +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.h
@@ -11,6 +11,7 @@ #include "ash/shell_observer.h" #include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/scoped_observer.h"
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc index 36e7713..4c2f7d13 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
@@ -7,6 +7,7 @@ #include "ash/magnifier/magnification_controller.h" #include "ash/shell.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/chromeos/accessibility/chromevox_panel.cc b/chrome/browser/chromeos/accessibility/chromevox_panel.cc index 9677ee0..28a8f90c5 100644 --- a/chrome/browser/chromeos/accessibility/chromevox_panel.cc +++ b/chrome/browser/chromeos/accessibility/chromevox_panel.cc
@@ -5,6 +5,7 @@ #include "ash/shelf/shelf_layout_manager.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" +#include "base/macros.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" #include "chrome/browser/chromeos/accessibility/chromevox_panel.h" #include "chrome/common/extensions/extension_constants.h"
diff --git a/chrome/browser/chromeos/accessibility/chromevox_panel.h b/chrome/browser/chromeos/accessibility/chromevox_panel.h index 6079c079..d03b998 100644 --- a/chrome/browser/chromeos/accessibility/chromevox_panel.h +++ b/chrome/browser/chromeos/accessibility/chromevox_panel.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_CHROMEVOX_PANEL_H_ #define CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_CHROMEVOX_PANEL_H_ +#include <stdint.h> + #include "base/macros.h" #include "ui/gfx/display_observer.h" #include "ui/views/widget/widget_delegate.h"
diff --git a/chrome/browser/chromeos/accessibility/magnification_controller_browsertest.cc b/chrome/browser/chromeos/accessibility/magnification_controller_browsertest.cc index 45c457fe..a1383fb3 100644 --- a/chrome/browser/chromeos/accessibility/magnification_controller_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/magnification_controller_browsertest.cc
@@ -8,6 +8,7 @@ #include "ash/screen_util.h" #include "ash/shell.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/timer/timer.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
diff --git a/chrome/browser/chromeos/accessibility/magnification_manager.cc b/chrome/browser/chromeos/accessibility/magnification_manager.cc index d1cb19c..d51c8ec 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager.cc +++ b/chrome/browser/chromeos/accessibility/magnification_manager.cc
@@ -12,6 +12,7 @@ #include "ash/shell.h" #include "ash/shell_delegate.h" #include "ash/system/tray/system_tray_notifier.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/prefs/pref_member.h"
diff --git a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc index 2cec6c3..e06fc8b 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc
@@ -7,6 +7,7 @@ #include "ash/magnifier/magnification_controller.h" #include "ash/shell.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/chromeos/accessibility/speech_monitor.h b/chrome/browser/chromeos/accessibility/speech_monitor.h index f7bbf3b..d8b10eb 100644 --- a/chrome/browser/chromeos/accessibility/speech_monitor.h +++ b/chrome/browser/chromeos/accessibility/speech_monitor.h
@@ -7,6 +7,7 @@ #include <deque> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/speech/tts_platform.h" #include "content/public/test/test_utils.h"
diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc index bc9b381c..76b434e 100644 --- a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
@@ -9,6 +9,7 @@ #include "ash/shell.h" #include "ash/system/tray/system_tray.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/pattern.h" #include "base/strings/string_util.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h b/chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h index d4ad488..5afc35c 100644 --- a/chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h +++ b/chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "content/public/browser/web_contents_delegate.h" #include "ui/events/event_rewriter.h"
diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter_unittest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter_unittest.cc index 3b73ec2..4f0eb54 100644 --- a/chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter_unittest.cc +++ b/chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter_unittest.cc
@@ -6,6 +6,7 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "base/macros.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/events/event.h"
diff --git a/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc b/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc index a3852f2..2dcc440 100644 --- a/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc
@@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "ash/shell.h" #include "ash/sticky_keys/sticky_keys_controller.h" #include "ash/sticky_keys/sticky_keys_overlay.h" #include "ash/system/tray/system_tray.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc index 4626586..cf90ec7e 100644 --- a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc
@@ -7,8 +7,10 @@ #include "ash/accessibility_delegate.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "base/macros.h" #include "base/test/simple_test_tick_clock.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/chromeos/app_mode/app_launch_utils.cc b/chrome/browser/chromeos/app_mode/app_launch_utils.cc index d5a4c49..98c59f3 100644 --- a/chrome/browser/chromeos/app_mode/app_launch_utils.cc +++ b/chrome/browser/chromeos/app_mode/app_launch_utils.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" +#include "base/macros.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h" #include "chrome/browser/lifetime/application_lifetime.h"
diff --git a/chrome/browser/chromeos/app_mode/app_session.cc b/chrome/browser/chromeos/app_mode/app_session.cc index 9c4804e..73d760c 100644 --- a/chrome/browser/chromeos/app_mode/app_session.cc +++ b/chrome/browser/chromeos/app_mode/app_session.cc
@@ -7,9 +7,9 @@ #include <errno.h> #include <signal.h> -#include "base/basictypes.h" #include "base/bind.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/app_mode/certificate_manager_dialog.h b/chrome/browser/chromeos/app_mode/certificate_manager_dialog.h index 3c4117b..5924568 100644 --- a/chrome/browser/chromeos/app_mode/certificate_manager_dialog.h +++ b/chrome/browser/chromeos/app_mode/certificate_manager_dialog.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_CERTIFICATE_MANAGER_DIALOG_H_ #define CHROME_BROWSER_CHROMEOS_APP_MODE_CERTIFICATE_MANAGER_DIALOG_H_ +#include "base/macros.h" #include "chrome/browser/chromeos/login/ui/login_web_dialog.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/chromeos/app_mode/fake_cws.h b/chrome/browser/chromeos/app_mode/fake_cws.h index 02ed184..583d90d1 100644 --- a/chrome/browser/chromeos/app_mode/fake_cws.h +++ b/chrome/browser/chromeos/app_mode/fake_cws.h
@@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc index 1f88f657e..eb68da00 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_data.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.h b/chrome/browser/chromeos/app_mode/kiosk_app_data.h index 44104ad..57509e6 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_data.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/webstore_data_fetcher_delegate.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h b/chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h index c6572de..c4544b23 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc index b51f66b..9da50402 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" +#include <stddef.h> + #include <map> #include <set>
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h index c2b46b0..ee80b49 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/observer_list.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc index 66754354..df82709 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h index 013e4d1..91c5857 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/timer/timer.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc index e9269264c..5307b33 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc
@@ -6,7 +6,6 @@ #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h" @@ -15,6 +14,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc index 59631ea..384d1a2 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.h b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.h index 21b0902b..92de7aae1 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.h +++ b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/api/feedback_private/feedback_service.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_external_update_validator.h b/chrome/browser/chromeos/app_mode/kiosk_external_update_validator.h index 09e964db..b5c9287 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_external_update_validator.h +++ b/chrome/browser/chromeos/app_mode/kiosk_external_update_validator.h
@@ -8,6 +8,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner.h" #include "extensions/browser/sandboxed_unpacker.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_external_updater.h b/chrome/browser/chromeos/app_mode/kiosk_external_updater.h index f56b0f72..a76f81b 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_external_updater.h +++ b/chrome/browser/chromeos/app_mode/kiosk_external_updater.h
@@ -8,6 +8,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h index 886f82a..e7f5b0f 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h +++ b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_MODE_IDLE_APP_NAME_NOTIFICATION_H_ #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_MODE_IDLE_APP_NAME_NOTIFICATION_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" #include "chromeos/dbus/power_manager_client.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc b/chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc index 5612da0..21436af 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/app_mode/kiosk_profile_loader.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_profile_loader.h b/chrome/browser/chromeos/app_mode/kiosk_profile_loader.h index 3727ce3b..8aa593e 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_profile_loader.h +++ b/chrome/browser/chromeos/app_mode/kiosk_profile_loader.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" #include "chrome/browser/chromeos/login/session/user_session_manager.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_session_plugin_handler.cc b/chrome/browser/chromeos/app_mode/kiosk_session_plugin_handler.cc index f73bb93..96c1a46a 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_session_plugin_handler.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_session_plugin_handler.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.h b/chrome/browser/chromeos/app_mode/startup_app_launcher.h index d113450..4f4770bd 100644 --- a/chrome/browser/chromeos/app_mode/startup_app_launcher.h +++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
diff --git a/chrome/browser/chromeos/attestation/attestation_ca_client.h b/chrome/browser/chromeos/attestation/attestation_ca_client.h index 30d22a7..c362ebc 100644 --- a/chrome/browser/chromeos/attestation/attestation_ca_client.h +++ b/chrome/browser/chromeos/attestation/attestation_ca_client.h
@@ -8,8 +8,7 @@ #include <map> #include <string> -#include "base/basictypes.h" - +#include "base/macros.h" #include "chromeos/attestation/attestation_flow.h" #include "net/url_request/url_fetcher_delegate.h"
diff --git a/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc b/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc index ad16b6e..31aaa205 100644 --- a/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc +++ b/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/threading/platform_thread.h"
diff --git a/chrome/browser/chromeos/attestation/attestation_policy_observer.h b/chrome/browser/chromeos/attestation/attestation_policy_observer.h index fa1a64d..86f225d 100644 --- a/chrome/browser/chromeos/attestation/attestation_policy_observer.h +++ b/chrome/browser/chromeos/attestation/attestation_policy_observer.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/settings/cros_settings.h"
diff --git a/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc b/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc index 5b2a2fbc..f5a25561 100644 --- a/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc +++ b/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include "base/bind.h" @@ -28,9 +30,9 @@ namespace { -const int64 kCertValid = 90; -const int64 kCertExpiringSoon = 20; -const int64 kCertExpired = -20; +const int64_t kCertValid = 90; +const int64_t kCertExpiringSoon = 20; +const int64_t kCertExpired = -20; void DBusCallbackFalse(const BoolDBusMethodCallback& callback) { base::MessageLoop::current()->PostTask(
diff --git a/chrome/browser/chromeos/attestation/fake_certificate.cc b/chrome/browser/chromeos/attestation/fake_certificate.cc index 42e8d4aa..36035934 100644 --- a/chrome/browser/chromeos/attestation/fake_certificate.cc +++ b/chrome/browser/chromeos/attestation/fake_certificate.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/attestation/fake_certificate.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/time/time.h" #include "crypto/rsa_private_key.h" #include "net/cert/x509_certificate.h" @@ -15,7 +18,7 @@ namespace { // A test key encoded as ASN.1 PrivateKeyInfo from PKCS #8. -const uint8 kTestKeyData[] = { +const uint8_t kTestKeyData[] = { 0x30, 0x82, 0x01, 0x55, 0x02, 0x01, 0x00, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 0x01, 0x3f, 0x30, 0x82, 0x01, 0x3b, 0x02, 0x01, 0x00, 0x02, 0x41, 0x00, @@ -57,9 +60,8 @@ valid_start = valid_expiry - base::TimeDelta::FromDays(1); } scoped_ptr<crypto::RSAPrivateKey> test_key( - crypto::RSAPrivateKey::CreateFromPrivateKeyInfo( - std::vector<uint8>(&kTestKeyData[0], - &kTestKeyData[arraysize(kTestKeyData)]))); + crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(std::vector<uint8_t>( + &kTestKeyData[0], &kTestKeyData[arraysize(kTestKeyData)]))); if (!test_key.get()) { return false; }
diff --git a/chrome/browser/chromeos/attestation/platform_verification_dialog.cc b/chrome/browser/chromeos/attestation/platform_verification_dialog.cc index f2deb6f1b..7344761d 100644 --- a/chrome/browser/chromeos/attestation/platform_verification_dialog.cc +++ b/chrome/browser/chromeos/attestation/platform_verification_dialog.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/attestation/platform_verification_dialog.h" +#include <stddef.h> + #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/chromeos/attestation/platform_verification_dialog.h b/chrome/browser/chromeos/attestation/platform_verification_dialog.h index 7a13fe0..123cc3c7 100644 --- a/chrome/browser/chromeos/attestation/platform_verification_dialog.h +++ b/chrome/browser/chromeos/attestation/platform_verification_dialog.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_ATTESTATION_PLATFORM_VERIFICATION_DIALOG_H_ #define CHROME_BROWSER_CHROMEOS_ATTESTATION_PLATFORM_VERIFICATION_DIALOG_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "content/public/browser/web_contents_observer.h" #include "ui/views/controls/styled_label_listener.h"
diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow.cc b/chrome/browser/chromeos/attestation/platform_verification_flow.cc index 90242a3..4fda73640 100644 --- a/chrome/browser/chromeos/attestation/platform_verification_flow.cc +++ b/chrome/browser/chromeos/attestation/platform_verification_flow.cc
@@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow.h b/chrome/browser/chromeos/attestation/platform_verification_flow.h index 8b8b0b1..55f6d13 100644 --- a/chrome/browser/chromeos/attestation/platform_verification_flow.h +++ b/chrome/browser/chromeos/attestation/platform_verification_flow.h
@@ -8,8 +8,8 @@ #include <set> #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc b/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc index 839e172..14dbb66 100644 --- a/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc +++ b/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc
@@ -2,10 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <algorithm> #include <string> #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "chrome/browser/chromeos/attestation/attestation_signed_data.pb.h"
diff --git a/chrome/browser/chromeos/attestation/platform_verification_impl.h b/chrome/browser/chromeos/attestation/platform_verification_impl.h index a284db63..a41d5ce 100644 --- a/chrome/browser/chromeos/attestation/platform_verification_impl.h +++ b/chrome/browser/chromeos/attestation/platform_verification_impl.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/memory/ref_counted.h" #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"
diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc index 8fb24246e..d91d717b 100644 --- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc +++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
@@ -9,6 +9,7 @@ #include "ash/wm/window_animations.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h" #include "chrome/browser/chromeos/login/startup_utils.h"
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h b/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h index 2ad2317..1b693d45 100644 --- a/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h +++ b/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/values.h" #include "ui/gfx/native_widget_types.h" #include "ui/web_dialogs/web_dialog_delegate.h"
diff --git a/chrome/browser/chromeos/boot_times_recorder.cc b/chrome/browser/chromeos/boot_times_recorder.cc index ea37765..83a6585 100644 --- a/chrome/browser/chromeos/boot_times_recorder.cc +++ b/chrome/browser/chromeos/boot_times_recorder.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/boot_times_recorder.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/bind.h" @@ -113,7 +116,7 @@ // Name of the time that Chrome's main() is called. static const base::FilePath::CharType kChromeMain[] = FPL("chrome-main"); // Delay in milliseconds before writing the login times to disk. -static const int64 kLoginTimeWriteDelayMs = 3000; +static const int64_t kLoginTimeWriteDelayMs = 3000; // Names of login stats files. static const base::FilePath::CharType kLoginSuccess[] = FPL("login-success");
diff --git a/chrome/browser/chromeos/boot_times_recorder.h b/chrome/browser/chromeos/boot_times_recorder.h index ae0fa17..0d633a11 100644 --- a/chrome/browser/chromeos/boot_times_recorder.h +++ b/chrome/browser/chromeos/boot_times_recorder.h
@@ -11,6 +11,7 @@ #include "base/atomic_sequence_num.h" #include "base/callback_forward.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" #include "chromeos/login_event_recorder.h"
diff --git a/chrome/browser/chromeos/camera_detector.h b/chrome/browser/chromeos/camera_detector.h index 8194e2e..d30855d 100644 --- a/chrome/browser/chromeos/camera_detector.h +++ b/chrome/browser/chromeos/camera_detector.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_CAMERA_DETECTOR_H_ #include "base/callback.h" +#include "base/macros.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/camera_presence_notifier.h b/chrome/browser/chromeos/camera_presence_notifier.h index 423247c..0c603bc 100644 --- a/chrome/browser/chromeos/camera_presence_notifier.h +++ b/chrome/browser/chromeos/camera_presence_notifier.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_CAMERA_PRESENCE_NOTIFIER_H_ #define CHROME_BROWSER_CHROMEOS_CAMERA_PRESENCE_NOTIFIER_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/chromeos/certificate_provider/certificate_provider_service.cc b/chrome/browser/chromeos/certificate_provider/certificate_provider_service.cc index c9294d9..a6038410 100644 --- a/chrome/browser/chromeos/certificate_provider/certificate_provider_service.cc +++ b/chrome/browser/chromeos/certificate_provider/certificate_provider_service.cc
@@ -4,11 +4,14 @@ #include "chrome/browser/chromeos/certificate_provider/certificate_provider_service.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/strings/string_piece.h" #include "base/task_runner.h"
diff --git a/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.cc b/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.cc index 22c4c253..73bbe095 100644 --- a/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.cc +++ b/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.cc
@@ -8,6 +8,7 @@ #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/chromeos/certificate_provider/certificate_provider_service_unittest.cc b/chrome/browser/chromeos/certificate_provider/certificate_provider_service_unittest.cc index 963f3c1..4fb0c01 100644 --- a/chrome/browser/chromeos/certificate_provider/certificate_provider_service_unittest.cc +++ b/chrome/browser/chromeos/certificate_provider/certificate_provider_service_unittest.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/chromeos/certificate_provider/certificate_provider_service.h" +#include <stdint.h> + #include <set> #include "base/bind.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/test/test_mock_time_task_runner.h" #include "base/thread_task_runner_handle.h"
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index 33f04e4..dbb7b66 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" +#include <stddef.h> + #include <string> #include <vector> @@ -15,6 +17,7 @@ #include "base/files/file_util.h" #include "base/lazy_instance.h" #include "base/linux_util.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h index 01bcb69..dc2bb36 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/task/cancelable_task_tracker.h" #include "chrome/browser/chrome_browser_main_linux.h"
diff --git a/chrome/browser/chromeos/customization/customization_document.cc b/chrome/browser/chromeos/customization/customization_document.cc index bf7028b..6ca7285 100644 --- a/chrome/browser/chromeos/customization/customization_document.cc +++ b/chrome/browser/chromeos/customization/customization_document.cc
@@ -13,6 +13,7 @@ #include "base/i18n/rtl.h" #include "base/json/json_reader.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram.h" #include "base/path_service.h"
diff --git a/chrome/browser/chromeos/customization/customization_document.h b/chrome/browser/chromeos/customization/customization_document.h index 24dfdac..688cf23f 100644 --- a/chrome/browser/chromeos/customization/customization_document.h +++ b/chrome/browser/chromeos/customization/customization_document.h
@@ -5,11 +5,14 @@ #ifndef CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_CUSTOMIZATION_DOCUMENT_H_ #define CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_CUSTOMIZATION_DOCUMENT_H_ +#include <stddef.h> + #include <string> #include <vector> #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/customization/customization_document_browsertest.cc b/chrome/browser/chromeos/customization/customization_document_browsertest.cc index fc61d5d..4c8a3bc 100644 --- a/chrome/browser/chromeos/customization/customization_document_browsertest.cc +++ b/chrome/browser/chromeos/customization/customization_document_browsertest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/chromeos/customization/customization_wallpaper_downloader.h b/chrome/browser/chromeos/customization/customization_wallpaper_downloader.h index a3fa728..6dcb872b 100644 --- a/chrome/browser/chromeos/customization/customization_wallpaper_downloader.h +++ b/chrome/browser/chromeos/customization/customization_wallpaper_downloader.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_CUSTOMIZATION_WALLPAPER_DOWNLOADER_H_ #define CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_CUSTOMIZATION_WALLPAPER_DOWNLOADER_H_ +#include <stddef.h> + #include <string> #include "base/bind.h"
diff --git a/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc b/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc index 63ae3a0..62b4d5f 100644 --- a/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc +++ b/chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.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 <stddef.h> #include <vector> @@ -9,6 +10,7 @@ #include "ash/shell.h" #include "base/command_line.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/time/time.h" #include "chrome/browser/chromeos/customization/customization_document.h"
diff --git a/chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h b/chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h index 2d15a02..0554e874 100644 --- a/chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h +++ b/chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_DBUS_CHROME_CONSOLE_SERVICE_PROVIDER_DELEGATE_H_ #define CHROME_BROWSER_CHROMEOS_DBUS_CHROME_CONSOLE_SERVICE_PROVIDER_DELEGATE_H_ +#include "base/macros.h" #include "chromeos/dbus/services/console_service_provider.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h b/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h index 6f7f6446..1690931e 100644 --- a/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h +++ b/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_DBUS_CHROME_DISPLAY_POWER_SERVICE_PROVIDER_DELEGATE_H_ #define CHROME_BROWSER_CHROMEOS_DBUS_CHROME_DISPLAY_POWER_SERVICE_PROVIDER_DELEGATE_H_ +#include "base/macros.h" #include "chromeos/dbus/services/display_power_service_provider.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h b/chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h index da19269..62b6a2d 100644 --- a/chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h +++ b/chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_DBUS_CHROME_PROXY_RESOLVER_DELEGATE_H_ #define CHROME_BROWSER_CHROMEOS_DBUS_CHROME_PROXY_RESOLVER_DELEGATE_H_ +#include "base/macros.h" #include "chromeos/dbus/services/proxy_resolution_service_provider.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/dbus/screen_lock_service_provider.h b/chrome/browser/chromeos/dbus/screen_lock_service_provider.h index a2c282b8..4238f07 100644 --- a/chrome/browser/chromeos/dbus/screen_lock_service_provider.h +++ b/chrome/browser/chromeos/dbus/screen_lock_service_provider.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chromeos/dbus/services/cros_dbus_service.h"
diff --git a/chrome/browser/chromeos/device/input_service_proxy.cc b/chrome/browser/chromeos/device/input_service_proxy.cc index 2779d4c..7172f4a9 100644 --- a/chrome/browser/chromeos/device/input_service_proxy.cc +++ b/chrome/browser/chromeos/device/input_service_proxy.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/device/input_service_proxy.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/task_runner_util.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/device/input_service_proxy.h b/chrome/browser/chromeos/device/input_service_proxy.h index faf7bb1..ca8e7c3 100644 --- a/chrome/browser/chromeos/device/input_service_proxy.h +++ b/chrome/browser/chromeos/device/input_service_proxy.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/chromeos/device_uma.h b/chrome/browser/chromeos/device_uma.h index d6c16d6c..c601cabc 100644 --- a/chrome/browser/chromeos/device_uma.h +++ b/chrome/browser/chromeos/device_uma.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_DEVICE_UMA_H_ #define CHROME_BROWSER_CHROMEOS_DEVICE_UMA_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/events/platform/platform_event_observer.h" namespace base {
diff --git a/chrome/browser/chromeos/display/display_configuration_observer.h b/chrome/browser/chromeos/display/display_configuration_observer.h index 8a5e261..709dfe9 100644 --- a/chrome/browser/chromeos/display/display_configuration_observer.h +++ b/chrome/browser/chromeos/display/display_configuration_observer.h
@@ -6,8 +6,8 @@ #define CHROME_BROWSER_CHROMEOS_DISPLAY_DISPLAY_CONFIGURATION_OBSERVER_H_ #include "ash/display/window_tree_host_manager.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc index 104a89d4..a3f9666 100644 --- a/chrome/browser/chromeos/display/display_preferences.cc +++ b/chrome/browser/chromeos/display/display_preferences.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/display/display_preferences.h" +#include <stddef.h> + #include "ash/display/display_layout_store.h" #include "ash/display/display_manager.h" #include "ash/display/display_pref_util.h" @@ -124,8 +126,8 @@ if (it.key().find(",") != std::string::npos) { std::vector<std::string> ids = base::SplitString( it.key(), ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); - int64 id1 = gfx::Display::kInvalidDisplayID; - int64 id2 = gfx::Display::kInvalidDisplayID; + int64_t id1 = gfx::Display::kInvalidDisplayID; + int64_t id2 = gfx::Display::kInvalidDisplayID; if (!base::StringToInt64(ids[0], &id1) || !base::StringToInt64(ids[1], &id2) || id1 == gfx::Display::kInvalidDisplayID || @@ -146,7 +148,7 @@ const base::DictionaryValue* dict_value = NULL; if (!it.value().GetAsDictionary(&dict_value) || dict_value == NULL) continue; - int64 id = gfx::Display::kInvalidDisplayID; + int64_t id = gfx::Display::kInvalidDisplayID; if (!base::StringToInt64(it.key(), &id) || id == gfx::Display::kInvalidDisplayID) { continue; @@ -249,7 +251,7 @@ size_t num = display_manager->GetNumDisplays(); for (size_t i = 0; i < num; ++i) { const gfx::Display& display = display_manager->GetDisplayAt(i); - int64 id = display.id(); + int64_t id = display.id(); ash::DisplayInfo info = display_manager->GetDisplayInfo(id); scoped_ptr<base::DictionaryValue> property_value( @@ -392,8 +394,8 @@ } // Stores the display layout for given display pairs. -void StoreDisplayLayoutPrefForTest(int64 id1, - int64 id2, +void StoreDisplayLayoutPrefForTest(int64_t id1, + int64_t id2, const ash::DisplayLayout& layout) { StoreDisplayLayoutPref(ash::CreateDisplayIdPair(id1, id2), layout); }
diff --git a/chrome/browser/chromeos/display/display_preferences.h b/chrome/browser/chromeos/display/display_preferences.h index eb40a214..e8cddd7 100644 --- a/chrome/browser/chromeos/display/display_preferences.h +++ b/chrome/browser/chromeos/display/display_preferences.h
@@ -5,7 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_DISPLAY_DISPLAY_PREFERENCES_H_ #define CHROME_BROWSER_CHROMEOS_DISPLAY_DISPLAY_PREFERENCES_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "third_party/cros_system_api/dbus/service_constants.h" class PrefRegistrySimple; @@ -42,8 +43,8 @@ void LoadDisplayPreferences(bool first_run_after_boot); // Stores the display layout for given display pairs for tests. -void StoreDisplayLayoutPrefForTest(int64 id1, - int64 id2, +void StoreDisplayLayoutPrefForTest(int64_t id1, + int64_t id2, const ash::DisplayLayout& layout); // Stores the given |power_state| for tests.
diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc index 51fde15e..4d7f5cb7 100644 --- a/chrome/browser/chromeos/display/display_preferences_unittest.cc +++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/display/display_preferences.h" +#include <stdint.h> + #include <string> #include <vector> @@ -18,6 +20,7 @@ #include "ash/test/ash_test_base.h" #include "ash/test/display_manager_test_api.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/prefs/testing_pref_service.h" @@ -102,7 +105,7 @@ void StoreDisplayLayoutPrefForPair(const ash::DisplayIdPair& pair, ash::DisplayLayout::Position layout, int offset, - int64 primary_id) { + int64_t primary_id) { std::string name = ToPairString(pair); DictionaryPrefUpdate update(&local_state_, prefs::kSecondaryDisplays); ash::DisplayLayout display_layout(layout, offset); @@ -156,7 +159,7 @@ StoreDisplayLayoutPrefForPair(pair, layout, offset, pair.first); } - void StoreDisplayOverscan(int64 id, const gfx::Insets& insets) { + void StoreDisplayOverscan(int64_t id, const gfx::Insets& insets) { DictionaryPrefUpdate update(&local_state_, prefs::kDisplayProperties); const std::string name = base::Int64ToString(id); @@ -169,7 +172,7 @@ pref_data->Set(name, insets_value); } - void StoreColorProfile(int64 id, const std::string& profile) { + void StoreColorProfile(int64_t id, const std::string& profile) { DictionaryPrefUpdate update(&local_state_, prefs::kDisplayProperties); const std::string name = base::Int64ToString(id); @@ -244,10 +247,10 @@ ash::Shell::GetInstance()->display_manager(); UpdateDisplay("200x200*2, 400x300#400x400|300x200*1.25"); - int64 id1 = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id(); + int64_t id1 = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id(); ash::test::ScopedSetInternalDisplayId set_internal(id1); - int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id(); - int64 dummy_id = id2 + 1; + int64_t id2 = ash::ScreenUtil::GetSecondaryDisplay().id(); + int64_t dummy_id = id2 + 1; ASSERT_NE(id1, dummy_id); std::vector<ui::ColorCalibrationProfile> profiles; profiles.push_back(ui::COLOR_PROFILE_STANDARD); @@ -471,7 +474,7 @@ ResolutionNotificationController::SuppressTimerForTest(); LoggedInAsUser(); UpdateDisplay("400x300#500x400|400x300|300x200"); - int64 id = ash::Shell::GetScreen()->GetPrimaryDisplay().id(); + int64_t id = ash::Shell::GetScreen()->GetPrimaryDisplay().id(); // Set display's resolution in single display. It creates the notification and // display preferences should not stored meanwhile. ash::Shell* shell = ash::Shell::GetInstance(); @@ -517,8 +520,8 @@ TEST_F(DisplayPreferencesTest, StoreForSwappedDisplay) { UpdateDisplay("100x100,200x200"); - int64 id1 = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id(); - int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id(); + int64_t id1 = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id(); + int64_t id2 = ash::ScreenUtil::GetSecondaryDisplay().id(); ash::WindowTreeHostManager* window_tree_host_manager = ash::Shell::GetInstance()->window_tree_host_manager(); @@ -554,7 +557,7 @@ ash::DisplayManager* display_manager = ash::Shell::GetInstance()->display_manager(); - int64 id1 = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id(); + int64_t id1 = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id(); StoreColorProfile(id1, "dynamic"); @@ -586,16 +589,16 @@ UpdateDisplay("200x200*2,200x200"); LoggedInAsGuest(); - int64 id1 = ash::Shell::GetScreen()->GetPrimaryDisplay().id(); + int64_t id1 = ash::Shell::GetScreen()->GetPrimaryDisplay().id(); ash::test::ScopedSetInternalDisplayId set_internal(id1); - int64 id2 = ash::ScreenUtil::GetSecondaryDisplay().id(); + int64_t id2 = ash::ScreenUtil::GetSecondaryDisplay().id(); ash::DisplayLayout layout(ash::DisplayLayout::TOP, 10); SetCurrentDisplayLayout(layout); ash::DisplayManager* display_manager = ash::Shell::GetInstance()->display_manager(); ash::SetDisplayUIScale(id1, 1.25f); window_tree_host_manager->SetPrimaryDisplayId(id2); - int64 new_primary = ash::Shell::GetScreen()->GetPrimaryDisplay().id(); + int64_t new_primary = ash::Shell::GetScreen()->GetPrimaryDisplay().id(); window_tree_host_manager->SetOverscanInsets(new_primary, gfx::Insets(10, 11, 12, 13)); display_manager->SetDisplayRotation(new_primary, gfx::Display::ROTATE_90, @@ -901,7 +904,7 @@ const base::DictionaryValue* displays = local_state()->GetDictionary(prefs::kDisplayProperties); - int64 unified_id = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id(); + int64_t unified_id = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id(); EXPECT_FALSE( displays->GetDictionary(base::Int64ToString(unified_id), &new_value)); @@ -939,7 +942,7 @@ } TEST_F(DisplayPreferencesTest, RestoreUnifiedMode) { - int64 id1 = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id(); + int64_t id1 = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id(); ash::DisplayIdPair pair = std::make_pair(id1, id1 + 1); StoreDisplayBoolPropertyForPair(pair, "default_unified", true); StoreDisplayPropertyForPair(
diff --git a/chrome/browser/chromeos/display/output_protection_delegate.cc b/chrome/browser/chromeos/display/output_protection_delegate.cc index f5eb56d..88e0f77a 100644 --- a/chrome/browser/chromeos/display/output_protection_delegate.cc +++ b/chrome/browser/chromeos/display/output_protection_delegate.cc
@@ -17,7 +17,7 @@ namespace { -bool GetCurrentDisplayId(content::RenderFrameHost* rfh, int64* display_id) { +bool GetCurrentDisplayId(content::RenderFrameHost* rfh, int64_t* display_id) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK(rfh); DCHECK(display_id); @@ -164,7 +164,7 @@ return; } - int64 new_display_id = 0; + int64_t new_display_id = 0; if (!GetCurrentDisplayId(rfh, &new_display_id)) return; if (display_id_ == new_display_id)
diff --git a/chrome/browser/chromeos/display/output_protection_delegate.h b/chrome/browser/chromeos/display/output_protection_delegate.h index b7ba5513..a2cd5624 100644 --- a/chrome/browser/chromeos/display/output_protection_delegate.h +++ b/chrome/browser/chromeos/display/output_protection_delegate.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_DISPLAY_OUTPUT_PROTECTION_DELEGATE_H_ #define CHROME_BROWSER_CHROMEOS_DISPLAY_OUTPUT_PROTECTION_DELEGATE_H_ +#include <stdint.h> + #include "base/memory/weak_ptr.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" @@ -53,7 +55,7 @@ ui::DisplayConfigurator::ContentProtectionClientId client_id_; // The display id which the renderer currently uses. - int64 display_id_; + int64_t display_id_; // The last desired method mask. Will enable this mask on new display if // renderer changes display.
diff --git a/chrome/browser/chromeos/drive/debug_info_collector.h b/chrome/browser/chromeos/drive/debug_info_collector.h index cc5aa843..be6a919 100644 --- a/chrome/browser/chromeos/drive/debug_info_collector.h +++ b/chrome/browser/chromeos/drive/debug_info_collector.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DEBUG_INFO_COLLECTOR_H_ #define CHROME_BROWSER_CHROMEOS_DRIVE_DEBUG_INFO_COLLECTOR_H_ -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "components/drive/file_system_interface.h"
diff --git a/chrome/browser/chromeos/drive/download_handler.cc b/chrome/browser/chromeos/drive/download_handler.cc index 0e6897b..551e4af 100644 --- a/chrome/browser/chromeos/drive/download_handler.cc +++ b/chrome/browser/chromeos/drive/download_handler.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/chromeos/drive/download_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/supports_user_data.h" #include "base/thread_task_runner_handle.h" @@ -251,15 +254,15 @@ free_disk_space_delay_ = delay; } -int64 DownloadHandler::CalculateRequestSpace( +int64_t DownloadHandler::CalculateRequestSpace( const DownloadManager::DownloadVector& downloads) { - int64 request_space = 0; + int64_t request_space = 0; for (const auto* download : downloads) { if (download->IsDone()) continue; - const int64 total_bytes = download->GetTotalBytes(); + const int64_t total_bytes = download->GetTotalBytes(); // Skip unknown size download. Since drive cache tries to keep // drive::internal::kMinFreeSpaceInBytes, we can continue download with // using the space temporally.
diff --git a/chrome/browser/chromeos/drive/download_handler.h b/chrome/browser/chromeos/drive/download_handler.h index c0f36d1..d3487eb 100644 --- a/chrome/browser/chromeos/drive/download_handler.h +++ b/chrome/browser/chromeos/drive/download_handler.h
@@ -5,7 +5,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DOWNLOAD_HANDLER_H_ #define CHROME_BROWSER_CHROMEOS_DRIVE_DOWNLOAD_HANDLER_H_ +#include <stdint.h> + #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/download/all_download_item_notifier.h" #include "components/drive/file_errors.h" @@ -74,7 +77,7 @@ const content::CheckForFileExistenceCallback& callback); // Calculates request space for |downloads|. - int64 CalculateRequestSpace( + int64_t CalculateRequestSpace( const content::DownloadManager::DownloadVector& downloads); // Checks available storage space and free disk space if necessary. Actual
diff --git a/chrome/browser/chromeos/drive/download_handler_unittest.cc b/chrome/browser/chromeos/drive/download_handler_unittest.cc index 20a75c94..24fc82b 100644 --- a/chrome/browser/chromeos/drive/download_handler_unittest.cc +++ b/chrome/browser/chromeos/drive/download_handler_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/drive/download_handler.h" +#include <stdint.h> + #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "chrome/browser/chromeos/drive/file_system_util.h" @@ -44,13 +46,13 @@ } void FreeDiskSpaceIfNeededFor( - int64 num_bytes, + int64_t num_bytes, const FreeDiskSpaceCallback& callback) override { free_disk_space_if_needed_for_num_bytes_.push_back(num_bytes); callback.Run(true); } - std::vector<int64> free_disk_space_if_needed_for_num_bytes_; + std::vector<int64_t> free_disk_space_if_needed_for_num_bytes_; private: FileError error_; @@ -72,13 +74,13 @@ public: bool IsDone() const override { return is_done_; } - int64 GetTotalBytes() const override { return total_bytes_; } + int64_t GetTotalBytes() const override { return total_bytes_; } - int64 GetReceivedBytes() const override { return received_bytes_; } + int64_t GetReceivedBytes() const override { return received_bytes_; } bool is_done_ = false; - int64 total_bytes_ = 0; - int64 received_bytes_ = 0; + int64_t total_bytes_ = 0; + int64_t received_bytes_ = 0; }; } // namespace
diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc index 1437236..317ce4d 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/drive/drive_file_stream_reader.h" +#include <stddef.h> + #include <algorithm> #include <cstring> @@ -37,8 +39,10 @@ // file. This is for convenience in unifying implementation with the seek // operation of stream reader. HTTP doesn't allow such ranges but we want to // treat such seeking as valid. -bool ComputeConcretePosition(net::HttpByteRange range, int64 total, - int64* start, int64* length) { +bool ComputeConcretePosition(net::HttpByteRange range, + int64_t total, + int64_t* start, + int64_t* length) { // The special case when empty range in the end of the file is selected. if (range.HasFirstBytePosition() && range.first_byte_position() == total) { *start = range.first_byte_position(); @@ -92,7 +96,8 @@ } // namespace LocalReaderProxy::LocalReaderProxy( - scoped_ptr<util::LocalFileReader> file_reader, int64 length) + scoped_ptr<util::LocalFileReader> file_reader, + int64_t length) : file_reader_(file_reader.Pass()), remaining_length_(length), weak_ptr_factory_(this) { @@ -148,18 +153,16 @@ callback.Run(read_result); } -NetworkReaderProxy::NetworkReaderProxy( - int64 offset, - int64 content_length, - int64 full_content_length, - const base::Closure& job_canceller) +NetworkReaderProxy::NetworkReaderProxy(int64_t offset, + int64_t content_length, + int64_t full_content_length, + const base::Closure& job_canceller) : remaining_offset_(offset), remaining_content_length_(content_length), is_full_download_(offset + content_length == full_content_length), error_code_(net::OK), buffer_length_(0), - job_canceller_(job_canceller) { -} + job_canceller_(job_canceller) {} NetworkReaderProxy::~NetworkReaderProxy() { if (!job_canceller_.is_null()) { @@ -219,7 +222,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(data && !data->empty()); - if (remaining_offset_ >= static_cast<int64>(data->length())) { + if (remaining_offset_ >= static_cast<int64_t>(data->length())) { // Skip unneeded leading data. remaining_offset_ -= data->length(); return; @@ -396,7 +399,7 @@ } DCHECK(entry); - int64 range_start = 0, range_length = 0; + int64_t range_start = 0, range_length = 0; if (!ComputeConcretePosition(byte_range, entry->file_info().size(), &range_start, &range_length)) { // If |byte_range| is invalid (e.g. out of bounds), return with an error. @@ -437,7 +440,7 @@ } void DriveFileStreamReader::InitializeAfterLocalFileOpen( - int64 length, + int64_t length, const InitializeCompletionCallback& callback, scoped_ptr<ResourceEntry> entry, scoped_ptr<util::LocalFileReader> file_reader,
diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.h b/chrome/browser/chromeos/drive/drive_file_stream_reader.h index 0e15b1b..0b4f8b1 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader.h +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.h
@@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_STREAM_READER_H_ #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_STREAM_READER_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" @@ -58,8 +60,8 @@ // This class takes its ownership. // |length| is the number of bytes to be read. It must be equal or // smaller than the remaining data size in the |file_reader|. - LocalReaderProxy( - scoped_ptr<util::LocalFileReader> file_reader, int64 length); + LocalReaderProxy(scoped_ptr<util::LocalFileReader> file_reader, + int64_t length); ~LocalReaderProxy() override; // ReaderProxy overrides. @@ -77,7 +79,7 @@ const net::CompletionCallback& callback, int read_result); // The number of remaining bytes to be read. - int64 remaining_length_; + int64_t remaining_length_; base::ThreadChecker thread_checker_; @@ -94,9 +96,10 @@ // to cancel the job. |job_canceller| should be the callback to run the // cancelling. |full_content_length| is necessary for determining whether the // deletion is done in the middle of download process. - NetworkReaderProxy( - int64 offset, int64 content_length, int64 full_content_length, - const base::Closure& job_canceller); + NetworkReaderProxy(int64_t offset, + int64_t content_length, + int64_t full_content_length, + const base::Closure& job_canceller); ~NetworkReaderProxy() override; // ReaderProxy overrides. @@ -111,11 +114,11 @@ ScopedVector<std::string> pending_data_; // The number of bytes to be skipped. - int64 remaining_offset_; + int64_t remaining_offset_; // The number of bytes of remaining data (including the data not yet // received from the server). - int64 remaining_content_length_; + int64_t remaining_content_length_; // Flag to remember whether this read request is for reading till the end of // the file. @@ -199,7 +202,7 @@ // Part of Initialize. Called when the local file open process is done. void InitializeAfterLocalFileOpen( - int64 length, + int64_t length, const InitializeCompletionCallback& callback, scoped_ptr<ResourceEntry> entry, scoped_ptr<util::LocalFileReader> file_reader,
diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc index 7eb4c63..4126cfb38 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/drive/drive_file_stream_reader.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/bind.h" @@ -390,8 +393,8 @@ TEST_F(DriveFileStreamReaderTest, ReadRange) { // In this test case, we just confirm that the part of file is read. - const int64 kRangeOffset = 3; - const int64 kRangeLength = 4; + const int64_t kRangeOffset = 3; + const int64_t kRangeLength = 4; const base::FilePath kDriveFile = util::GetDriveMyDriveRootPath().AppendASCII("File 1.txt"); @@ -426,7 +429,7 @@ ASSERT_EQ(net::OK, test_util::ReadAllData(reader.get(), &first_content)); // The length should be equal to range length. - EXPECT_EQ(kRangeLength, static_cast<int64>(first_content.size())); + EXPECT_EQ(kRangeLength, static_cast<int64_t>(first_content.size())); // Create second instance and initialize it. // In this case, the file should be cached one. @@ -459,8 +462,8 @@ } TEST_F(DriveFileStreamReaderTest, OutOfRangeError) { - const int64 kRangeOffset = 1000000; // Out of range. - const int64 kRangeLength = 4; + const int64_t kRangeOffset = 1000000; // Out of range. + const int64_t kRangeLength = 4; const base::FilePath kDriveFile = util::GetDriveMyDriveRootPath().AppendASCII("File 1.txt");
diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc index 37c9f84..ac1aff0 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service.cc +++ b/chrome/browser/chromeos/drive/drive_integration_service.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/chromeos/drive/drive_integration_service.h b/chrome/browser/chromeos/drive/drive_integration_service.h index dbb1e63..4a9e102d 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service.h +++ b/chrome/browser/chromeos/drive/drive_integration_service.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_INTEGRATION_SERVICE_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/drive/file_system_util.cc b/chrome/browser/chromeos/drive/file_system_util.cc index 6bb95b8..9c47a8ba 100644 --- a/chrome/browser/chromeos/drive/file_system_util.cc +++ b/chrome/browser/chromeos/drive/file_system_util.cc
@@ -4,10 +4,11 @@ #include "chrome/browser/chromeos/drive/file_system_util.h" +#include <stddef.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/file_path.h" @@ -15,6 +16,7 @@ #include "base/i18n/icu_string_conversions.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/chromeos/drive/file_task_executor.cc b/chrome/browser/chromeos/drive/file_task_executor.cc index 6976ebe..cfeb681 100644 --- a/chrome/browser/chromeos/drive/file_task_executor.cc +++ b/chrome/browser/chromeos/drive/file_task_executor.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/drive/file_task_executor.h" +#include <stddef.h> + #include <string> #include <vector>
diff --git a/chrome/browser/chromeos/drive/fileapi/async_file_util.cc b/chrome/browser/chromeos/drive/fileapi/async_file_util.cc index 0b7d13fa..958cb4d 100644 --- a/chrome/browser/chromeos/drive/fileapi/async_file_util.cc +++ b/chrome/browser/chromeos/drive/fileapi/async_file_util.cc
@@ -264,7 +264,7 @@ void AsyncFileUtil::Truncate( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - int64 length, + int64_t length, const StatusCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO);
diff --git a/chrome/browser/chromeos/drive/fileapi/async_file_util.h b/chrome/browser/chromeos/drive/fileapi/async_file_util.h index 8dcd1db..5de7cc7a 100644 --- a/chrome/browser/chromeos/drive/fileapi/async_file_util.h +++ b/chrome/browser/chromeos/drive/fileapi/async_file_util.h
@@ -5,8 +5,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_ASYNC_FILE_UTIL_H_ #define CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_ASYNC_FILE_UTIL_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/callback.h" +#include "base/macros.h" #include "storage/browser/fileapi/async_file_util.h" namespace drive { @@ -48,7 +50,7 @@ const StatusCallback& callback) override; void Truncate(scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - int64 length, + int64_t length, const StatusCallback& callback) override; void CopyFileLocal(scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& src_url,
diff --git a/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc index a231ab0..22fb9bc 100644 --- a/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc +++ b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
@@ -87,8 +87,8 @@ scoped_ptr<storage::FileStreamReader> FileSystemBackendDelegate::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) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -110,7 +110,7 @@ scoped_ptr<storage::FileStreamWriter> FileSystemBackendDelegate::CreateFileStreamWriter( const storage::FileSystemURL& url, - int64 offset, + int64_t offset, storage::FileSystemContext* context) { DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_EQ(storage::kFileSystemTypeDrive, url.type());
diff --git a/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h index daea7eef..71089ba6 100644 --- a/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h +++ b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h
@@ -5,7 +5,9 @@ #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_FILE_SYSTEM_BACKEND_DELEGATE_H_ #define CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_FILE_SYSTEM_BACKEND_DELEGATE_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/fileapi/file_system_backend_delegate.h" @@ -32,13 +34,13 @@ storage::FileSystemType type) 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) override; scoped_ptr<storage::FileStreamWriter> CreateFileStreamWriter( const storage::FileSystemURL& url, - int64 offset, + int64_t offset, storage::FileSystemContext* context) override; storage::WatcherManager* GetWatcherManager( storage::FileSystemType type) override;
diff --git a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc index 1df0ae2..d0f85fa1 100644 --- a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc +++ b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/drive/fileapi/fileapi_worker.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/logging.h" #include "base/task_runner_util.h" @@ -293,7 +295,7 @@ } void Truncate(const base::FilePath& file_path, - int64 length, + int64_t length, const StatusCallback& callback, FileSystemInterface* file_system) { DCHECK_CURRENTLY_ON(BrowserThread::UI);
diff --git a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.h b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.h index 0cc835f..f267d0a5 100644 --- a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.h +++ b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.h
@@ -19,9 +19,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_FILEAPI_WORKER_H_ #define CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_FILEAPI_WORKER_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/memory/weak_ptr.h" #include "components/drive/file_errors.h" @@ -143,7 +144,7 @@ // Truncates the file at |file_path| to |length| bytes. // Called from FileSystemProxy::Truncate(). void Truncate(const base::FilePath& file_path, - int64 length, + int64_t length, const StatusCallback& callback, FileSystemInterface* file_system);
diff --git a/chrome/browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc b/chrome/browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc index d5181e2..1d81c03 100644 --- a/chrome/browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc +++ b/chrome/browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/drive/fileapi/fileapi_worker.h" +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/file_util.h" @@ -66,12 +68,11 @@ // Helper function of testing OpenFile() for write access. It checks that the // file handle correctly writes to the expected file. -void VerifyWrite( - int64 expected_size, - const base::FilePath& expected_written_path, - const std::string& write_data, - base::File file, - const base::Closure& close_callback) { +void VerifyWrite(int64_t expected_size, + const base::FilePath& expected_written_path, + const std::string& write_data, + base::File file, + const base::Closure& close_callback) { // Check that the file was properly opened. EXPECT_TRUE(file.IsValid()); EXPECT_FALSE(close_callback.is_null()); @@ -167,7 +168,7 @@ // CREATE => CREATE (fails if file exists.) TestFileSystemForOpenFile file_system(temp_path, CREATE_FILE); - const int64 kExpectedSize = 0; + const int64_t kExpectedSize = 0; OpenFile(kDummyPath, base::File::FLAG_CREATE | base::File::FLAG_WRITE, @@ -189,7 +190,7 @@ // OPEN_ALWAYS => OPEN_OR_CREATE (success whether file exists or not.) // No truncation should take place. TestFileSystemForOpenFile file_system(temp_path, OPEN_OR_CREATE_FILE); - const int64 kExpectedSize = static_cast<int64>(kInitialData.size()); + const int64_t kExpectedSize = static_cast<int64_t>(kInitialData.size()); OpenFile(kDummyPath, base::File::FLAG_OPEN_ALWAYS | base::File::FLAG_WRITE, @@ -211,7 +212,7 @@ // OPEN_TRUNCATED => OPEN (failure when the file did not exist.) // It should truncate the file before passing to the callback. TestFileSystemForOpenFile file_system(temp_path, OPEN_FILE); - const int64 kExpectedSize = 0; + const int64_t kExpectedSize = 0; OpenFile(kDummyPath, base::File::FLAG_OPEN_TRUNCATED | base::File::FLAG_WRITE, @@ -233,7 +234,7 @@ // CREATE_ALWAYS => OPEN_OR_CREATE (success whether file exists or not.) // It should truncate the file before passing to the callback. TestFileSystemForOpenFile file_system(temp_path, OPEN_OR_CREATE_FILE); - const int64 kExpectedSize = 0; + const int64_t kExpectedSize = 0; OpenFile(kDummyPath, base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE,
diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.cc b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.cc index 8ff9504..88ffaa3 100644 --- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.cc +++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.cc
@@ -24,7 +24,7 @@ const DriveFileStreamReader::FileSystemGetter& file_system_getter, base::SequencedTaskRunner* file_task_runner, const base::FilePath& drive_file_path, - int64 offset, + int64_t offset, const base::Time& expected_modification_time) : stream_reader_( new DriveFileStreamReader(file_system_getter, file_task_runner)), @@ -65,7 +65,7 @@ return net::ERR_IO_PENDING; } -int64 WebkitFileStreamReaderImpl::GetLength( +int64_t WebkitFileStreamReaderImpl::GetLength( const net::Int64CompletionCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK(stream_reader_);
diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h index dec997e..6a56ced1 100644 --- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h +++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h
@@ -5,8 +5,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_WEBKIT_FILE_STREAM_READER_IMPL_H_ #define CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_WEBKIT_FILE_STREAM_READER_IMPL_H_ -#include "base/basictypes.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 "base/memory/weak_ptr.h" @@ -36,7 +38,7 @@ const DriveFileStreamReader::FileSystemGetter& file_system_getter, base::SequencedTaskRunner* file_task_runner, const base::FilePath& drive_file_path, - int64 offset, + int64_t offset, const base::Time& expected_modification_time); ~WebkitFileStreamReaderImpl() override; @@ -44,7 +46,7 @@ int Read(net::IOBuffer* buffer, int buffer_length, const net::CompletionCallback& callback) override; - int64 GetLength(const net::Int64CompletionCallback& callback) override; + int64_t GetLength(const net::Int64CompletionCallback& callback) override; private: // Called upon the initialization completion of |stream_reader_|. @@ -70,11 +72,11 @@ scoped_ptr<DriveFileStreamReader> stream_reader_; const base::FilePath drive_file_path_; - const int64 offset_; + const int64_t offset_; const base::Time expected_modification_time_; // This is available only after initialize is done. - int64 file_size_; + int64_t file_size_; // This should remain the last member so it'll be destroyed first and // invalidate its weak pointers before other members are destroyed.
diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc index f811bcc..eda88b4 100644 --- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc +++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/bind.h" @@ -80,7 +83,7 @@ ASSERT_EQ(net::OK, test_util::ReadAllData(reader.get(), &content)); net::TestInt64CompletionCallback callback; - int64 length = reader->GetLength(callback.callback()); + int64_t length = reader->GetLength(callback.callback()); length = callback.GetResult(length); EXPECT_EQ(content.size(), static_cast<size_t>(length)); } @@ -95,7 +98,7 @@ base::Time())); // expected modification time net::TestInt64CompletionCallback callback; - int64 length = reader->GetLength(callback.callback()); + int64_t length = reader->GetLength(callback.callback()); length = callback.GetResult(length); std::string content; @@ -117,7 +120,7 @@ ASSERT_EQ(net::OK, test_util::ReadAllData(reader.get(), &content)); net::TestInt64CompletionCallback callback; - int64 length = reader->GetLength(callback.callback()); + int64_t length = reader->GetLength(callback.callback()); length = callback.GetResult(length); EXPECT_EQ(content.size() + kOffset, static_cast<size_t>(length)); } @@ -149,7 +152,7 @@ base::Time())); // expected modification time net::TestInt64CompletionCallback callback; - int64 result = reader->GetLength(callback.callback()); + int64_t result = reader->GetLength(callback.callback()); result = callback.GetResult(result); EXPECT_EQ(net::ERR_FILE_NOT_FOUND, result); } @@ -189,7 +192,7 @@ expected_modification_time)); net::TestInt64CompletionCallback callback; - int64 result = reader->GetLength(callback.callback()); + int64_t result = reader->GetLength(callback.callback()); result = callback.GetResult(result); std::string content; @@ -208,7 +211,7 @@ base::Time::FromInternalValue(1))); net::TestInt64CompletionCallback callback; - int64 result = reader->GetLength(callback.callback()); + int64_t result = reader->GetLength(callback.callback()); result = callback.GetResult(result); EXPECT_EQ(net::ERR_UPLOAD_FILE_CHANGED, result); }
diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.cc b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.cc index 7d934a8..a4bf4ad 100644 --- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.cc +++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.cc
@@ -46,13 +46,12 @@ const FileSystemGetter& file_system_getter, base::TaskRunner* file_task_runner, const base::FilePath& file_path, - int64 offset) + int64_t offset) : file_system_getter_(file_system_getter), file_task_runner_(file_task_runner), file_path_(file_path), offset_(offset), - weak_ptr_factory_(this) { -} + weak_ptr_factory_(this) {} WebkitFileStreamWriterImpl::~WebkitFileStreamWriterImpl() { if (local_file_writer_) {
diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h index 034ccbb..cd3ab3e 100644 --- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h +++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h
@@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_WEBKIT_FILE_STREAM_WRITER_IMPL_H_ #define CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_WEBKIT_FILE_STREAM_WRITER_IMPL_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "storage/browser/fileapi/file_stream_writer.h" @@ -43,7 +45,7 @@ WebkitFileStreamWriterImpl(const FileSystemGetter& file_system_getter, base::TaskRunner* file_task_runner, const base::FilePath& file_path, - int64 offset); + int64_t offset); ~WebkitFileStreamWriterImpl() override; // FileWriter override. @@ -65,7 +67,7 @@ FileSystemGetter file_system_getter_; scoped_refptr<base::TaskRunner> file_task_runner_; const base::FilePath file_path_; - const int64 offset_; + const int64_t offset_; scoped_ptr<storage::FileStreamWriter> local_file_writer_; base::Closure close_callback_on_ui_thread_;
diff --git a/chrome/browser/chromeos/enrollment_dialog_view.cc b/chrome/browser/chromeos/enrollment_dialog_view.cc index 65e5abe..5e635f4 100644 --- a/chrome/browser/chromeos/enrollment_dialog_view.cc +++ b/chrome/browser/chromeos/enrollment_dialog_view.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/enrollment_dialog_view.h" #include "base/bind.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/chromeos/events/event_rewriter.cc b/chrome/browser/chromeos/events/event_rewriter.cc index d759f56..23ab7b1 100644 --- a/chrome/browser/chromeos/events/event_rewriter.cc +++ b/chrome/browser/chromeos/events/event_rewriter.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/events/event_rewriter.h" +#include <stddef.h> + #include <vector> #include "ash/sticky_keys/sticky_keys_controller.h"
diff --git a/chrome/browser/chromeos/events/event_rewriter.h b/chrome/browser/chromeos/events/event_rewriter.h index 6ecd8fe..999c568a 100644 --- a/chrome/browser/chromeos/events/event_rewriter.h +++ b/chrome/browser/chromeos/events/event_rewriter.h
@@ -11,6 +11,7 @@ #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/events/event.h" #include "ui/events/event_rewriter.h"
diff --git a/chrome/browser/chromeos/events/event_rewriter_controller.h b/chrome/browser/chromeos/events/event_rewriter_controller.h index f86a14a..bca96ba5 100644 --- a/chrome/browser/chromeos/events/event_rewriter_controller.h +++ b/chrome/browser/chromeos/events/event_rewriter_controller.h
@@ -8,6 +8,7 @@ #include <list> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "ui/aura/env_observer.h"
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc index cb479d5..3723eddf 100644 --- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc +++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -11,8 +11,8 @@ #include "ash/sticky_keys/sticky_keys_overlay.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_state.h" -#include "base/basictypes.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/pref_member.h" #include "base/strings/stringprintf.h" #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
diff --git a/chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h b/chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h index 69016d9..4bcaaaa 100644 --- a/chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h +++ b/chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_EVENTS_KEYBOARD_DRIVEN_EVENT_REWRITER_H_ #define CHROME_BROWSER_CHROMEOS_EVENTS_KEYBOARD_DRIVEN_EVENT_REWRITER_H_ +#include "base/macros.h" #include "ui/events/event_rewriter.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/events/keyboard_driven_event_rewriter_unittest.cc b/chrome/browser/chromeos/events/keyboard_driven_event_rewriter_unittest.cc index 38a777b..3e96f368 100644 --- a/chrome/browser/chromeos/events/keyboard_driven_event_rewriter_unittest.cc +++ b/chrome/browser/chromeos/events/keyboard_driven_event_rewriter_unittest.cc
@@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/events/system_key_event_listener.h b/chrome/browser/chromeos/events/system_key_event_listener.h index 2c46e6c..92945aa4 100644 --- a/chrome/browser/chromeos/events/system_key_event_listener.h +++ b/chrome/browser/chromeos/events/system_key_event_listener.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_EVENTS_SYSTEM_KEY_EVENT_LISTENER_H_ #define CHROME_BROWSER_CHROMEOS_EVENTS_SYSTEM_KEY_EVENT_LISTENER_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "ui/events/platform/platform_event_observer.h"
diff --git a/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h b/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h index 0332e349..c3c415b 100644 --- a/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h +++ b/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_EVENTS_XINPUT_HIERARCHY_CHANGED_EVENT_LISTENER_H_ #define CHROME_BROWSER_CHROMEOS_EVENTS_XINPUT_HIERARCHY_CHANGED_EVENT_LISTENER_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/observer_list.h" #include "ui/events/platform/platform_event_observer.h"
diff --git a/chrome/browser/chromeos/extensions/accessibility_features_apitest.cc b/chrome/browser/chromeos/extensions/accessibility_features_apitest.cc index 25765814..4b3a11f2 100644 --- a/chrome/browser/chromeos/extensions/accessibility_features_apitest.cc +++ b/chrome/browser/chromeos/extensions/accessibility_features_apitest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <string> #include <vector>
diff --git a/chrome/browser/chromeos/extensions/default_app_order.cc b/chrome/browser/chromeos/extensions/default_app_order.cc index 5c79d37..f1b7121 100644 --- a/chrome/browser/chromeos/extensions/default_app_order.cc +++ b/chrome/browser/chromeos/extensions/default_app_order.cc
@@ -9,6 +9,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/json/json_file_value_serializer.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/time/time.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/extensions/default_app_order.h b/chrome/browser/chromeos/extensions/default_app_order.h index 7848e819..c1ce439 100644 --- a/chrome/browser/chromeos/extensions/default_app_order.h +++ b/chrome/browser/chromeos/extensions/default_app_order.h
@@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_DEFAULT_APP_ORDER_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_DEFAULT_APP_ORDER_H_ +#include <stddef.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/synchronization/waitable_event.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/extensions/default_app_order_unittest.cc b/chrome/browser/chromeos/extensions/default_app_order_unittest.cc index cfd22c7..ab5a4cee 100644 --- a/chrome/browser/chromeos/extensions/default_app_order_unittest.cc +++ b/chrome/browser/chromeos/extensions/default_app_order_unittest.cc
@@ -4,12 +4,15 @@ #include "chrome/browser/chromeos/extensions/default_app_order.h" +#include <stddef.h> + #include <string> #include <vector> #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/scoped_path_override.h" #include "chrome/common/extensions/extension_constants.h"
diff --git a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h index ef8a0d6..6c1a703 100644 --- a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h +++ b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h
@@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_DEVICE_LOCAL_ACCOUNT_EXTERNAL_POLICY_LOADER_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_DEVICE_LOCAL_ACCOUNT_EXTERNAL_POLICY_LOADER_H_ -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/sequenced_task_runner.h"
diff --git a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc index ac94f31..541285b 100644 --- a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc +++ b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc
@@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/run_loop.h" @@ -16,6 +17,7 @@ #include "base/thread_task_runner_handle.h" #include "base/values.h" #include "base/version.h" +#include "build/build_config.h" #include "chrome/browser/extensions/external_provider_impl.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc index c90a0f3..0b5e956 100644 --- a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc +++ b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h" +#include <stddef.h> + #include <cstddef> #include <string>
diff --git a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h index 4270bee6..070446731 100644 --- a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h +++ b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_DEVICE_LOCAL_ACCOUNT_MANAGEMENT_POLICY_PROVIDER_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_DEVICE_LOCAL_ACCOUNT_MANAGEMENT_POLICY_PROVIDER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/policy/device_local_account.h" #include "extensions/browser/management_policy.h"
diff --git a/chrome/browser/chromeos/extensions/dictionary_event_router.h b/chrome/browser/chromeos/extensions/dictionary_event_router.h index da5cf15..90185df6 100644 --- a/chrome/browser/chromeos/extensions/dictionary_event_router.h +++ b/chrome/browser/chromeos/extensions/dictionary_event_router.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/spellchecker/spellcheck_custom_dictionary.h" #include "chrome/browser/spellchecker/spellcheck_service.h"
diff --git a/chrome/browser/chromeos/extensions/extension_system_event_observer.h b/chrome/browser/chromeos/extensions/extension_system_event_observer.h index 1deb013..ab9f4ab1 100644 --- a/chrome/browser/chromeos/extensions/extension_system_event_observer.h +++ b/chrome/browser/chromeos/extensions/extension_system_event_observer.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_EXTENSION_SYSTEM_EVENT_OBSERVER_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_EXTENSION_SYSTEM_EVENT_OBSERVER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chromeos/dbus/power_manager_client.h" #include "chromeos/dbus/session_manager_client.h"
diff --git a/chrome/browser/chromeos/extensions/external_cache.cc b/chrome/browser/chromeos/extensions/external_cache.cc index 04433b1..714dd6b 100644 --- a/chrome/browser/chromeos/extensions/external_cache.cc +++ b/chrome/browser/chromeos/extensions/external_cache.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/extensions/external_cache.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h"
diff --git a/chrome/browser/chromeos/extensions/external_cache.h b/chrome/browser/chromeos/extensions/external_cache.h index c57ddf3..36684b5 100644 --- a/chrome/browser/chromeos/extensions/external_cache.h +++ b/chrome/browser/chromeos/extensions/external_cache.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/extensions/external_cache_unittest.cc b/chrome/browser/chromeos/extensions/external_cache_unittest.cc index c0e036c5..ac5e54fb 100644 --- a/chrome/browser/chromeos/extensions/external_cache_unittest.cc +++ b/chrome/browser/chromeos/extensions/external_cache_unittest.cc
@@ -11,6 +11,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/test/sequenced_worker_pool_owner.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/device_event_router.h b/chrome/browser/chromeos/extensions/file_manager/device_event_router.h index 08653a1..b0493a9d 100644 --- a/chrome/browser/chromeos/extensions/file_manager/device_event_router.h +++ b/chrome/browser/chromeos/extensions/file_manager/device_event_router.h
@@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "chrome/browser/chromeos/file_manager/volume_manager_observer.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc b/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc index 2a84cd5c..217b7ec 100644 --- a/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc +++ b/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc
@@ -7,6 +7,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "chrome/browser/chromeos/file_manager/volume_manager.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc index 185a47d..c4ea0fe 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc +++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/chromeos/extensions/file_manager/event_router.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" @@ -61,7 +64,7 @@ namespace { // Frequency of sending onFileTransferUpdated. -const int64 kProgressEventFrequencyInMilliseconds = 1000; +const int64_t kProgressEventFrequencyInMilliseconds = 1000; // Maximim size of detailed change info on directory change event. If the size // exceeds the maximum size, the detailed info is omitted and the force refresh @@ -69,7 +72,7 @@ const size_t kDirectoryChangeEventMaxDetailInfoSize = 1000; // This time(millisecond) is used for confirm following event exists. -const int64 kFileTransferEventDelayTimeInMilliseconds = 300; +const int64_t kFileTransferEventDelayTimeInMilliseconds = 300; // Checks if the Recovery Tool is running. This is a temporary solution. // TODO(mtomasz): Replace with crbug.com/341902 solution. @@ -237,7 +240,7 @@ // |last_time|. bool ShouldSendProgressEvent(bool always, base::Time* last_time) { const base::Time now = base::Time::Now(); - const int64 delta = (now - *last_time).InMilliseconds(); + const int64_t delta = (now - *last_time).InMilliseconds(); // delta < 0 may rarely happen if system clock is synced and rewinded. // To be conservative, we don't skip in that case. if (!always && 0 <= delta && delta < kProgressEventFrequencyInMilliseconds) { @@ -570,7 +573,7 @@ storage::FileSystemOperation::CopyProgressType type, const GURL& source_url, const GURL& destination_url, - int64 size) { + int64_t size) { DCHECK_CURRENTLY_ON(BrowserThread::UI); file_manager_private::CopyProgressStatus status;
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.h b/chrome/browser/chromeos/extensions/file_manager/event_router.h index 0ce70de..ed30696 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router.h +++ b/chrome/browser/chromeos/extensions/file_manager/event_router.h
@@ -5,13 +5,15 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_EVENT_ROUTER_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_EVENT_ROUTER_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file_path_watcher.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/extensions/file_manager/device_event_router.h" @@ -102,7 +104,7 @@ storage::FileSystemOperation::CopyProgressType type, const GURL& source_url, const GURL& destination_url, - int64 size); + int64_t size); // Called when a notification from a watcher manager arrives. void OnWatcherManagerNotification(
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc index 1564fd3..ee56099 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc
@@ -30,8 +30,11 @@ #include "chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc index b21ea43..a733b98 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc
@@ -6,10 +6,13 @@ #include "chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.h" +#include <stddef.h> + #include <vector> #include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc index 4eda6e9e..01e4525 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
@@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/run_loop.h" #include "base/stl_util.h" #include "chrome/browser/chromeos/extensions/file_manager/event_router.h" @@ -39,7 +43,7 @@ const char* fs_uuid; const char* system_path_prefix; chromeos::DeviceType device_type; - uint64 size_in_bytes; + uint64_t size_in_bytes; bool is_parent; bool is_read_only; bool has_media;
diff --git a/chrome/browser/chromeos/extensions/file_manager/job_event_router.cc b/chrome/browser/chromeos/extensions/file_manager/job_event_router.cc index 3d6bb30f..3ba73eb0 100644 --- a/chrome/browser/chromeos/extensions/file_manager/job_event_router.cc +++ b/chrome/browser/chromeos/extensions/file_manager/job_event_router.cc
@@ -81,8 +81,8 @@ } void JobEventRouter::UpdateBytes(const drive::JobInfo& job_info) { - int64 last_completed_bytes = 0; - int64 last_total_bytes = 0; + int64_t last_completed_bytes = 0; + int64_t last_total_bytes = 0; if (drive_jobs_.count(job_info.job_id)) { last_completed_bytes = drive_jobs_[job_info.job_id]->num_completed_bytes; last_total_bytes = drive_jobs_[job_info.job_id]->num_total_bytes; @@ -130,9 +130,9 @@ const std::string& extension_id, const drive::JobInfo& job_info, const file_manager_private::TransferState& state, - const int64 num_total_jobs, - const int64 num_completed_bytes, - const int64 num_total_bytes) { + const int64_t num_total_jobs, + const int64_t num_completed_bytes, + const int64_t num_total_bytes) { file_manager_private::FileTransferStatus status; const GURL url =
diff --git a/chrome/browser/chromeos/extensions/file_manager/job_event_router.h b/chrome/browser/chromeos/extensions/file_manager/job_event_router.h index 43ec028..90c79f2 100644 --- a/chrome/browser/chromeos/extensions/file_manager/job_event_router.h +++ b/chrome/browser/chromeos/extensions/file_manager/job_event_router.h
@@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_JOB_EVENT_ROUTER_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_JOB_EVENT_ROUTER_H_ +#include <stdint.h> + #include <map> #include <set> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" @@ -70,9 +73,9 @@ const std::string& extension_id, const drive::JobInfo& job_info, const extensions::api::file_manager_private::TransferState& state, - const int64 num_total_jobs, - const int64 num_completed_bytes, - const int64 num_total_bytes); + const int64_t num_total_jobs, + const int64_t num_completed_bytes, + const int64_t num_total_bytes); // Delay time before sending progress events. base::TimeDelta event_delay_; @@ -89,11 +92,11 @@ // Computed bytes of tasks that have been processed. Once it completes all // tasks, it clears the variable. - int64 num_completed_bytes_; + int64_t num_completed_bytes_; // Total bytes of tasks that have been processed. Once it completes all tasks, // it clears the variable. - int64 num_total_bytes_; + int64_t num_total_bytes_; // Thread checker. base::ThreadChecker thread_checker_;
diff --git a/chrome/browser/chromeos/extensions/file_manager/job_event_router_unittest.cc b/chrome/browser/chromeos/extensions/file_manager/job_event_router_unittest.cc index 2950206a..a6239fa 100644 --- a/chrome/browser/chromeos/extensions/file_manager/job_event_router_unittest.cc +++ b/chrome/browser/chromeos/extensions/file_manager/job_event_router_unittest.cc
@@ -4,6 +4,10 @@ #include "chrome/browser/chromeos/extensions/file_manager/job_event_router.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "testing/gtest/include/gtest/gtest.h" @@ -59,8 +63,8 @@ void SetUp() override { job_event_router.reset(new JobEventRouterImpl()); } drive::JobInfo CreateJobInfo(drive::JobID id, - int64 num_completed_bytes, - int64 num_total_bytes, + int64_t num_completed_bytes, + int64_t num_total_bytes, const base::FilePath& file_path) { drive::JobInfo job(drive::TYPE_DOWNLOAD_FILE); job.job_id = id;
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_base.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_base.cc index 68e1246..0e675c8e 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_base.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_base.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/extensions/file_manager/private_api_base.h" +#include <stdint.h> + #include "base/strings/string_number_conversions.h" #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h" #include "components/drive/event_logger.h" @@ -26,7 +28,7 @@ void LoggedAsyncExtensionFunction::SendResponse(bool success) { drive::EventLogger* logger = file_manager::util::GetLogger(GetProfile()); if (logger) { - int64 elapsed = (base::Time::Now() - start_time_).InMilliseconds(); + int64_t elapsed = (base::Time::Now() - start_time_).InMilliseconds(); if (log_on_completion_) { logger->Log(logging::LOG_INFO, "%s[%d] %s. (elapsed time: %sms)", name(), request_id(), success ? "succeeded" : "failed",
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.cc index 1ab190b..979f44a 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/extensions/file_manager/private_api_dialog.h" +#include <stddef.h> + #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h" #include "chrome/browser/ui/views/select_file_dialog_extension.h" #include "chrome/common/extensions/api/file_manager_private.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h index 143f45b..fb1c1c1 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h
@@ -7,6 +7,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_PRIVATE_API_DRIVE_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_PRIVATE_API_DRIVE_H_ +#include <stddef.h> + #include <string> #include <vector>
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc index 4d8d3fb..2587322 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
@@ -68,12 +68,12 @@ // Retrieves total and remaining available size on |mount_path|. void GetSizeStatsOnBlockingPool(const std::string& mount_path, - uint64* total_size, - uint64* remaining_size) { + uint64_t* total_size, + uint64_t* remaining_size) { struct statvfs stat = {}; // Zero-clear if (HANDLE_EINTR(statvfs(mount_path.c_str(), &stat)) == 0) { - *total_size = static_cast<uint64>(stat.f_blocks) * stat.f_frsize; - *remaining_size = static_cast<uint64>(stat.f_bavail) * stat.f_frsize; + *total_size = static_cast<uint64_t>(stat.f_blocks) * stat.f_frsize; + *remaining_size = static_cast<uint64_t>(stat.f_bavail) * stat.f_frsize; } } @@ -133,7 +133,7 @@ storage::FileSystemOperation::CopyProgressType type, const FileSystemURL& source_url, const FileSystemURL& destination_url, - int64 size) { + int64_t size) { DCHECK_CURRENTLY_ON(BrowserThread::UI); file_manager::EventRouter* event_router = @@ -152,7 +152,7 @@ storage::FileSystemOperation::CopyProgressType type, const FileSystemURL& source_url, const FileSystemURL& destination_url, - int64 size) { + int64_t size) { DCHECK_CURRENTLY_ON(BrowserThread::IO); BrowserThread::PostTask( @@ -497,13 +497,13 @@ void FileManagerPrivateGetSizeStatsFunction::OnGetDriveAvailableSpace( drive::FileError error, - int64 bytes_total, - int64 bytes_used) { + int64_t bytes_total, + int64_t bytes_used) { if (error == drive::FILE_ERROR_OK) { - const uint64 bytes_total_unsigned = bytes_total; + const uint64_t bytes_total_unsigned = bytes_total; // bytes_used can be larger than bytes_total (over quota). - const uint64 bytes_remaining_unsigned = - std::max(bytes_total - bytes_used, int64(0)); + const uint64_t bytes_remaining_unsigned = + std::max(bytes_total - bytes_used, int64_t(0)); OnGetSizeStats(&bytes_total_unsigned, &bytes_remaining_unsigned); } else { // If stats couldn't be gotten for drive, result should be left undefined. @@ -521,14 +521,14 @@ return; } - const uint64 max_capacity = mtp_storage_info.max_capacity(); - const uint64 free_space_in_bytes = mtp_storage_info.free_space_in_bytes(); + const uint64_t max_capacity = mtp_storage_info.max_capacity(); + const uint64_t free_space_in_bytes = mtp_storage_info.free_space_in_bytes(); OnGetSizeStats(&max_capacity, &free_space_in_bytes); } void FileManagerPrivateGetSizeStatsFunction::OnGetSizeStats( - const uint64* total_size, - const uint64* remaining_size) { + const uint64_t* total_size, + const uint64_t* remaining_size) { base::DictionaryValue* sizes = new base::DictionaryValue(); SetResult(sizes); @@ -610,7 +610,7 @@ } // Checks if the available space of the |path| is enough for required |bytes|. -bool CheckLocalDiskSpaceOnIOThread(const base::FilePath& path, int64 bytes) { +bool CheckLocalDiskSpaceOnIOThread(const base::FilePath& path, int64_t bytes) { DCHECK_CURRENTLY_ON(BrowserThread::IO); return bytes <= base::SysInfo::AmountOfFreeDiskSpace(path) - cryptohome::kMinFreeSpaceInBytes;
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h index 835b7f79..7def0a7 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h
@@ -7,8 +7,12 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_PRIVATE_API_FILE_SYSTEM_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_PRIVATE_API_FILE_SYSTEM_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "chrome/browser/chromeos/extensions/file_manager/private_api_base.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/extensions/chrome_extension_function_details.h" @@ -156,13 +160,14 @@ bool is_download); void OnGetDriveAvailableSpace(drive::FileError error, - int64 bytes_total, - int64 bytes_used); + int64_t bytes_total, + int64_t bytes_used); void OnGetMtpAvailableSpace(const MtpStorageInfo& mtp_storage_info, const bool error); - void OnGetSizeStats(const uint64* total_size, const uint64* remaining_size); + void OnGetSizeStats(const uint64_t* total_size, + const uint64_t* remaining_size); }; // Implements the chrome.fileManagerPrivate.validatePathNameLength method.
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc index c1c54cb..7ed0859 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/extensions/file_manager/private_api_misc.h" +#include <stddef.h> + #include <set> #include <vector>
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h index 4a3676a..7aa3b2c 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h
@@ -11,6 +11,7 @@ #include <string> #include "base/files/file.h" +#include "base/macros.h" #include "chrome/browser/chromeos/extensions/file_manager/private_api_base.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h" #include "chrome/browser/extensions/chrome_extension_function.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc index 5b4a406..e52205fa 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h" +#include <stddef.h> + #include <set> #include <string> #include <vector>
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc index 1927b18..74354fc 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h" +#include <stddef.h> + #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/drive/file_system_util.h"
diff --git a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc index b432309..76879e1 100644 --- a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc +++ b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/thread_task_runner_handle.h"
diff --git a/chrome/browser/chromeos/extensions/info_private_api.cc b/chrome/browser/chromeos/extensions/info_private_api.cc index dbe59d1..f14f2339 100644 --- a/chrome/browser/chromeos/extensions/info_private_api.cc +++ b/chrome/browser/chromeos/extensions/info_private_api.cc
@@ -4,7 +4,8 @@ #include "chrome/browser/chromeos/extensions/info_private_api.h" -#include "base/basictypes.h" +#include <stddef.h> + #include "base/prefs/pref_service.h" #include "base/sys_info.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/extensions/input_method_api.cc b/chrome/browser/chromeos/extensions/input_method_api.cc index b9dce24..52a54c9 100644 --- a/chrome/browser/chromeos/extensions/input_method_api.cc +++ b/chrome/browser/chromeos/extensions/input_method_api.cc
@@ -4,12 +4,15 @@ #include "chrome/browser/chromeos/extensions/input_method_api.h" +#include <stddef.h> + #include <set> #include <string> #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chromeos/extensions/dictionary_event_router.h" #include "chrome/browser/chromeos/extensions/input_method_event_router.h" #include "chrome/browser/chromeos/input_method/input_method_util.h"
diff --git a/chrome/browser/chromeos/extensions/input_method_api.h b/chrome/browser/chromeos/extensions/input_method_api.h index f8cd119..6d67905 100644 --- a/chrome/browser/chromeos/extensions/input_method_api.h +++ b/chrome/browser/chromeos/extensions/input_method_api.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_INPUT_METHOD_API_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/event_router.h"
diff --git a/chrome/browser/chromeos/extensions/input_method_event_router.h b/chrome/browser/chromeos/extensions/input_method_event_router.h index a0cf03b..9bc9510 100644 --- a/chrome/browser/chromeos/extensions/input_method_event_router.h +++ b/chrome/browser/chromeos/extensions/input_method_event_router.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_INPUT_METHOD_EVENT_ROUTER_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_INPUT_METHOD_EVENT_ROUTER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/ime/chromeos/input_method_manager.h" namespace content {
diff --git a/chrome/browser/chromeos/extensions/install_limiter.cc b/chrome/browser/chromeos/extensions/install_limiter.cc index 7bc865d..7990a846 100644 --- a/chrome/browser/chromeos/extensions/install_limiter.cc +++ b/chrome/browser/chromeos/extensions/install_limiter.cc
@@ -19,12 +19,12 @@ namespace { -int64 GetFileSizeOnBlockingPool(const base::FilePath& file) { +int64_t GetFileSizeOnBlockingPool(const base::FilePath& file) { DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); // Get file size. In case of error, sets 0 as file size to let the installer // run and fail. - int64 size; + int64_t size; return base::GetFileSize(file, &size) ? size : 0; } @@ -77,11 +77,10 @@ base::Bind(&InstallLimiter::AddWithSize, AsWeakPtr(), installer, path)); } -void InstallLimiter::AddWithSize( - const scoped_refptr<CrxInstaller>& installer, - const base::FilePath& path, - int64 size) { - const int64 kBigAppSizeThreshold = 1048576; // 1MB +void InstallLimiter::AddWithSize(const scoped_refptr<CrxInstaller>& installer, + const base::FilePath& path, + int64_t size) { + const int64_t kBigAppSizeThreshold = 1048576; // 1MB if (size <= kBigAppSizeThreshold) { RunInstall(installer, path);
diff --git a/chrome/browser/chromeos/extensions/install_limiter.h b/chrome/browser/chromeos/extensions/install_limiter.h index 9a99ccad..32c1e28 100644 --- a/chrome/browser/chromeos/extensions/install_limiter.h +++ b/chrome/browser/chromeos/extensions/install_limiter.h
@@ -5,12 +5,14 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_INSTALL_LIMITER_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_INSTALL_LIMITER_H_ +#include <stdint.h> + #include <queue> #include <set> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" @@ -57,7 +59,7 @@ // Otherwise, it just runs the installer. void AddWithSize(const scoped_refptr<CrxInstaller>& installer, const base::FilePath& path, - int64 size); + int64_t size); // Checks and runs deferred big app installs when appropriate. void CheckAndRunDeferrredInstalls();
diff --git a/chrome/browser/chromeos/extensions/install_limiter_factory.h b/chrome/browser/chromeos/extensions/install_limiter_factory.h index 66aeba0e..45f0fa1 100644 --- a/chrome/browser/chromeos/extensions/install_limiter_factory.h +++ b/chrome/browser/chromeos/extensions/install_limiter_factory.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_INSTALL_LIMITER_FACTORY_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_INSTALL_LIMITER_FACTORY_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/chromeos/extensions/media_player_api.h b/chrome/browser/chromeos/extensions/media_player_api.h index bb84d65..6c59cf9 100644 --- a/chrome/browser/chromeos/extensions/media_player_api.h +++ b/chrome/browser/chromeos/extensions/media_player_api.h
@@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/extension_function.h"
diff --git a/chrome/browser/chromeos/extensions/media_player_event_router.h b/chrome/browser/chromeos/extensions/media_player_event_router.h index bbba962..10e9e5a 100644 --- a/chrome/browser/chromeos/extensions/media_player_event_router.h +++ b/chrome/browser/chromeos/extensions/media_player_event_router.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_MEDIA_PLAYER_EVENT_ROUTER_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_MEDIA_PLAYER_EVENT_ROUTER_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace content { class BrowserContext;
diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_api.cc b/chrome/browser/chromeos/extensions/users_private/users_private_api.cc index 7fd1286..689bf20 100644 --- a/chrome/browser/chromeos/extensions/users_private/users_private_api.cc +++ b/chrome/browser/chromeos/extensions/users_private/users_private_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/extensions/users_private/users_private_api.h" +#include <stddef.h> + #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/extensions/users_private/users_private_delegate.h"
diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc b/chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc index 76944406..9eb36eb5 100644 --- a/chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc +++ b/chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc
@@ -5,8 +5,10 @@ #include <vector> #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chromeos/extensions/users_private/users_private_delegate.h" #include "chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h" #include "chrome/browser/extensions/api/settings_private/prefs_util.h"
diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h b/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h index 32d493a7..533a3ba 100644 --- a/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h +++ b/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_USERS_PRIVATE_USERS_PRIVATE_DELEGATE_FACTORY_H__ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_USERS_PRIVATE_USERS_PRIVATE_DELEGATE_FACTORY_H__ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/chromeos/extensions/wallpaper_function_base.cc b/chrome/browser/chromeos/extensions/wallpaper_function_base.cc index ad3f5cd..f9e62ee 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_function_base.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/chromeos/extensions/wallpaper_function_base.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/synchronization/cancellation_flag.h" #include "chrome/browser/image_decoder.h"
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc index 3ae362d..5573784c 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -17,6 +17,7 @@ #include "base/command_line.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc index 442884d..a7f4888 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
@@ -8,6 +8,7 @@ #include "ash/test/test_shell_delegate.h" #include "ash/wm/window_state.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h" #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/chromeos/external_metrics.cc b/chrome/browser/chromeos/external_metrics.cc index e36f17a..1a60716 100644 --- a/chrome/browser/chromeos/external_metrics.cc +++ b/chrome/browser/chromeos/external_metrics.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/external_metrics.h" +#include <stddef.h> + #include <map> #include <string>
diff --git a/chrome/browser/chromeos/external_metrics.h b/chrome/browser/chromeos/external_metrics.h index fd4873c6..61684f7 100644 --- a/chrome/browser/chromeos/external_metrics.h +++ b/chrome/browser/chromeos/external_metrics.h
@@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" namespace metrics {
diff --git a/chrome/browser/chromeos/external_protocol_dialog.h b/chrome/browser/chromeos/external_protocol_dialog.h index 78296319..830b9e7c 100644 --- a/chrome/browser/chromeos/external_protocol_dialog.h +++ b/chrome/browser/chromeos/external_protocol_dialog.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/string16.h" #include "base/time/time.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h b/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h index 5e440609..f4f1226fc 100644 --- a/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h +++ b/chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/observer_list.h" #include "chromeos/dbus/cros_disks_client.h" #include "chromeos/disks/disk_mount_manager.h"
diff --git a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc index 44adfc6..5f254ca 100644 --- a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc +++ b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_manager/file_browser_handlers.h" +#include <stddef.h> + #include <algorithm> #include <set> @@ -11,6 +13,7 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/i18n/case_conversion.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/file_manager/app_id.h"
diff --git a/chrome/browser/chromeos/file_manager/file_browser_handlers.h b/chrome/browser/chromeos/file_manager/file_browser_handlers.h index 07ad9be..c205a6a 100644 --- a/chrome/browser/chromeos/file_manager/file_browser_handlers.h +++ b/chrome/browser/chromeos/file_manager/file_browser_handlers.h
@@ -11,7 +11,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "chrome/browser/chromeos/file_manager/file_tasks.h"
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc index d66547df..086d2bc 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h"
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc index e14e3eb..628ab9f 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" +#include <stddef.h> + #include <deque> #include "base/json/json_reader.h"
diff --git a/chrome/browser/chromeos/file_manager/file_tasks.cc b/chrome/browser/chromeos/file_manager/file_tasks.cc index a09ef59..336d768 100644 --- a/chrome/browser/chromeos/file_manager/file_tasks.cc +++ b/chrome/browser/chromeos/file_manager/file_tasks.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/chromeos/file_manager/file_tasks.h" +#include <stddef.h> + #include "apps/launcher.h" #include "base/bind.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/chromeos/file_manager/file_tasks.h b/chrome/browser/chromeos/file_manager/file_tasks.h index 7b65e490..984347cfe 100644 --- a/chrome/browser/chromeos/file_manager/file_tasks.h +++ b/chrome/browser/chromeos/file_manager/file_tasks.h
@@ -114,7 +114,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" #include "chrome/common/extensions/api/file_manager_private.h"
diff --git a/chrome/browser/chromeos/file_manager/fileapi_util.cc b/chrome/browser/chromeos/file_manager/fileapi_util.cc index 2b920304..2535a36 100644 --- a/chrome/browser/chromeos/file_manager/fileapi_util.cc +++ b/chrome/browser/chromeos/file_manager/fileapi_util.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/chromeos/file_manager/fileapi_util.h" +#include <stddef.h> + #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/file_manager/app_id.h" #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h"
diff --git a/chrome/browser/chromeos/file_manager/open_with_browser.cc b/chrome/browser/chromeos/file_manager/open_with_browser.cc index 5df5f42..c970ebf 100644 --- a/chrome/browser/chromeos/file_manager/open_with_browser.cc +++ b/chrome/browser/chromeos/file_manager/open_with_browser.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/chromeos/file_manager/open_with_browser.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/file_manager/snapshot_manager.cc b/chrome/browser/chromeos/file_manager/snapshot_manager.cc index d069d9e7..3cf5f7d5 100644 --- a/chrome/browser/chromeos/file_manager/snapshot_manager.cc +++ b/chrome/browser/chromeos/file_manager/snapshot_manager.cc
@@ -18,13 +18,13 @@ namespace file_manager { namespace { -typedef base::Callback<void(int64)> GetNecessaryFreeSpaceCallback; +typedef base::Callback<void(int64_t)> GetNecessaryFreeSpaceCallback; // Part of ComputeSpaceNeedToBeFreed. -int64 ComputeSpaceNeedToBeFreedAfterGetMetadataOnBlockingPool( +int64_t ComputeSpaceNeedToBeFreedAfterGetMetadataOnBlockingPool( const base::FilePath& path, - int64 snapshot_size) { - int64 free_size = base::SysInfo::AmountOfFreeDiskSpace(path); + int64_t snapshot_size) { + int64_t free_size = base::SysInfo::AmountOfFreeDiskSpace(path); if (free_size < 0) return -1; @@ -102,9 +102,8 @@ SnapshotManager::FileReferenceWithSizeInfo::FileReferenceWithSizeInfo( scoped_refptr<storage::ShareableFileReference> ref, - int64 size) - : file_ref(ref), file_size(size) { -} + int64_t size) + : file_ref(ref), file_size(size) {} SnapshotManager::FileReferenceWithSizeInfo::~FileReferenceWithSizeInfo() { } @@ -148,7 +147,7 @@ void SnapshotManager::CreateManagedSnapshotAfterSpaceComputed( const storage::FileSystemURL& filesystem_url, const LocalPathCallback& callback, - int64 needed_space) { + int64_t needed_space) { scoped_refptr<storage::FileSystemContext> context( util::GetFileSystemContextForExtensionId(profile_, kFileManagerAppId)); DCHECK(context.get());
diff --git a/chrome/browser/chromeos/file_manager/snapshot_manager.h b/chrome/browser/chromeos/file_manager/snapshot_manager.h index bf6486e4..5525afca 100644 --- a/chrome/browser/chromeos/file_manager/snapshot_manager.h +++ b/chrome/browser/chromeos/file_manager/snapshot_manager.h
@@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_SNAPSHOT_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_SNAPSHOT_MANAGER_H_ +#include <stdint.h> + #include <deque> #include "base/callback_forward.h" #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" @@ -50,10 +53,10 @@ struct FileReferenceWithSizeInfo { FileReferenceWithSizeInfo( scoped_refptr<storage::ShareableFileReference> ref, - int64 size); + int64_t size); ~FileReferenceWithSizeInfo(); scoped_refptr<storage::ShareableFileReference> file_ref; - int64 file_size; + int64_t file_size; }; private: @@ -61,7 +64,7 @@ void CreateManagedSnapshotAfterSpaceComputed( const storage::FileSystemURL& filesystem_url, const LocalPathCallback& callback, - int64 needed_space); + int64_t needed_space); // Part of CreateManagedSnapshot. void OnCreateSnapshotFile(
diff --git a/chrome/browser/chromeos/file_manager/url_util.cc b/chrome/browser/chromeos/file_manager/url_util.cc index 1f3e9d86..b143851 100644 --- a/chrome/browser/chromeos/file_manager/url_util.cc +++ b/chrome/browser/chromeos/file_manager/url_util.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_manager/url_util.h" +#include <stddef.h> + #include "base/json/json_writer.h" #include "base/values.h" #include "chrome/browser/chromeos/file_manager/app_id.h"
diff --git a/chrome/browser/chromeos/file_manager/volume_manager.cc b/chrome/browser/chromeos/file_manager/volume_manager.cc index 0d3f439..cee0c4af 100644 --- a/chrome/browser/chromeos/file_manager/volume_manager.cc +++ b/chrome/browser/chromeos/file_manager/volume_manager.cc
@@ -4,7 +4,9 @@ #include "chrome/browser/chromeos/file_manager/volume_manager.h" -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" @@ -39,8 +41,8 @@ namespace file_manager { namespace { -const uint32 kAccessCapabilityReadWrite = 0; -const uint32 kFilesystemTypeGenericHierarchical = 2; +const uint32_t kAccessCapabilityReadWrite = 0; +const uint32_t kFilesystemTypeGenericHierarchical = 2; const char kFileManagerMTPMountNamePrefix[] = "fileman-mtp-"; const char kMtpVolumeIdPrefix [] = "mtp:"; const char kRootPath[] = "/";
diff --git a/chrome/browser/chromeos/file_manager/volume_manager.h b/chrome/browser/chromeos/file_manager/volume_manager.h index 33e0554..c245c44 100644 --- a/chrome/browser/chromeos/file_manager/volume_manager.h +++ b/chrome/browser/chromeos/file_manager/volume_manager.h
@@ -9,10 +9,10 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/file_manager/volume_manager_factory.cc b/chrome/browser/chromeos/file_manager/volume_manager_factory.cc index 73d8c39d..d82e2f2b5 100644 --- a/chrome/browser/chromeos/file_manager/volume_manager_factory.cc +++ b/chrome/browser/chromeos/file_manager/volume_manager_factory.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/file_manager/volume_manager_factory.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/memory/singleton.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h"
diff --git a/chrome/browser/chromeos/file_manager/volume_manager_factory.h b/chrome/browser/chromeos/file_manager/volume_manager_factory.h index 7a87d9b5..aac0a04 100644 --- a/chrome/browser/chromeos/file_manager/volume_manager_factory.h +++ b/chrome/browser/chromeos/file_manager/volume_manager_factory.h
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_
diff --git a/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc b/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc index 1d75ccf..8d55d2d8 100644 --- a/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc +++ b/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
@@ -4,10 +4,12 @@ #include "chrome/browser/chromeos/file_manager/volume_manager.h" +#include <stddef.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc index 03fb9af..95d404a21 100644 --- a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc +++ b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h" +#include <stddef.h> + #include "base/thread_task_runner_handle.h" #include "net/base/io_buffer.h" @@ -53,7 +55,7 @@ void FakeProvidedFileSystem::AddEntry(const base::FilePath& entry_path, bool is_directory, const std::string& name, - int64 size, + int64_t size, base::Time modification_time, std::string mime_type, std::string contents) { @@ -62,7 +64,7 @@ metadata->is_directory.reset(new bool(is_directory)); metadata->name.reset(new std::string(name)); - metadata->size.reset(new int64(size)); + metadata->size.reset(new int64_t(size)); metadata->modification_time.reset(new base::Time(modification_time)); metadata->mime_type.reset(new std::string(mime_type)); @@ -105,7 +107,7 @@ if (fields & ProvidedFileSystemInterface::METADATA_FIELD_NAME) metadata->name.reset(new std::string(*entry_it->second->metadata->name)); if (fields & ProvidedFileSystemInterface::METADATA_FIELD_SIZE) - metadata->size.reset(new int64(*entry_it->second->metadata->size)); + metadata->size.reset(new int64_t(*entry_it->second->metadata->size)); if (fields & ProvidedFileSystemInterface::METADATA_FIELD_MODIFICATION_TIME) { metadata->modification_time.reset( new base::Time(*entry_it->second->metadata->modification_time)); @@ -196,7 +198,7 @@ AbortCallback FakeProvidedFileSystem::ReadFile( int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const ProvidedFileSystemInterface::ReadChunkReceivedCallback& callback) { const auto opened_file_it = opened_files_.find(file_handle); @@ -221,7 +223,7 @@ } // Send the response byte by byte. - int64 current_offset = offset; + int64_t current_offset = offset; int current_length = length; // Reading behind EOF is fine, it will just return 0 bytes. @@ -296,7 +298,7 @@ AbortCallback FakeProvidedFileSystem::Truncate( const base::FilePath& file_path, - int64 length, + int64_t length, const storage::AsyncFileUtil::StatusCallback& callback) { // TODO(mtomasz): Implement it once needed. return PostAbortableTask(base::Bind(callback, base::File::FILE_OK)); @@ -305,7 +307,7 @@ AbortCallback FakeProvidedFileSystem::WriteFile( int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const storage::AsyncFileUtil::StatusCallback& callback) { const auto opened_file_it = opened_files_.find(file_handle);
diff --git a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h index 1c28f8e..3e687f1 100644 --- a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h +++ b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h
@@ -5,12 +5,15 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FAKE_PROVIDED_FILE_SYSTEM_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FAKE_PROVIDED_FILE_SYSTEM_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> #include "base/callback.h" #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" @@ -68,7 +71,7 @@ void AddEntry(const base::FilePath& entry_path, bool is_directory, const std::string& name, - int64 size, + int64_t size, base::Time modification_time, std::string mime_type, std::string contents); @@ -103,7 +106,7 @@ const storage::AsyncFileUtil::StatusCallback& callback) override; AbortCallback ReadFile(int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const ReadChunkReceivedCallback& callback) override; AbortCallback CreateDirectory( @@ -127,12 +130,12 @@ const storage::AsyncFileUtil::StatusCallback& callback) override; AbortCallback Truncate( const base::FilePath& file_path, - int64 length, + int64_t length, const storage::AsyncFileUtil::StatusCallback& callback) override; AbortCallback WriteFile( int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const storage::AsyncFileUtil::StatusCallback& callback) override; AbortCallback AddWatcher(
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc b/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc index a4e9a78..c5df3a7 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc
@@ -48,8 +48,8 @@ scoped_ptr<storage::FileStreamReader> BackendDelegate::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) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -64,7 +64,7 @@ scoped_ptr<storage::FileStreamWriter> BackendDelegate::CreateFileStreamWriter( const storage::FileSystemURL& url, - int64 offset, + int64_t offset, storage::FileSystemContext* context) { DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_EQ(storage::kFileSystemTypeProvided, url.type());
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h b/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h index f7bcd0fb..b892ff9 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h +++ b/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h
@@ -5,8 +5,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_BACKEND_DELEGATE_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_BACKEND_DELEGATE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/fileapi/file_system_backend_delegate.h" @@ -34,13 +36,13 @@ storage::FileSystemType type) 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) override; scoped_ptr<storage::FileStreamWriter> CreateFileStreamWriter( const storage::FileSystemURL& url, - int64 offset, + int64_t offset, storage::FileSystemContext* context) override; storage::WatcherManager* GetWatcherManager( storage::FileSystemType type) override;
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.cc b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.cc index cfb1946..6233245 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.cc
@@ -16,7 +16,7 @@ BufferingFileStreamReader::BufferingFileStreamReader( scoped_ptr<storage::FileStreamReader> file_stream_reader, int preloading_buffer_length, - int64 max_bytes_to_read) + int64_t max_bytes_to_read) : file_stream_reader_(file_stream_reader.Pass()), preloading_buffer_length_(preloading_buffer_length), max_bytes_to_read_(max_bytes_to_read), @@ -24,8 +24,7 @@ preloading_buffer_(new net::IOBuffer(preloading_buffer_length)), preloading_buffer_offset_(0), preloaded_bytes_(0), - weak_ptr_factory_(this) { -} + weak_ptr_factory_(this) {} BufferingFileStreamReader::~BufferingFileStreamReader() { } @@ -65,9 +64,9 @@ return net::ERR_IO_PENDING; } -int64 BufferingFileStreamReader::GetLength( +int64_t BufferingFileStreamReader::GetLength( const net::Int64CompletionCallback& callback) { - const int64 result = file_stream_reader_->GetLength(callback); + const int64_t result = file_stream_reader_->GetLength(callback); DCHECK_EQ(net::ERR_IO_PENDING, result); return result; @@ -90,7 +89,7 @@ void BufferingFileStreamReader::Preload( const net::CompletionCallback& callback) { const int preload_bytes = - std::min(static_cast<int64>(preloading_buffer_length_), + std::min(static_cast<int64_t>(preloading_buffer_length_), max_bytes_to_read_ - bytes_read_); const int result = file_stream_reader_->Read(
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h index 77cf87c7..148713e 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h +++ b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader.h
@@ -5,7 +5,9 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_BUFFERING_FILE_STREAM_READER_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_BUFFERING_FILE_STREAM_READER_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -31,7 +33,7 @@ BufferingFileStreamReader( scoped_ptr<storage::FileStreamReader> file_stream_reader, int preloading_buffer_length, - int64 max_bytes_to_read); + int64_t max_bytes_to_read); ~BufferingFileStreamReader() override; @@ -39,7 +41,7 @@ int Read(net::IOBuffer* buf, int buf_len, const net::CompletionCallback& callback) override; - int64 GetLength(const net::Int64CompletionCallback& callback) override; + int64_t GetLength(const net::Int64CompletionCallback& callback) override; private: // Copies data from the preloading buffer and updates the internal iterator. @@ -61,8 +63,8 @@ scoped_ptr<storage::FileStreamReader> file_stream_reader_; int preloading_buffer_length_; - int64 max_bytes_to_read_; - int64 bytes_read_; + int64_t max_bytes_to_read_; + int64_t bytes_read_; scoped_refptr<net::IOBuffer> preloading_buffer_; int preloading_buffer_offset_; int preloaded_bytes_;
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc index bcf5ee65..7ea517d5 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc
@@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" @@ -63,7 +66,7 @@ return net::ERR_IO_PENDING; } - int64 GetLength(const net::Int64CompletionCallback& callback) override { + int64_t GetLength(const net::Int64CompletionCallback& callback) override { DCHECK_EQ(net::OK, return_error_); base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(callback, kFileSize)); @@ -345,9 +348,9 @@ kPreloadingBufferLength, kFileSize); - std::vector<int64> get_length_log; - const int64 result = - reader.GetLength(base::Bind(&LogValue<int64>, &get_length_log)); + std::vector<int64_t> get_length_log; + const int64_t result = + reader.GetLength(base::Bind(&LogValue<int64_t>, &get_length_log)); base::RunLoop().RunUntilIdle(); EXPECT_EQ(net::ERR_IO_PENDING, result);
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer.h b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer.h index 269149c5..14f34b7 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer.h +++ b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_BUFFERING_FILE_STREAM_WRITER_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_BUFFERING_FILE_STREAM_WRITER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc index 5ecae94..662da52 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc
@@ -5,6 +5,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc index 9af8931..a966ee0 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h" #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/trace_event/trace_event.h" #include "chrome/browser/chromeos/file_system_provider/abort_callback.h" @@ -23,7 +24,7 @@ // Converts net::CompletionCallback to net::Int64CompletionCallback. void Int64ToIntCompletionCallback(net::CompletionCallback callback, - int64 result) { + int64_t result) { callback.Run(static_cast<int>(result)); } @@ -65,7 +66,7 @@ // file has not been changed while reading. Must be called on UI thread. void ReadFileOnUIThread( scoped_refptr<net::IOBuffer> buffer, - int64 offset, + int64_t offset, int length, const ProvidedFileSystemInterface::ReadChunkReceivedCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -196,7 +197,7 @@ FileStreamReader::FileStreamReader(storage::FileSystemContext* context, const storage::FileSystemURL& url, - int64 initial_offset, + int64_t initial_offset, const base::Time& expected_modification_time) : url_(url), current_offset_(initial_offset), @@ -204,8 +205,7 @@ expected_modification_time_(expected_modification_time), runner_(new OperationRunner), state_(NOT_INITIALIZED), - weak_ptr_factory_(this) { -} + weak_ptr_factory_(this) {} FileStreamReader::~FileStreamReader() { // FileStreamReader doesn't have a Cancel() method like in FileStreamWriter. @@ -353,7 +353,7 @@ "file_system_provider", "FileStreamReader::Read", this); } -int64 FileStreamReader::GetLength( +int64_t FileStreamReader::GetLength( const net::Int64CompletionCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO);
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h index 6d348d1..39e219f0e 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h +++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h
@@ -5,8 +5,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_FILE_STREAM_READER_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_FILE_STREAM_READER_H_ -#include "base/basictypes.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 "base/memory/weak_ptr.h" @@ -31,7 +33,7 @@ FileStreamReader(storage::FileSystemContext* context, const storage::FileSystemURL& url, - int64 initial_offset, + int64_t initial_offset, const base::Time& expected_modification_time); ~FileStreamReader() override; @@ -40,7 +42,7 @@ int Read(net::IOBuffer* buf, int buf_len, const net::CompletionCallback& callback) override; - int64 GetLength(const net::Int64CompletionCallback& callback) override; + int64_t GetLength(const net::Int64CompletionCallback& callback) override; private: // Helper class for executing operations on the provided file system. All @@ -97,8 +99,8 @@ void GetLengthAfterInitialized(const net::Int64CompletionCallback& callback); storage::FileSystemURL url_; - int64 current_offset_; - int64 current_length_; + int64_t current_offset_; + int64_t current_length_; base::Time expected_modification_time_; scoped_refptr<OperationRunner> runner_; State state_;
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc index d9db120d..c8fb8b2 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc
@@ -4,12 +4,16 @@ #include "chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/numerics/safe_math.h" @@ -44,16 +48,16 @@ virtual ~EventLogger() {} void OnRead(int result) { results_.push_back(result); } - void OnGetLength(int64 result) { results_.push_back(result); } + void OnGetLength(int64_t result) { results_.push_back(result); } base::WeakPtr<EventLogger> GetWeakPtr() { return weak_ptr_factory_.GetWeakPtr(); } - const std::vector<int64>& results() const { return results_; } + const std::vector<int64_t>& results() const { return results_; } private: - std::vector<int64> results_; + std::vector<int64_t> results_; base::WeakPtrFactory<EventLogger> weak_ptr_factory_; DISALLOW_COPY_AND_ASSIGN(EventLogger); @@ -124,7 +128,7 @@ TEST_F(FileSystemProviderFileStreamReader, Read_AllAtOnce) { EventLogger logger; - const int64 initial_offset = 0; + const int64_t initial_offset = 0; FileStreamReader reader(NULL, file_url_, initial_offset, *fake_file_->metadata->modification_time); scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer( @@ -147,7 +151,7 @@ TEST_F(FileSystemProviderFileStreamReader, Read_WrongFile) { EventLogger logger; - const int64 initial_offset = 0; + const int64_t initial_offset = 0; FileStreamReader reader(NULL, wrong_file_url_, initial_offset, *fake_file_->metadata->modification_time); scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer( @@ -166,11 +170,11 @@ TEST_F(FileSystemProviderFileStreamReader, Read_InChunks) { EventLogger logger; - const int64 initial_offset = 0; + const int64_t initial_offset = 0; FileStreamReader reader(NULL, file_url_, initial_offset, *fake_file_->metadata->modification_time); - for (int64 offset = 0; offset < *fake_file_->metadata->size; ++offset) { + for (int64_t offset = 0; offset < *fake_file_->metadata->size; ++offset) { scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer(1)); const int result = reader.Read(io_buffer.get(), @@ -178,7 +182,7 @@ base::Bind(&EventLogger::OnRead, logger.GetWeakPtr())); EXPECT_EQ(net::ERR_IO_PENDING, result); base::RunLoop().RunUntilIdle(); - ASSERT_EQ(offset + 1, static_cast<int64>(logger.results().size())); + ASSERT_EQ(offset + 1, static_cast<int64_t>(logger.results().size())); EXPECT_EQ(1, logger.results()[offset]); EXPECT_EQ(fake_file_->contents[offset], io_buffer->data()[0]); } @@ -188,7 +192,7 @@ EventLogger logger; // Trim first 3 and last 3 characters. - const int64 initial_offset = 3; + const int64_t initial_offset = 3; const int length = *fake_file_->metadata->size - initial_offset - 3; ASSERT_GT(*fake_file_->metadata->size, initial_offset); ASSERT_LT(0, length); @@ -217,7 +221,7 @@ EventLogger logger; // Request reading 1KB more than available. - const int64 initial_offset = 0; + const int64_t initial_offset = 0; const int length = *fake_file_->metadata->size + 1024; FileStreamReader reader(NULL, file_url_, initial_offset, @@ -242,7 +246,7 @@ TEST_F(FileSystemProviderFileStreamReader, Read_ModifiedFile) { EventLogger logger; - const int64 initial_offset = 0; + const int64_t initial_offset = 0; FileStreamReader reader(NULL, file_url_, initial_offset, base::Time::Max()); scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer( @@ -261,7 +265,7 @@ TEST_F(FileSystemProviderFileStreamReader, Read_ExpectedModificationTimeNull) { EventLogger logger; - const int64 initial_offset = 0; + const int64_t initial_offset = 0; FileStreamReader reader(NULL, file_url_, initial_offset, base::Time()); scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer( @@ -283,7 +287,7 @@ TEST_F(FileSystemProviderFileStreamReader, GetLength) { EventLogger logger; - const int64 initial_offset = 0; + const int64_t initial_offset = 0; FileStreamReader reader(NULL, file_url_, initial_offset, *fake_file_->metadata->modification_time); @@ -300,7 +304,7 @@ TEST_F(FileSystemProviderFileStreamReader, GetLength_WrongFile) { EventLogger logger; - const int64 initial_offset = 0; + const int64_t initial_offset = 0; FileStreamReader reader(NULL, wrong_file_url_, initial_offset, *fake_file_->metadata->modification_time); @@ -316,7 +320,7 @@ TEST_F(FileSystemProviderFileStreamReader, GetLength_ModifiedFile) { EventLogger logger; - const int64 initial_offset = 0; + const int64_t initial_offset = 0; FileStreamReader reader(NULL, file_url_, initial_offset, base::Time::Max()); const int result = reader.GetLength( @@ -332,7 +336,7 @@ GetLength_ExpectedModificationTimeNull) { EventLogger logger; - const int64 initial_offset = 0; + const int64_t initial_offset = 0; FileStreamReader reader(NULL, file_url_, initial_offset, base::Time()); const int result = reader.GetLength(
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.cc b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.cc index 2a44935..ff23f50b 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h" @@ -56,7 +57,7 @@ // |callback| is executed. Must be called on UI thread. void WriteFileOnUIThread( scoped_refptr<net::IOBuffer> buffer, - int64 offset, + int64_t offset, int length, const storage::AsyncFileUtil::StatusCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -138,13 +139,12 @@ }; FileStreamWriter::FileStreamWriter(const storage::FileSystemURL& url, - int64 initial_offset) + int64_t initial_offset) : url_(url), current_offset_(initial_offset), runner_(new OperationRunner), state_(NOT_INITIALIZED), - weak_ptr_factory_(this) { -} + weak_ptr_factory_(this) {} FileStreamWriter::~FileStreamWriter() { // Close the runner explicitly if the file streamer is
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.h b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.h index b898f2bd3..2d4f215 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.h +++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.h
@@ -5,9 +5,11 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_FILE_STREAM_WRITER_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_FILE_STREAM_WRITER_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "storage/browser/fileapi/file_stream_writer.h" @@ -22,7 +24,7 @@ // to Write(). class FileStreamWriter : public storage::FileStreamWriter { public: - FileStreamWriter(const storage::FileSystemURL& url, int64 initial_offset); + FileStreamWriter(const storage::FileSystemURL& url, int64_t initial_offset); ~FileStreamWriter() override; @@ -75,7 +77,7 @@ const net::CompletionCallback& callback); storage::FileSystemURL url_; - int64 current_offset_; + int64_t current_offset_; scoped_refptr<OperationRunner> runner_; State state_;
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer_unittest.cc index c05b2526..6cf58b68 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer_unittest.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/file_system_provider/fileapi/file_stream_writer.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> @@ -103,7 +106,7 @@ TEST_F(FileSystemProviderFileStreamWriter, Write) { std::vector<int> write_log; - const int64 initial_offset = 0; + const int64_t initial_offset = 0; FileStreamWriter writer(file_url_, initial_offset); scoped_refptr<net::IOBuffer> io_buffer(new net::StringIOBuffer(kTextToWrite)); @@ -154,7 +157,7 @@ TEST_F(FileSystemProviderFileStreamWriter, Cancel) { std::vector<int> write_log; - const int64 initial_offset = 0; + const int64_t initial_offset = 0; FileStreamWriter writer(file_url_, initial_offset); scoped_refptr<net::IOBuffer> io_buffer(new net::StringIOBuffer(kTextToWrite)); @@ -176,7 +179,7 @@ TEST_F(FileSystemProviderFileStreamWriter, Cancel_NotRunning) { std::vector<int> write_log; - const int64 initial_offset = 0; + const int64_t initial_offset = 0; FileStreamWriter writer(file_url_, initial_offset); scoped_refptr<net::IOBuffer> io_buffer(new net::StringIOBuffer(kTextToWrite)); @@ -192,7 +195,7 @@ TEST_F(FileSystemProviderFileStreamWriter, Write_WrongFile) { std::vector<int> write_log; - const int64 initial_offset = 0; + const int64_t initial_offset = 0; FileStreamWriter writer(wrong_file_url_, initial_offset); scoped_refptr<net::IOBuffer> io_buffer(new net::StringIOBuffer(kTextToWrite)); @@ -214,7 +217,7 @@ ASSERT_TRUE(entry); const std::string original_contents = entry->contents; - const int64 initial_offset = *entry->metadata->size; + const int64_t initial_offset = *entry->metadata->size; ASSERT_LT(0, initial_offset); FileStreamWriter writer(file_url_, initial_offset);
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.cc b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.cc index a79799a..9ba03b02 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.cc
@@ -251,7 +251,7 @@ void TruncateOnUIThread( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - int64 length, + int64_t length, const storage::AsyncFileUtil::StatusCallback& callback) { util::FileSystemURLParser parser(url); if (!parser.Parse()) { @@ -365,7 +365,7 @@ void ProviderAsyncFileUtil::Truncate( scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - int64 length, + int64_t length, const StatusCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO); BrowserThread::PostTask(BrowserThread::UI,
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h index 757f624..53f2dce8 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h +++ b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h
@@ -5,8 +5,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_PROVIDER_ASYNC_FILE_UTIL_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_PROVIDER_ASYNC_FILE_UTIL_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/callback.h" +#include "base/macros.h" #include "storage/browser/fileapi/async_file_util.h" namespace chromeos { @@ -59,7 +61,7 @@ const StatusCallback& callback) override; void Truncate(scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& url, - int64 length, + int64_t length, const StatusCallback& callback) override; void CopyFileLocal(scoped_ptr<storage::FileSystemOperationContext> context, const storage::FileSystemURL& src_url,
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc index cd2b02b59..cefd052 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util_unittest.cc
@@ -4,12 +4,15 @@ #include "chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h" +#include <stdint.h> + #include <string> #include <vector> #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" @@ -79,7 +82,7 @@ result_.reset(new base::File::Error(error)); } - void OnCopyFileProgress(int64 size) {} + void OnCopyFileProgress(int64_t size) {} base::File::Error* result() { return result_.get(); }
diff --git a/chrome/browser/chromeos/file_system_provider/mount_path_util.cc b/chrome/browser/chromeos/file_system_provider/mount_path_util.cc index 22a1aa1..cd568f0 100644 --- a/chrome/browser/chromeos/file_system_provider/mount_path_util.cc +++ b/chrome/browser/chromeos/file_system_provider/mount_path_util.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_system_provider/mount_path_util.h" +#include <stddef.h> + #include <vector> #include "base/stl_util.h"
diff --git a/chrome/browser/chromeos/file_system_provider/mount_path_util.h b/chrome/browser/chromeos/file_system_provider/mount_path_util.h index 77a1759..a9ed2b1e 100644 --- a/chrome/browser/chromeos/file_system_provider/mount_path_util.h +++ b/chrome/browser/chromeos/file_system_provider/mount_path_util.h
@@ -8,6 +8,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "storage/browser/fileapi/file_system_url.h" class Profile;
diff --git a/chrome/browser/chromeos/file_system_provider/notification_manager.cc b/chrome/browser/chromeos/file_system_provider/notification_manager.cc index 44b3b3c..98662ed 100644 --- a/chrome/browser/chromeos/file_system_provider/notification_manager.cc +++ b/chrome/browser/chromeos/file_system_provider/notification_manager.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/chromeos/file_system_provider/notification_manager.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/app_icon_loader_impl.h"
diff --git a/chrome/browser/chromeos/file_system_provider/notification_manager.h b/chrome/browser/chromeos/file_system_provider/notification_manager.h index 578f695..03d1458 100644 --- a/chrome/browser/chromeos/file_system_provider/notification_manager.h +++ b/chrome/browser/chromeos/file_system_provider/notification_manager.h
@@ -9,6 +9,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/notification_manager_interface.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/notification_manager_interface.h b/chrome/browser/chromeos/file_system_provider/notification_manager_interface.h index 6b889e1d..648916a 100644 --- a/chrome/browser/chromeos/file_system_provider/notification_manager_interface.h +++ b/chrome/browser/chromeos/file_system_provider/notification_manager_interface.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_NOTIFICATION_MANAGER_INTERFACE_H_ #include "base/callback.h" +#include "base/macros.h" namespace chromeos { namespace file_system_provider {
diff --git a/chrome/browser/chromeos/file_system_provider/operations/abort.h b/chrome/browser/chromeos/file_system_provider/operations/abort.h index 0dc7ff1..53484fd 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/abort.h +++ b/chrome/browser/chromeos/file_system_provider/operations/abort.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_ABORT_H_ #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/add_watcher.h b/chrome/browser/chromeos/file_system_provider/operations/add_watcher.h index d9387441..cbdc7934 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/add_watcher.h +++ b/chrome/browser/chromeos/file_system_provider/operations/add_watcher.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_ADD_WATCHER_H_ #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/close_file.h b/chrome/browser/chromeos/file_system_provider/operations/close_file.h index 0d52a07..1b632954 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/close_file.h +++ b/chrome/browser/chromeos/file_system_provider/operations/close_file.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_CLOSE_FILE_H_ #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/configure.h b/chrome/browser/chromeos/file_system_provider/operations/configure.h index aa3f84d..881688c 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/configure.h +++ b/chrome/browser/chromeos/file_system_provider/operations/configure.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_CONFIGURE_H_ #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "storage/browser/fileapi/async_file_util.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/copy_entry.h b/chrome/browser/chromeos/file_system_provider/operations/copy_entry.h index 6fba429e..2ee430e 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/copy_entry.h +++ b/chrome/browser/chromeos/file_system_provider/operations/copy_entry.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_COPY_ENTRY_H_ #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/create_directory.h b/chrome/browser/chromeos/file_system_provider/operations/create_directory.h index ed57b8d..62ec3afc 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/create_directory.h +++ b/chrome/browser/chromeos/file_system_provider/operations/create_directory.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_CREATE_DIRECTORY_H_ #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/create_file.h b/chrome/browser/chromeos/file_system_provider/operations/create_file.h index 9fcd295..15c5cc7 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/create_file.h +++ b/chrome/browser/chromeos/file_system_provider/operations/create_file.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_CREATE_FILE_H_ #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/delete_entry.h b/chrome/browser/chromeos/file_system_provider/operations/delete_entry.h index bab26d1..0d5607e 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/delete_entry.h +++ b/chrome/browser/chromeos/file_system_provider/operations/delete_entry.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_DELETE_ENTRY_H_ #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/execute_action.h b/chrome/browser/chromeos/file_system_provider/operations/execute_action.h index abc51cc..55cd75fa 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/execute_action.h +++ b/chrome/browser/chromeos/file_system_provider/operations/execute_action.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/get_actions.h b/chrome/browser/chromeos/file_system_provider/operations/get_actions.h index cb93543..384136a 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/get_actions.h +++ b/chrome/browser/chromeos/file_system_provider/operations/get_actions.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/get_actions_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/get_actions_unittest.cc index e042b7a..c666542 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/get_actions_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/get_actions_unittest.cc
@@ -10,6 +10,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/get_metadata.cc b/chrome/browser/chromeos/file_system_provider/operations/get_metadata.cc index 9bbefe1..dad618f 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/get_metadata.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/get_metadata.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_system_provider/operations/get_metadata.h" +#include <stdint.h> + #include <algorithm> #include <string> @@ -38,7 +40,8 @@ output->is_directory.reset(new bool(*params->metadata.is_directory)); if (fields & ProvidedFileSystemInterface::METADATA_FIELD_SIZE) - output->size.reset(new int64(static_cast<int64>(*params->metadata.size))); + output->size.reset( + new int64_t(static_cast<int64_t>(*params->metadata.size))); if (fields & ProvidedFileSystemInterface::METADATA_FIELD_MODIFICATION_TIME) { std::string input_modification_time;
diff --git a/chrome/browser/chromeos/file_system_provider/operations/get_metadata.h b/chrome/browser/chromeos/file_system_provider/operations/get_metadata.h index cfb8e87..ae44098 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/get_metadata.h +++ b/chrome/browser/chromeos/file_system_provider/operations/get_metadata.h
@@ -8,6 +8,7 @@ #include <string> #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc index 8f89f59..d9168fa 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc
@@ -9,6 +9,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/move_entry.h b/chrome/browser/chromeos/file_system_provider/operations/move_entry.h index 08aa441..e64091b4 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/move_entry.h +++ b/chrome/browser/chromeos/file_system_provider/operations/move_entry.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_MOVE_ENTRY_H_ #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/open_file.h b/chrome/browser/chromeos/file_system_provider/operations/open_file.h index 852c466..d77106a 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/open_file.h +++ b/chrome/browser/chromeos/file_system_provider/operations/open_file.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_OPEN_FILE_H_ #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc index 7250547..8593a9a 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc
@@ -9,6 +9,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "chrome/browser/chromeos/file_system_provider/operations/test_util.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/operation.h b/chrome/browser/chromeos/file_system_provider/operations/operation.h index 491f6530..a547afd3 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/operation.h +++ b/chrome/browser/chromeos/file_system_provider/operations/operation.h
@@ -8,6 +8,7 @@ #include <string> #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h" #include "chrome/browser/chromeos/file_system_provider/request_manager.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_directory.cc b/chrome/browser/chromeos/file_system_provider/operations/read_directory.cc index 2f77ff7..cdbdae6 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/read_directory.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/read_directory.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_system_provider/operations/read_directory.h" +#include <stddef.h> + #include <string> #include "base/memory/linked_ptr.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_directory.h b/chrome/browser/chromeos/file_system_provider/operations/read_directory.h index 3e1e369..0b9ebfe 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/read_directory.h +++ b/chrome/browser/chromeos/file_system_provider/operations/read_directory.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_READ_DIRECTORY_H_ #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc index 4c2f2a1..6fdd7d3 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc
@@ -9,6 +9,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_file.cc b/chrome/browser/chromeos/file_system_provider/operations/read_file.cc index 398edc2..03ff60b 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/read_file.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/read_file.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_system_provider/operations/read_file.h" +#include <stddef.h> + #include <limits> #include <string> @@ -47,7 +49,7 @@ const ProvidedFileSystemInfo& file_system_info, int file_handle, scoped_refptr<net::IOBuffer> buffer, - int64 offset, + int64_t offset, int length, const ProvidedFileSystemInterface::ReadChunkReceivedCallback& callback) : Operation(event_router, file_system_info), @@ -56,8 +58,7 @@ offset_(offset), length_(length), current_offset_(0), - callback_(callback) { -} + callback_(callback) {} ReadFile::~ReadFile() { }
diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_file.h b/chrome/browser/chromeos/file_system_provider/operations/read_file.h index b04e9b4..6f8b4342 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/read_file.h +++ b/chrome/browser/chromeos/file_system_provider/operations/read_file.h
@@ -5,7 +5,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_READ_FILE_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_READ_FILE_H_ +#include <stdint.h> + #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" @@ -36,7 +39,7 @@ const ProvidedFileSystemInfo& file_system_info, int file_handle, scoped_refptr<net::IOBuffer> buffer, - int64 offset, + int64_t offset, int length, const ProvidedFileSystemInterface::ReadChunkReceivedCallback& callback); ~ReadFile() override; @@ -53,9 +56,9 @@ private: int file_handle_; scoped_refptr<net::IOBuffer> buffer_; - int64 offset_; + int64_t offset_; int length_; - int64 current_offset_; + int64_t current_offset_; const ProvidedFileSystemInterface::ReadChunkReceivedCallback callback_; DISALLOW_COPY_AND_ASSIGN(ReadFile);
diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc index acfe462..c269afd 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc
@@ -8,6 +8,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/remove_watcher.h b/chrome/browser/chromeos/file_system_provider/operations/remove_watcher.h index b054348..bacc5d6 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/remove_watcher.h +++ b/chrome/browser/chromeos/file_system_provider/operations/remove_watcher.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_REMOVE_WATCHER_H_ #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/test_util.h b/chrome/browser/chromeos/file_system_provider/operations/test_util.h index df05e0e..73c753cc 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/test_util.h +++ b/chrome/browser/chromeos/file_system_provider/operations/test_util.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/truncate.cc b/chrome/browser/chromeos/file_system_provider/operations/truncate.cc index 38b82fc..c9757ce 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/truncate.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/truncate.cc
@@ -16,13 +16,12 @@ Truncate::Truncate(extensions::EventRouter* event_router, const ProvidedFileSystemInfo& file_system_info, const base::FilePath& file_path, - int64 length, + int64_t length, const storage::AsyncFileUtil::StatusCallback& callback) : Operation(event_router, file_system_info), file_path_(file_path), length_(length), - callback_(callback) { -} + callback_(callback) {} Truncate::~Truncate() { }
diff --git a/chrome/browser/chromeos/file_system_provider/operations/truncate.h b/chrome/browser/chromeos/file_system_provider/operations/truncate.h index 07962655..487a66f 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/truncate.h +++ b/chrome/browser/chromeos/file_system_provider/operations/truncate.h
@@ -5,7 +5,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_TRUNCATE_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_TRUNCATE_H_ +#include <stdint.h> + #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h" @@ -32,7 +35,7 @@ Truncate(extensions::EventRouter* event_router, const ProvidedFileSystemInfo& file_system_info, const base::FilePath& file_path, - int64 length, + int64_t length, const storage::AsyncFileUtil::StatusCallback& callback); ~Truncate() override; @@ -47,7 +50,7 @@ private: base::FilePath file_path_; - int64 length_; + int64_t length_; const storage::AsyncFileUtil::StatusCallback callback_; DISALLOW_COPY_AND_ASSIGN(Truncate);
diff --git a/chrome/browser/chromeos/file_system_provider/operations/truncate_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/truncate_unittest.cc index 23fa0f5e..feae5cd6 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/truncate_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/truncate_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_system_provider/operations/truncate.h" +#include <stdint.h> + #include <string> #include <vector> @@ -29,7 +31,7 @@ const int kRequestId = 2; const base::FilePath::CharType kFilePath[] = FILE_PATH_LITERAL("/kitty/and/puppy/happy"); -const int64 kTruncateLength = 64; +const int64_t kTruncateLength = 64; } // namespace
diff --git a/chrome/browser/chromeos/file_system_provider/operations/unmount.h b/chrome/browser/chromeos/file_system_provider/operations/unmount.h index 4b966af..079c8253 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/unmount.h +++ b/chrome/browser/chromeos/file_system_provider/operations/unmount.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_UNMOUNT_H_ #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" #include "storage/browser/fileapi/async_file_util.h"
diff --git a/chrome/browser/chromeos/file_system_provider/operations/write_file.cc b/chrome/browser/chromeos/file_system_provider/operations/write_file.cc index c1bf23b1..d2118553 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/write_file.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/write_file.cc
@@ -17,7 +17,7 @@ const ProvidedFileSystemInfo& file_system_info, int file_handle, scoped_refptr<net::IOBuffer> buffer, - int64 offset, + int64_t offset, int length, const storage::AsyncFileUtil::StatusCallback& callback) : Operation(event_router, file_system_info), @@ -25,8 +25,7 @@ buffer_(buffer), offset_(offset), length_(length), - callback_(callback) { -} + callback_(callback) {} WriteFile::~WriteFile() { }
diff --git a/chrome/browser/chromeos/file_system_provider/operations/write_file.h b/chrome/browser/chromeos/file_system_provider/operations/write_file.h index c9b220f..5e50fb8 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/write_file.h +++ b/chrome/browser/chromeos/file_system_provider/operations/write_file.h
@@ -5,7 +5,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_WRITE_FILE_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_WRITE_FILE_H_ +#include <stdint.h> + #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/operations/operation.h" @@ -36,7 +39,7 @@ const ProvidedFileSystemInfo& file_system_info, int file_handle, scoped_refptr<net::IOBuffer> buffer, - int64 offset, + int64_t offset, int length, const storage::AsyncFileUtil::StatusCallback& callback); ~WriteFile() override; @@ -53,7 +56,7 @@ private: int file_handle_; scoped_refptr<net::IOBuffer> buffer_; - int64 offset_; + int64_t offset_; int length_; const storage::AsyncFileUtil::StatusCallback callback_;
diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system.cc b/chrome/browser/chromeos/file_system_provider/provided_file_system.cc index 4657f19..5e1f073 100644 --- a/chrome/browser/chromeos/file_system_provider/provided_file_system.cc +++ b/chrome/browser/chromeos/file_system_provider/provided_file_system.cc
@@ -7,6 +7,7 @@ #include <vector> #include "base/files/file.h" +#include "base/macros.h" #include "base/trace_event/trace_event.h" #include "chrome/browser/chromeos/file_system_provider/notification_manager.h" #include "chrome/browser/chromeos/file_system_provider/operations/abort.h" @@ -253,7 +254,7 @@ AbortCallback ProvidedFileSystem::ReadFile( int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const ReadChunkReceivedCallback& callback) { TRACE_EVENT1( @@ -394,7 +395,7 @@ AbortCallback ProvidedFileSystem::WriteFile( int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const storage::AsyncFileUtil::StatusCallback& callback) { TRACE_EVENT1("file_system_provider", @@ -443,7 +444,7 @@ AbortCallback ProvidedFileSystem::Truncate( const base::FilePath& file_path, - int64 length, + int64_t length, const storage::AsyncFileUtil::StatusCallback& callback) { const int request_id = request_manager_->CreateRequest( TRUNCATE,
diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system.h b/chrome/browser/chromeos/file_system_provider/provided_file_system.h index 4d5c50d6..43ddba3 100644 --- a/chrome/browser/chromeos/file_system_provider/provided_file_system.h +++ b/chrome/browser/chromeos/file_system_provider/provided_file_system.h
@@ -5,8 +5,12 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -112,7 +116,7 @@ const storage::AsyncFileUtil::StatusCallback& callback) override; AbortCallback ReadFile(int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const ReadChunkReceivedCallback& callback) override; AbortCallback CreateDirectory( @@ -136,12 +140,12 @@ const storage::AsyncFileUtil::StatusCallback& callback) override; AbortCallback Truncate( const base::FilePath& file_path, - int64 length, + int64_t length, const storage::AsyncFileUtil::StatusCallback& callback) override; AbortCallback WriteFile( int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const storage::AsyncFileUtil::StatusCallback& callback) override; AbortCallback AddWatcher(
diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h b/chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h index acb6ace..e10bc39 100644 --- a/chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h +++ b/chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_INTERFACE_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_INTERFACE_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> @@ -12,6 +14,7 @@ #include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" @@ -45,7 +48,7 @@ // non-empty. scoped_ptr<bool> is_directory; scoped_ptr<std::string> name; - scoped_ptr<int64> size; + scoped_ptr<int64_t> size; scoped_ptr<base::Time> modification_time; scoped_ptr<std::string> mime_type; scoped_ptr<std::string> thumbnail; @@ -165,7 +168,7 @@ // return less only in case EOF is encountered. virtual AbortCallback ReadFile(int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const ReadChunkReceivedCallback& callback) = 0; @@ -207,14 +210,14 @@ // Requests truncating a file to the desired length. virtual AbortCallback Truncate( const base::FilePath& file_path, - int64 length, + int64_t length, const storage::AsyncFileUtil::StatusCallback& callback) = 0; // Requests writing to a file previously opened with |file_handle|. virtual AbortCallback WriteFile( int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const storage::AsyncFileUtil::StatusCallback& callback) = 0;
diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc b/chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc index 64be6fc..74390aac 100644 --- a/chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc
@@ -8,6 +8,7 @@ #include <vector> #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h"
diff --git a/chrome/browser/chromeos/file_system_provider/queue.h b/chrome/browser/chromeos/file_system_provider/queue.h index adc1684e..ca40efc 100644 --- a/chrome/browser/chromeos/file_system_provider/queue.h +++ b/chrome/browser/chromeos/file_system_provider/queue.h
@@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_QUEUE_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_QUEUE_H_ +#include <stddef.h> + #include <deque> #include <map> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/file_system_provider/abort_callback.h"
diff --git a/chrome/browser/chromeos/file_system_provider/queue_unittest.cc b/chrome/browser/chromeos/file_system_provider/queue_unittest.cc index f371659..4356742 100644 --- a/chrome/browser/chromeos/file_system_provider/queue_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/queue_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_system_provider/queue.h" +#include <stddef.h> + #include <vector> #include "base/files/file.h"
diff --git a/chrome/browser/chromeos/file_system_provider/registry.h b/chrome/browser/chromeos/file_system_provider/registry.h index 0483e45..209e104 100644 --- a/chrome/browser/chromeos/file_system_provider/registry.h +++ b/chrome/browser/chromeos/file_system_provider/registry.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/file_system_provider/registry_interface.h" #include "chrome/browser/chromeos/file_system_provider/watcher.h"
diff --git a/chrome/browser/chromeos/file_system_provider/request_manager.h b/chrome/browser/chromeos/file_system_provider/request_manager.h index 68ab0be..bd3ef86a 100644 --- a/chrome/browser/chromeos/file_system_provider/request_manager.h +++ b/chrome/browser/chromeos/file_system_provider/request_manager.h
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc b/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc index 89726b3..52ad7c5 100644 --- a/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/request_manager_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_system_provider/request_manager.h" +#include <stddef.h> + #include <map> #include <string> #include <vector> @@ -12,6 +14,7 @@ #include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/file_system_provider/request_value.h b/chrome/browser/chromeos/file_system_provider/request_value.h index f68483be..b398972 100644 --- a/chrome/browser/chromeos/file_system_provider/request_value.h +++ b/chrome/browser/chromeos/file_system_provider/request_value.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/extensions/api/file_system_provider_internal.h"
diff --git a/chrome/browser/chromeos/file_system_provider/service.cc b/chrome/browser/chromeos/file_system_provider/service.cc index 8766a8a..14d40b1e 100644 --- a/chrome/browser/chromeos/file_system_provider/service.cc +++ b/chrome/browser/chromeos/file_system_provider/service.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_system_provider/service.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h"
diff --git a/chrome/browser/chromeos/file_system_provider/service.h b/chrome/browser/chromeos/file_system_provider/service.h index 2d6da2d..e163a5b9 100644 --- a/chrome/browser/chromeos/file_system_provider/service.h +++ b/chrome/browser/chromeos/file_system_provider/service.h
@@ -13,6 +13,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/chromeos/file_system_provider/service_factory.h b/chrome/browser/chromeos/file_system_provider/service_factory.h index de5dd33..ab4707f 100644 --- a/chrome/browser/chromeos/file_system_provider/service_factory.h +++ b/chrome/browser/chromeos/file_system_provider/service_factory.h
@@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "content/public/browser/browser_context.h"
diff --git a/chrome/browser/chromeos/file_system_provider/service_unittest.cc b/chrome/browser/chromeos/file_system_provider/service_unittest.cc index 8e108ce..0d5ea1e 100644 --- a/chrome/browser/chromeos/file_system_provider/service_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
@@ -4,10 +4,13 @@ #include "chrome/browser/chromeos/file_system_provider/service.h" +#include <stddef.h> + #include <string> #include <vector> #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/chromeos/file_system_provider/throttled_file_system.cc b/chrome/browser/chromeos/file_system_provider/throttled_file_system.cc index 331aa01..416cec6e 100644 --- a/chrome/browser/chromeos/file_system_provider/throttled_file_system.cc +++ b/chrome/browser/chromeos/file_system_provider/throttled_file_system.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_system_provider/throttled_file_system.h" +#include <stddef.h> + #include <limits> #include <vector> @@ -60,7 +62,7 @@ AbortCallback ThrottledFileSystem::ReadFile( int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const ReadChunkReceivedCallback& callback) { return file_system_->ReadFile(file_handle, buffer, offset, length, callback); @@ -121,7 +123,7 @@ AbortCallback ThrottledFileSystem::WriteFile( int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const storage::AsyncFileUtil::StatusCallback& callback) { return file_system_->WriteFile(file_handle, buffer, offset, length, callback); @@ -136,7 +138,7 @@ AbortCallback ThrottledFileSystem::Truncate( const base::FilePath& file_path, - int64 length, + int64_t length, const storage::AsyncFileUtil::StatusCallback& callback) { return file_system_->Truncate(file_path, length, callback); }
diff --git a/chrome/browser/chromeos/file_system_provider/throttled_file_system.h b/chrome/browser/chromeos/file_system_provider/throttled_file_system.h index 55d4d8c..8f9563f 100644 --- a/chrome/browser/chromeos/file_system_provider/throttled_file_system.h +++ b/chrome/browser/chromeos/file_system_provider/throttled_file_system.h
@@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_THROTTLED_FILE_SYSTEM_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_THROTTLED_FILE_SYSTEM_H_ +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -66,7 +69,7 @@ const storage::AsyncFileUtil::StatusCallback& callback) override; AbortCallback ReadFile(int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const ReadChunkReceivedCallback& callback) override; AbortCallback CreateDirectory( @@ -90,12 +93,12 @@ const storage::AsyncFileUtil::StatusCallback& callback) override; AbortCallback Truncate( const base::FilePath& file_path, - int64 length, + int64_t length, const storage::AsyncFileUtil::StatusCallback& callback) override; AbortCallback WriteFile( int file_handle, net::IOBuffer* buffer, - int64 offset, + int64_t offset, int length, const storage::AsyncFileUtil::StatusCallback& callback) override; AbortCallback AddWatcher(
diff --git a/chrome/browser/chromeos/file_system_provider/throttled_file_system_unittest.cc b/chrome/browser/chromeos/file_system_provider/throttled_file_system_unittest.cc index 02f1b27..f3e75ed 100644 --- a/chrome/browser/chromeos/file_system_provider/throttled_file_system_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/throttled_file_system_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/file_system_provider/throttled_file_system.h" +#include <stddef.h> + #include <vector> #include "base/files/file.h"
diff --git a/chrome/browser/chromeos/fileapi/external_file_protocol_handler.h b/chrome/browser/chromeos/fileapi/external_file_protocol_handler.h index e14eaf41..da585a85 100644 --- a/chrome/browser/chromeos/fileapi/external_file_protocol_handler.h +++ b/chrome/browser/chromeos/fileapi/external_file_protocol_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILEAPI_EXTERNAL_FILE_PROTOCOL_HANDLER_H_ #define CHROME_BROWSER_CHROMEOS_FILEAPI_EXTERNAL_FILE_PROTOCOL_HANDLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "net/url_request/url_request_job_factory.h" namespace base {
diff --git a/chrome/browser/chromeos/fileapi/external_file_url_request_job.cc b/chrome/browser/chromeos/fileapi/external_file_url_request_job.cc index 917cbcb..a07cf107 100644 --- a/chrome/browser/chromeos/fileapi/external_file_url_request_job.cc +++ b/chrome/browser/chromeos/fileapi/external_file_url_request_job.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/browser_process.h" @@ -297,8 +298,8 @@ net::URLRequestStatus::FAILED, net::ERR_REQUEST_RANGE_NOT_SATISFIABLE)); return; } - const int64 offset = byte_range_.first_byte_position(); - const int64 size = + const int64_t offset = byte_range_.first_byte_position(); + const int64_t size = byte_range_.last_byte_position() + 1 - byte_range_.first_byte_position(); set_expected_content_size(size); remaining_bytes_ = size; @@ -352,7 +353,7 @@ return 0; const int result = stream_reader_->Read( - buf, std::min<int64>(buf_size, remaining_bytes_), + buf, std::min<int64_t>(buf_size, remaining_bytes_), base::Bind(&ExternalFileURLRequestJob::OnReadCompleted, weak_ptr_factory_.GetWeakPtr()));
diff --git a/chrome/browser/chromeos/fileapi/external_file_url_request_job.h b/chrome/browser/chromeos/fileapi/external_file_url_request_job.h index dff3379b..04dd0d4a2 100644 --- a/chrome/browser/chromeos/fileapi/external_file_url_request_job.h +++ b/chrome/browser/chromeos/fileapi/external_file_url_request_job.h
@@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILEAPI_EXTERNAL_FILE_URL_REQUEST_JOB_H_ #define CHROME_BROWSER_CHROMEOS_FILEAPI_EXTERNAL_FILE_URL_REQUEST_JOB_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "components/drive/file_errors.h" #include "net/base/net_errors.h" @@ -98,7 +100,7 @@ // The range of the file to be returned. net::Error range_parse_result_; net::HttpByteRange byte_range_; - int64 remaining_bytes_; + int64_t remaining_bytes_; scoped_refptr<storage::FileSystemContext> file_system_context_; scoped_ptr<IsolatedFileSystemScope> isolated_file_system_scope_;
diff --git a/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc b/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc index b347007..3726b5d 100644 --- a/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc +++ b/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/chromeos/fileapi/external_file_url_request_job.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/file_util.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/chrome/browser/chromeos/fileapi/file_access_permissions.h b/chrome/browser/chromeos/fileapi/file_access_permissions.h index ed2eaae..b5fd9bc 100644 --- a/chrome/browser/chromeos/fileapi/file_access_permissions.h +++ b/chrome/browser/chromeos/fileapi/file_access_permissions.h
@@ -9,8 +9,8 @@ #include <set> #include <string> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/synchronization/lock.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/fileapi/file_system_backend.cc b/chrome/browser/chromeos/fileapi/file_system_backend.cc index 242356c0..0233baf 100644 --- a/chrome/browser/chromeos/fileapi/file_system_backend.cc +++ b/chrome/browser/chromeos/fileapi/file_system_backend.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/fileapi/file_system_backend.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -319,8 +321,8 @@ scoped_ptr<storage::FileStreamReader> FileSystemBackend::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 { DCHECK(url.is_valid()); @@ -351,7 +353,7 @@ scoped_ptr<storage::FileStreamWriter> FileSystemBackend::CreateFileStreamWriter( const storage::FileSystemURL& url, - int64 offset, + int64_t offset, storage::FileSystemContext* context) const { DCHECK(url.is_valid());
diff --git a/chrome/browser/chromeos/fileapi/file_system_backend.h b/chrome/browser/chromeos/fileapi/file_system_backend.h index af402868..0101fd9 100644 --- a/chrome/browser/chromeos/fileapi/file_system_backend.h +++ b/chrome/browser/chromeos/fileapi/file_system_backend.h
@@ -5,11 +5,14 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILEAPI_FILE_SYSTEM_BACKEND_H_ #define CHROME_BROWSER_CHROMEOS_FILEAPI_FILE_SYSTEM_BACKEND_H_ +#include <stdint.h> + #include <string> #include <vector> #include "base/compiler_specific.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/file_system_backend.h" @@ -108,13 +111,13 @@ storage::FileSystemType type) const override; scoped_ptr<storage::FileStreamReader> CreateFileStreamReader( const storage::FileSystemURL& path, - 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/chrome/browser/chromeos/fileapi/file_system_backend_delegate.h b/chrome/browser/chromeos/fileapi/file_system_backend_delegate.h index 7fa02bd1..39e151c 100644 --- a/chrome/browser/chromeos/fileapi/file_system_backend_delegate.h +++ b/chrome/browser/chromeos/fileapi/file_system_backend_delegate.h
@@ -5,7 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILEAPI_FILE_SYSTEM_BACKEND_DELEGATE_H_ #define CHROME_BROWSER_CHROMEOS_FILEAPI_FILE_SYSTEM_BACKEND_DELEGATE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" #include "storage/browser/fileapi/file_system_backend.h" @@ -41,15 +42,15 @@ // Called from FileSystemBackend::CreateFileStreamReader(). virtual 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) = 0; // Called from FileSystemBackend::CreateFileStreamWriter(). virtual scoped_ptr<storage::FileStreamWriter> CreateFileStreamWriter( const storage::FileSystemURL& url, - int64 offset, + int64_t offset, storage::FileSystemContext* context) = 0; // Called from the FileSystemWatcherService class. The returned pointer must
diff --git a/chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc b/chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc index 761f41a..ca8f55a 100644 --- a/chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc +++ b/chrome/browser/chromeos/fileapi/file_system_backend_unittest.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/chromeos/fileapi/file_system_backend.h" +#include <stddef.h> + #include <set> #include "base/files/file_path.h" +#include "base/macros.h" #include "chromeos/dbus/cros_disks_client.h" #include "storage/browser/fileapi/external_mount_points.h" #include "storage/browser/fileapi/file_system_url.h"
diff --git a/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.cc b/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.cc index e0b88eb..ff9887c5 100644 --- a/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.cc +++ b/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.cc
@@ -32,8 +32,8 @@ scoped_ptr<storage::FileStreamReader> MTPFileSystemBackendDelegate::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) { DCHECK_EQ(storage::kFileSystemTypeDeviceMediaAsFileStorage, url.type()); @@ -45,7 +45,7 @@ scoped_ptr<storage::FileStreamWriter> MTPFileSystemBackendDelegate::CreateFileStreamWriter( const storage::FileSystemURL& url, - int64 offset, + int64_t offset, storage::FileSystemContext* context) { DCHECK_EQ(storage::kFileSystemTypeDeviceMediaAsFileStorage, url.type());
diff --git a/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h b/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h index 6a6d3f34..4d20d7a 100644 --- a/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h +++ b/chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_CHROMEOS_FILEAPI_MTP_FILE_SYSTEM_BACKEND_DELEGATE_H_ #define CHROME_BROWSER_CHROMEOS_FILEAPI_MTP_FILE_SYSTEM_BACKEND_DELEGATE_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/fileapi/file_system_backend_delegate.h" #include "chrome/browser/chromeos/fileapi/mtp_watcher_manager.h" @@ -39,13 +42,13 @@ storage::FileSystemType type) 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) override; scoped_ptr<storage::FileStreamWriter> CreateFileStreamWriter( const storage::FileSystemURL& url, - int64 offset, + int64_t offset, storage::FileSystemContext* context) override; storage::WatcherManager* GetWatcherManager( storage::FileSystemType type) override;
diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc index 6a9b837..854682a 100644 --- a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc +++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/chromeos/first_run/drive_first_run_controller.h" +#include <stdint.h> + #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h"
diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.h b/chrome/browser/chromeos/first_run/drive_first_run_controller.h index 3375b902..128377e4 100644 --- a/chrome/browser/chromeos/first_run/drive_first_run_controller.h +++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.h
@@ -4,7 +4,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_FIRST_RUN_DRIVE_FIRST_RUN_CONTROLLER_H_ #define CHROME_BROWSER_CHROMEOS_FIRST_RUN_DRIVE_FIRST_RUN_CONTROLLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/observer_list.h" #include "base/timer/timer.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/chromeos/first_run/first_run.cc b/chrome/browser/chromeos/first_run/first_run.cc index 03d60c6..3293a681 100644 --- a/chrome/browser/chromeos/first_run/first_run.cc +++ b/chrome/browser/chromeos/first_run/first_run.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/first_run/first_run_controller.h b/chrome/browser/chromeos/first_run/first_run_controller.h index 16226d1..bd356ca56 100644 --- a/chrome/browser/chromeos/first_run/first_run_controller.h +++ b/chrome/browser/chromeos/first_run/first_run_controller.h
@@ -5,13 +5,15 @@ #ifndef CHROME_BROWSER_CHROMEOS_FIRST_RUN_FIRST_RUN_CONTROLLER_H_ #define CHROME_BROWSER_CHROMEOS_FIRST_RUN_FIRST_RUN_CONTROLLER_H_ +#include <stddef.h> + #include <string> #include <vector> #include "ash/first_run/first_run_helper.h" -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/first_run/first_run_view.h b/chrome/browser/chromeos/first_run/first_run_view.h index 474a17e..651e9218 100644 --- a/chrome/browser/chromeos/first_run/first_run_view.h +++ b/chrome/browser/chromeos/first_run/first_run_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_FIRST_RUN_FIRST_RUN_VIEW_H_ #define CHROME_BROWSER_CHROMEOS_FIRST_RUN_FIRST_RUN_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/web_contents_delegate.h" #include "ui/views/view.h"
diff --git a/chrome/browser/chromeos/first_run/goodies_displayer.h b/chrome/browser/chromeos/first_run/goodies_displayer.h index cf9a081..88bd41f 100644 --- a/chrome/browser/chromeos/first_run/goodies_displayer.h +++ b/chrome/browser/chromeos/first_run/goodies_displayer.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FIRST_RUN_GOODIES_DISPLAYER_H_ #include "base/callback.h" +#include "base/macros.h" #include "chrome/browser/ui/browser_list_observer.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/first_run/step.cc b/chrome/browser/chromeos/first_run/step.cc index 77530749..1f5df8b6 100644 --- a/chrome/browser/chromeos/first_run/step.cc +++ b/chrome/browser/chromeos/first_run/step.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/first_run/step.h" +#include <stddef.h> + #include <cctype> #include "ash/first_run/first_run_helper.h"
diff --git a/chrome/browser/chromeos/first_run/step.h b/chrome/browser/chromeos/first_run/step.h index 7f72cab..eeb4306a 100644 --- a/chrome/browser/chromeos/first_run/step.h +++ b/chrome/browser/chromeos/first_run/step.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/time/time.h" namespace ash {
diff --git a/chrome/browser/chromeos/first_run/steps/app_list_step.h b/chrome/browser/chromeos/first_run/steps/app_list_step.h index 28a6705d..6852be7 100644 --- a/chrome/browser/chromeos/first_run/steps/app_list_step.h +++ b/chrome/browser/chromeos/first_run/steps/app_list_step.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FIRST_RUN_STEPS_APP_LIST_STEP_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/first_run/step.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/first_run/steps/help_step.h b/chrome/browser/chromeos/first_run/steps/help_step.h index 12b5fd4..8a5733b 100644 --- a/chrome/browser/chromeos/first_run/steps/help_step.h +++ b/chrome/browser/chromeos/first_run/steps/help_step.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FIRST_RUN_STEPS_HELP_STEP_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/first_run/step.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/first_run/steps/tray_step.h b/chrome/browser/chromeos/first_run/steps/tray_step.h index e32d9e0c..0e4cd90 100644 --- a/chrome/browser/chromeos/first_run/steps/tray_step.h +++ b/chrome/browser/chromeos/first_run/steps/tray_step.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FIRST_RUN_STEPS_TRAY_STEP_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/first_run/step.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/idle_detector.h b/chrome/browser/chromeos/idle_detector.h index 7d13fb8..68c964f 100644 --- a/chrome/browser/chromeos/idle_detector.h +++ b/chrome/browser/chromeos/idle_detector.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_CHROMEOS_IDLE_DETECTOR_H_ #define CHROME_BROWSER_CHROMEOS_IDLE_DETECTOR_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "ui/base/user_activity/user_activity_observer.h"
diff --git a/chrome/browser/chromeos/input_method/accessibility.h b/chrome/browser/chromeos/input_method/accessibility.h index 9f4b0678..516ad38f 100644 --- a/chrome/browser/chromeos/input_method/accessibility.h +++ b/chrome/browser/chromeos/input_method/accessibility.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_ACCESSIBILITY_H_ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_ACCESSIBILITY_H_ +#include "base/macros.h" #include "ui/base/ime/chromeos/input_method_manager.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/input_method/browser_state_monitor.h b/chrome/browser/chromeos/input_method/browser_state_monitor.h index 0ee42ed9..160f6f8 100644 --- a/chrome/browser/chromeos/input_method/browser_state_monitor.h +++ b/chrome/browser/chromeos/input_method/browser_state_monitor.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/base/ime/chromeos/input_method_manager.h"
diff --git a/chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc b/chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc index 6742a857..1e33c0f 100644 --- a/chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc +++ b/chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/basictypes.h" #include "base/bind.h" +#include "base/macros.h" #include "chrome/browser/chrome_notification_types.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h"
diff --git a/chrome/browser/chromeos/input_method/candidate_window_controller.h b/chrome/browser/chromeos/input_method/candidate_window_controller.h index ab35640..b15b6fb 100644 --- a/chrome/browser/chromeos/input_method/candidate_window_controller.h +++ b/chrome/browser/chromeos/input_method/candidate_window_controller.h
@@ -7,7 +7,6 @@ #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_H_ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_H_ -#include "base/basictypes.h" namespace chromeos { namespace input_method {
diff --git a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h index f458dfa..df6b468 100644 --- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h +++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
@@ -7,6 +7,7 @@ #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "ui/base/ime/chromeos/ime_candidate_window_handler_interface.h"
diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc index b3059ae..4162710 100644 --- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc +++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
@@ -4,11 +4,14 @@ #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h" +#include <stddef.h> + #include <algorithm> #include "base/files/file_util.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/sys_info.h"
diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h index af2a68c..809df7d 100644 --- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h +++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner.h" #include "base/threading/thread_checker.h"
diff --git a/chrome/browser/chromeos/input_method/input_method_delegate_impl.h b/chrome/browser/chromeos/input_method/input_method_delegate_impl.h index f4e1db6..7b47fbe9 100644 --- a/chrome/browser/chromeos/input_method/input_method_delegate_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_delegate_impl.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/ime/chromeos/input_method_delegate.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/input_method/input_method_engine.cc b/chrome/browser/chromeos/input_method/input_method_engine.cc index e417e360..5d5431a3 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine.cc
@@ -48,7 +48,7 @@ // Notifies InputContextHandler that the composition is changed. void UpdateComposition(const ui::CompositionText& composition_text, - uint32 cursor_pos, + uint32_t cursor_pos, bool is_visible) { ui::IMEInputContextHandlerInterface* input_context = ui::IMEBridge::Get()->GetInputContextHandler(); @@ -120,7 +120,7 @@ default: break; } - uint16 ch = 0; + uint16_t ch = 0; // Ctrl+? cases, gets key value for Ctrl is not down. if (event.flags() & ui::EF_CONTROL_DOWN) { ui::KeyEvent event_no_ctrl(event.type(), event.key_code(), @@ -599,7 +599,7 @@ observer_->OnKeyEvent(active_component_id_, ext_event, callback); } -void InputMethodEngine::CandidateClicked(uint32 index) { +void InputMethodEngine::CandidateClicked(uint32_t index) { if (!CheckProfile()) return; if (index > candidate_ids_.size()) { @@ -612,9 +612,9 @@ } void InputMethodEngine::SetSurroundingText(const std::string& text, - uint32 cursor_pos, - uint32 anchor_pos, - uint32 offset_pos) { + uint32_t cursor_pos, + uint32_t anchor_pos, + uint32_t offset_pos) { if (!CheckProfile()) return; observer_->OnSurroundingTextChanged(
diff --git a/chrome/browser/chromeos/input_method/input_method_engine.h b/chrome/browser/chromeos/input_method/input_method_engine.h index 72e9461..9687222f 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine.h +++ b/chrome/browser/chromeos/input_method/input_method_engine.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <string> #include <vector> @@ -83,11 +86,11 @@ void Reset() override; void ProcessKeyEvent(const ui::KeyEvent& key_event, KeyEventDoneCallback& callback) override; - void CandidateClicked(uint32 index) override; + void CandidateClicked(uint32_t index) override; void SetSurroundingText(const std::string& text, - uint32 cursor_pos, - uint32 anchor_pos, - uint32 offset_pos) override; + uint32_t cursor_pos, + uint32_t anchor_pos, + uint32_t offset_pos) override; void HideInputView() override; void SetCompositionBounds(const std::vector<gfx::Rect>& bounds) override;
diff --git a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc index fc0d68c..3ac0eea 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
@@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_browsertest.h"
diff --git a/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc b/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc index 51127ed..42cdf3b 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_samples.h" #include "base/metrics/statistics_recorder.h"
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc index 7f75d6b..f3239391 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -4,11 +4,12 @@ #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h" +#include <stdint.h> + #include <algorithm> // std::find #include <sstream> -#include "base/basictypes.h" #include "base/bind.h" #include "base/hash.h" #include "base/location.h"
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h index 8860afc..92c0d6a 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
@@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_ +#include <stddef.h> + #include <map> #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/threading/thread_checker.h"
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc index ac9d555..401ad6e 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
@@ -4,13 +4,15 @@ #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h" +#include <stddef.h> + #include <algorithm> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h"
diff --git a/chrome/browser/chromeos/input_method/input_method_persistence.h b/chrome/browser/chromeos/input_method/input_method_persistence.h index 73af6d0..2693d97 100644 --- a/chrome/browser/chromeos/input_method/input_method_persistence.h +++ b/chrome/browser/chromeos/input_method/input_method_persistence.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/ime/chromeos/input_method_manager.h" class PrefService;
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc index 4bfce070..8ab1920 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.cc +++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -4,12 +4,14 @@ #include "chrome/browser/chromeos/input_method/input_method_util.h" +#include <stddef.h> + #include <algorithm> #include <functional> #include <map> #include <utility> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/chromeos/input_method/input_method_util.h b/chrome/browser/chromeos/input_method/input_method_util.h index 500941d..8ddde259 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.h +++ b/chrome/browser/chromeos/input_method/input_method_util.h
@@ -11,6 +11,7 @@ #include <vector> #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/threading/thread_checker.h"
diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc index c53a7c1..71b138a 100644 --- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/chromeos/input_method/input_method_util.h" +#include <stddef.h> + #include <string> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h b/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h index 4a6b1149..b4e16c4b 100644 --- a/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h +++ b/chrome/browser/chromeos/input_method/mock_candidate_window_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_CANDIDATE_WINDOW_CONTROLLER_H_ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_CANDIDATE_WINDOW_CONTROLLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/observer_list.h" #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
diff --git a/chrome/browser/chromeos/input_method/mock_input_method_engine.cc b/chrome/browser/chromeos/input_method/mock_input_method_engine.cc index 203527f..f3c347c 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_engine.cc +++ b/chrome/browser/chromeos/input_method/mock_input_method_engine.cc
@@ -119,12 +119,12 @@ void MockInputMethodEngine::ProcessKeyEvent(const ui::KeyEvent& key_event, KeyEventDoneCallback& callback) {} -void MockInputMethodEngine::CandidateClicked(uint32 index) {} +void MockInputMethodEngine::CandidateClicked(uint32_t index) {} void MockInputMethodEngine::SetSurroundingText(const std::string& text, - uint32 cursor_pos, - uint32 anchor_pos, - uint32 offset_pos) {} + uint32_t cursor_pos, + uint32_t anchor_pos, + uint32_t offset_pos) {} void MockInputMethodEngine::SetCompositionBounds( const std::vector<gfx::Rect>& bounds) {}
diff --git a/chrome/browser/chromeos/input_method/mock_input_method_engine.h b/chrome/browser/chromeos/input_method/mock_input_method_engine.h index 2aa3952d..fef0e56 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_engine.h +++ b/chrome/browser/chromeos/input_method/mock_input_method_engine.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_ENGINE_H_ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_ENGINE_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> @@ -77,11 +80,11 @@ bool IsInterestedInKeyEvent() const override; void ProcessKeyEvent(const ui::KeyEvent& key_event, KeyEventDoneCallback& callback) override; - void CandidateClicked(uint32 index) override; + void CandidateClicked(uint32_t index) override; void SetSurroundingText(const std::string& text, - uint32 cursor_pos, - uint32 anchor_pos, - uint32 offset_pos) override; + uint32_t cursor_pos, + uint32_t anchor_pos, + uint32_t offset_pos) override; void SetCompositionBounds(const std::vector<gfx::Rect>& bounds) override; void HideInputView() override;
diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.h b/chrome/browser/chromeos/input_method/mock_input_method_manager.h index 3a41db1b..94f16f0 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h +++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_H_ +#include <stddef.h> + +#include "base/macros.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "ui/base/ime/chromeos/component_extension_ime_manager.h" #include "ui/base/ime/chromeos/fake_ime_keyboard.h"
diff --git a/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc b/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc index 83ecb9dd..cd83b10 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc +++ b/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc
@@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <algorithm> #include "ash/shell.h" +#include "base/macros.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h" #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/chromeos/input_method/mode_indicator_controller.h b/chrome/browser/chromeos/input_method/mode_indicator_controller.h index 0c7c196..4a5f2a9 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_controller.h +++ b/chrome/browser/chromeos/input_method/mode_indicator_controller.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MODE_INDICATOR_CONTROLLER_H_ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MODE_INDICATOR_CONTROLLER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/ime/chromeos/input_method_manager.h" #include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/chromeos/input_method/textinput_browsertest.cc b/chrome/browser/chromeos/input_method/textinput_browsertest.cc index ce53cd4..ec62c9cd 100644 --- a/chrome/browser/chromeos/input_method/textinput_browsertest.cc +++ b/chrome/browser/chromeos/input_method/textinput_browsertest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "chrome/browser/chromeos/input_method/textinput_test_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/chromeos/input_method/textinput_test_helper.h b/chrome/browser/chromeos/input_method/textinput_test_helper.h index bd71f71..3f77c75 100644 --- a/chrome/browser/chromeos/input_method/textinput_test_helper.h +++ b/chrome/browser/chromeos/input_method/textinput_test_helper.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TEXTINPUT_TEST_HELPER_H_ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_TEXTINPUT_TEST_HELPER_H_ +#include "base/macros.h" #include "chrome/test/base/in_process_browser_test.h" #include "ui/base/ime/mock_input_method.h" #include "ui/base/ime/text_input_client.h"
diff --git a/chrome/browser/chromeos/launcher_search_provider/error_reporter.h b/chrome/browser/chromeos/launcher_search_provider/error_reporter.h index 250265f..ef1925c2 100644 --- a/chrome/browser/chromeos/launcher_search_provider/error_reporter.h +++ b/chrome/browser/chromeos/launcher_search_provider/error_reporter.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace content {
diff --git a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc index 36547f03..b455815 100644 --- a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc +++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h" +#include <stdint.h> + #include "base/memory/scoped_vector.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h" @@ -55,7 +57,7 @@ CacheListenerExtensionIds(); for (const ExtensionId extension_id : *cached_listener_extension_ids_.get()) { // Convert query_id_ to string here since queryId is defined as string in - // javascript side API while we use uint32 internally to generate it. + // javascript side API while we use uint32_t internally to generate it. event_router->DispatchEventToExtension( extension_id, make_scoped_ptr(new extensions::Event(
diff --git a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h index 6536d19..c1904399 100644 --- a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h +++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ #define CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/launcher_search_provider/error_reporter.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h index 3bbd42dd..8e0ea54f 100644 --- a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h +++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ #define CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "content/public/browser/browser_context.h"
diff --git a/chrome/browser/chromeos/locale_change_guard.cc b/chrome/browser/chromeos/locale_change_guard.cc index 14f61d3..1496046 100644 --- a/chrome/browser/chromeos/locale_change_guard.cc +++ b/chrome/browser/chromeos/locale_change_guard.cc
@@ -10,6 +10,7 @@ #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_notifier.h" #include "base/bind.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/chromeos/locale_change_guard.h b/chrome/browser/chromeos/locale_change_guard.h index d9dec5a..dd130330 100644 --- a/chrome/browser/chromeos/locale_change_guard.h +++ b/chrome/browser/chromeos/locale_change_guard.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOCALE_CHANGE_GUARD_H_ #define CHROME_BROWSER_CHROMEOS_LOCALE_CHANGE_GUARD_H_ +#include <stddef.h> + #include <string> #include "ash/system/locale/locale_observer.h"
diff --git a/chrome/browser/chromeos/locale_change_guard_unittest.cc b/chrome/browser/chromeos/locale_change_guard_unittest.cc index 2d8c70a..7477714d 100644 --- a/chrome/browser/chromeos/locale_change_guard_unittest.cc +++ b/chrome/browser/chromeos/locale_change_guard_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/chromeos/locale_change_guard.h" +#include <stddef.h> #include <string.h> #include "base/macros.h"
diff --git a/chrome/browser/chromeos/login/app_launch_controller.cc b/chrome/browser/chromeos/login/app_launch_controller.cc index 281dee8c..057671f 100644 --- a/chrome/browser/chromeos/login/app_launch_controller.cc +++ b/chrome/browser/chromeos/login/app_launch_controller.cc
@@ -9,6 +9,7 @@ #include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/time/time.h" @@ -407,9 +408,10 @@ ClearNetworkWaitTimer(); - const int64 time_taken_ms = (base::TimeTicks::Now() - - base::TimeTicks::FromInternalValue(launch_splash_start_time_)). - InMilliseconds(); + const int64_t time_taken_ms = + (base::TimeTicks::Now() - + base::TimeTicks::FromInternalValue(launch_splash_start_time_)) + .InMilliseconds(); // Enforce that we show app install splash screen for some minimum amount // of time.
diff --git a/chrome/browser/chromeos/login/app_launch_controller.h b/chrome/browser/chromeos/login/app_launch_controller.h index 1c9f34f..c95f86e 100644 --- a/chrome/browser/chromeos/login/app_launch_controller.h +++ b/chrome/browser/chromeos/login/app_launch_controller.h
@@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/timer/timer.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" #include "chrome/browser/chromeos/app_mode/kiosk_profile_loader.h" @@ -135,7 +137,7 @@ bool network_wait_timedout_; bool showing_network_dialog_; bool network_config_requested_; - int64 launch_splash_start_time_; + int64_t launch_splash_start_time_; static bool skip_splash_wait_; static int network_wait_time_;
diff --git a/chrome/browser/chromeos/login/app_launch_signin_screen.h b/chrome/browser/chromeos/login/app_launch_signin_screen.h index a716ebd..3001273f 100644 --- a/chrome/browser/chromeos/login/app_launch_signin_screen.h +++ b/chrome/browser/chromeos/login/app_launch_signin_screen.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" #include "chromeos/login/auth/auth_status_consumer.h"
diff --git a/chrome/browser/chromeos/login/auth/auth_prewarmer.cc b/chrome/browser/chromeos/login/auth/auth_prewarmer.cc index 8ff0306de..436f704 100644 --- a/chrome/browser/chromeos/login/auth/auth_prewarmer.cc +++ b/chrome/browser/chromeos/login/auth/auth_prewarmer.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/login/auth/auth_prewarmer.h" +#include <stddef.h> + #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/profiles/profile_helper.h"
diff --git a/chrome/browser/chromeos/login/auth/auth_prewarmer.h b/chrome/browser/chromeos/login/auth/auth_prewarmer.h index 065ab048..19f05bd 100644 --- a/chrome/browser/chromeos/login/auth/auth_prewarmer.h +++ b/chrome/browser/chromeos/login/auth/auth_prewarmer.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_AUTH_AUTH_PREWARMER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_AUTH_AUTH_PREWARMER_H_ -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "chromeos/network/network_state_handler_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h b/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h index b038645..4f49744 100644 --- a/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h +++ b/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chromeos/login/auth/cryptohome_authenticator.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/login/auth/chrome_login_performer.h b/chrome/browser/chromeos/login/auth/chrome_login_performer.h index 695805c..1ce3a5d 100644 --- a/chrome/browser/chromeos/login/auth/chrome_login_performer.h +++ b/chrome/browser/chromeos/login/auth/chrome_login_performer.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/policy/wildcard_login_checker.h"
diff --git a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc index 9a5385f4..a108b0ff 100644 --- a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc +++ b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
@@ -4,13 +4,15 @@ #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h" +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" @@ -72,7 +74,7 @@ const char kSalt[] = "SALT $$"; // An owner key in PKCS#8 PrivateKeyInfo for testing owner checks. -const uint8 kOwnerPrivateKey[] = { +const uint8_t kOwnerPrivateKey[] = { 0x30, 0x82, 0x01, 0x53, 0x02, 0x01, 0x00, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 0x01, 0x3d, 0x30, 0x82, 0x01, 0x39, 0x02, 0x01, 0x00, 0x02, 0x41, 0x00, @@ -104,7 +106,7 @@ 0x7e, 0x68, 0x37, 0x26, 0xda, 0xb9, 0x87}; // The public key alone matcing kOwnerPrivateKey. -const uint8 kOwnerPublicKey[] = { +const uint8_t kOwnerPublicKey[] = { 0x30, 0x5c, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x4b, 0x00, 0x30, 0x48, 0x02, 0x41, 0x00, 0xb4, 0xf5, 0xab, 0xfe, 0xd8, 0xf1, 0xcb, 0x5f, 0x8f, 0x48, 0x3e, @@ -114,14 +116,14 @@ 0x15, 0xc5, 0x65, 0x50, 0x7d, 0xbd, 0x4e, 0x81, 0xb2, 0x28, 0x38, 0xf9, 0x3d, 0x3e, 0x2a, 0x68, 0xf7, 0x02, 0x03, 0x01, 0x00, 0x01}; -std::vector<uint8> GetOwnerPublicKey() { - return std::vector<uint8>(kOwnerPublicKey, - kOwnerPublicKey + arraysize(kOwnerPublicKey)); +std::vector<uint8_t> GetOwnerPublicKey() { + return std::vector<uint8_t>(kOwnerPublicKey, + kOwnerPublicKey + arraysize(kOwnerPublicKey)); } bool CreateOwnerKeyInSlot(PK11SlotInfo* slot) { - const std::vector<uint8> key(kOwnerPrivateKey, - kOwnerPrivateKey + arraysize(kOwnerPrivateKey)); + const std::vector<uint8_t> key( + kOwnerPrivateKey, kOwnerPrivateKey + arraysize(kOwnerPrivateKey)); return crypto::ImportNSSKeyFromPrivateKeyInfo(slot, key, true /* permanent */); } @@ -245,7 +247,7 @@ .RetiresOnSaturation(); } - void ExpectGetKeyDataExCall(scoped_ptr<int64> key_type, + void ExpectGetKeyDataExCall(scoped_ptr<int64_t> key_type, scoped_ptr<std::string> salt) { key_definitions_.clear(); key_definitions_.push_back(cryptohome::KeyDefinition( @@ -567,7 +569,7 @@ // Set up mock homedir methods to respond successfully to a cryptohome create // attempt. - ExpectGetKeyDataExCall(scoped_ptr<int64>(), scoped_ptr<std::string>()); + ExpectGetKeyDataExCall(scoped_ptr<int64_t>(), scoped_ptr<std::string>()); ExpectMountExCall(true /* expect_create_attempt */); state_->PresetOnlineLoginStatus(AuthFailure::AuthFailureNone()); @@ -622,7 +624,7 @@ // Set up mock homedir methods to respond successfully to a cryptohome mount // attempt. - ExpectGetKeyDataExCall(scoped_ptr<int64>(), scoped_ptr<std::string>()); + ExpectGetKeyDataExCall(scoped_ptr<int64_t>(), scoped_ptr<std::string>()); ExpectMountExCall(false /* expect_create_attempt */); state_->PresetOnlineLoginStatus(AuthFailure::AuthFailureNone()); @@ -684,7 +686,7 @@ // Set up mock homedir methods to respond successfully to a cryptohome create // attempt. - ExpectGetKeyDataExCall(scoped_ptr<int64>(), scoped_ptr<std::string>()); + ExpectGetKeyDataExCall(scoped_ptr<int64_t>(), scoped_ptr<std::string>()); ExpectMountExCall(true /* expect_create_attempt */); // Set up state as though a cryptohome mount attempt has occurred @@ -753,7 +755,7 @@ // mount when this pre-hashed key is used. ExpectGetKeyDataExCall( - make_scoped_ptr(new int64(Key::KEY_TYPE_SALTED_SHA256)), + make_scoped_ptr(new int64_t(Key::KEY_TYPE_SALTED_SHA256)), make_scoped_ptr(new std::string(kSalt))); ExpectMountExCall(false /* expect_create_attempt */); @@ -771,7 +773,7 @@ // pre-hashed key was used to create the cryptohome but without the required // salt. ExpectGetKeyDataExCall( - make_scoped_ptr(new int64(Key::KEY_TYPE_SALTED_SHA256)), + make_scoped_ptr(new int64_t(Key::KEY_TYPE_SALTED_SHA256)), scoped_ptr<std::string>()); auth_->AuthenticateToLogin(NULL, user_context_);
diff --git a/chrome/browser/chromeos/login/auth/mount_manager.h b/chrome/browser/chromeos/login/auth/mount_manager.h index 904d5b15af..eac4b6b 100644 --- a/chrome/browser/chromeos/login/auth/mount_manager.h +++ b/chrome/browser/chromeos/login/auth/mount_manager.h
@@ -9,6 +9,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" class PrefRegistrySimple;
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc index eb2735d..3c14526 100644 --- a/chrome/browser/chromeos/login/chrome_restart_request.cc +++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -9,6 +9,7 @@ #include "ash/ash_switches.h" #include "base/base_switches.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/prefs/json_pref_store.h"
diff --git a/chrome/browser/chromeos/login/crash_restore_browsertest.cc b/chrome/browser/chromeos/login/crash_restore_browsertest.cc index bcccd4f..4d27624e 100644 --- a/chrome/browser/chromeos/login/crash_restore_browsertest.cc +++ b/chrome/browser/chromeos/login/crash_restore_browsertest.cc
@@ -6,6 +6,7 @@ #include <vector> #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "chrome/browser/chromeos/login/session/user_session_manager.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h index 28e827c..dfc3a8f1 100644 --- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h +++ b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/app_mode/kiosk_profile_loader.h"
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc index b5b5486..a0b61f3 100644 --- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc +++ b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/path_service.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
diff --git a/chrome/browser/chromeos/login/easy_unlock/bootstrap_browsertest.cc b/chrome/browser/chromeos/login/easy_unlock/bootstrap_browsertest.cc index 70d612e..bc5a9b1c 100644 --- a/chrome/browser/chromeos/login/easy_unlock/bootstrap_browsertest.cc +++ b/chrome/browser/chromeos/login/easy_unlock/bootstrap_browsertest.cc
@@ -4,6 +4,7 @@ #include <string> +#include "base/macros.h" #include "base/path_service.h" #include "chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.h" #include "chrome/browser/chromeos/login/session/user_session_manager.h"
diff --git a/chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.cc b/chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.cc index ae18311..70c10d35 100644 --- a/chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.cc +++ b/chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.h" +#include <stddef.h> + #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h"
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc index db57ea42..07e8e14e 100644 --- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc +++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.h" #include "base/bind.h" +#include "base/macros.h" #include "components/proximity_auth/cryptauth/proto/securemessage.pb.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.cc index d0ebacf..ea8a1220 100644 --- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.cc +++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.cc
@@ -4,11 +4,14 @@ #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.h" +#include <stdint.h> + #include <string> #include "base/base64url.h" #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" @@ -341,7 +344,7 @@ kEasyUnlockKeyMetaNameBluetoothAddress, device->bluetooth_address)); key_def.provider_data.push_back(cryptohome::KeyDefinition::ProviderData( kEasyUnlockKeyMetaNameBluetoothType, - static_cast<int64>(device->bluetooth_type))); + static_cast<int64_t>(device->bluetooth_type))); key_def.provider_data.push_back(cryptohome::KeyDefinition::ProviderData( kEasyUnlockKeyMetaNamePsk, device->psk)); key_def.provider_data.push_back(cryptohome::KeyDefinition::ProviderData(
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.h b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.h index 6ca1578..1744029 100644 --- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.h +++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_CREATE_KEYS_OPERATION_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_CREATE_KEYS_OPERATION_H_ +#include <stddef.h> + #include <string> #include "base/callback.h"
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_get_keys_operation.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_get_keys_operation.cc index 739b3d32..fdfe3bfb 100644 --- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_get_keys_operation.cc +++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_get_keys_operation.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_get_keys_operation.h" +#include <stdint.h> + #include <vector> #include "base/bind.h" @@ -79,7 +81,8 @@ } else if (entry.name == kEasyUnlockKeyMetaNameBluetoothType) { if (entry.number) { if (*entry.number >= - static_cast<int64>(EasyUnlockDeviceKeyData::NUM_BLUETOOTH_TYPES)) { + static_cast<int64_t>( + EasyUnlockDeviceKeyData::NUM_BLUETOOTH_TYPES)) { PA_LOG(ERROR) << "Invalid Bluetooth type: " << *entry.number; } else { device.bluetooth_type =
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_get_keys_operation.h b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_get_keys_operation.h index de0e6670..813ed25 100644 --- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_get_keys_operation.h +++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_get_keys_operation.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_GET_KEYS_OPERATION_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_GET_KEYS_OPERATION_H_ +#include <stddef.h> + #include "base/callback.h" #include "base/macros.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h index 35eda97..4bc63d4 100644 --- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h +++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_KEY_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_KEY_MANAGER_H_ +#include <stddef.h> + #include <deque> #include <map> #include <string>
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc index 35af9694..49facb4 100644 --- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc +++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.h"
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_remove_keys_operation.h b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_remove_keys_operation.h index d09e601b..ebeada03 100644 --- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_remove_keys_operation.h +++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_remove_keys_operation.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_REMOVE_KEYS_OPERATION_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_REMOVE_KEYS_OPERATION_H_ +#include <stddef.h> + #include "base/callback.h" #include "base/macros.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc index dccd50d..99ce54b 100644 --- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc +++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc
@@ -6,6 +6,7 @@ #include <cryptohi.h> #include <keyhi.h> +#include <stdint.h> #include "base/base64.h" #include "base/bind.h" @@ -86,10 +87,10 @@ const std::string& public_key) { CHECK(slot); - const uint8* public_key_uint8 = - reinterpret_cast<const uint8*>(public_key.data()); - std::vector<uint8> public_key_vector( - public_key_uint8, public_key_uint8 + public_key.size()); + const uint8_t* public_key_uint8 = + reinterpret_cast<const uint8_t*>(public_key.data()); + std::vector<uint8_t> public_key_vector(public_key_uint8, + public_key_uint8 + public_key.size()); crypto::ScopedSECKEYPrivateKey rsa_key( crypto::FindNSSKeyFromPublicKeyInfoInSlot(public_key_vector, slot));
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h index 01f0a34..7f86d1f 100644 --- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h +++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_TPM_KEY_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_TPM_KEY_MANAGER_H_ +#include <stddef.h> + #include <string> #include <vector>
diff --git a/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.cc b/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.cc index 41283cc..adc71aaf 100644 --- a/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.cc +++ b/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h" +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/task_runner.h" @@ -15,7 +17,7 @@ namespace { // The number of minutes that the user context will be stored. -const int64 kUserContextTimeToLiveMinutes = 10; +const int64_t kUserContextTimeToLiveMinutes = 10; } // namespace
diff --git a/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h b/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h index a97d1106..f40e8267 100644 --- a/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h +++ b/chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_SHORT_LIVED_USER_CONTEXT_H_ #include "apps/app_lifetime_monitor.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h index 7bc8e95..998ed92 100644 --- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h +++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
@@ -7,10 +7,10 @@ #include <string> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h b/chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h index a2c4770f5..34f42321 100644 --- a/chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h +++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h" class GoogleServiceAuthError;
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc index 0a6087b..33e02491 100644 --- a/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/run_loop.h" #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h" #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc index f253a7e..8c18f34 100644 --- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc +++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h"
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.h b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.h index b586897d..b0a0ac59 100644 --- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.h +++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.h
@@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/gtest_prod_util.h" #include "base/macros.h"
diff --git a/chrome/browser/chromeos/login/enterprise_enrollment_browsertest.cc b/chrome/browser/chromeos/login/enterprise_enrollment_browsertest.cc index 3f62036..982a41b 100644 --- a/chrome/browser/chromeos/login/enterprise_enrollment_browsertest.cc +++ b/chrome/browser/chromeos/login/enterprise_enrollment_browsertest.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 "base/macros.h" #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h" #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h" #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.h"
diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h index 36ba07b..1b4c289 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.h +++ b/chrome/browser/chromeos/login/existing_user_controller.h
@@ -5,12 +5,14 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc index daafbd6a..637af98 100644 --- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h"
diff --git a/chrome/browser/chromeos/login/help_app_launcher.h b/chrome/browser/chromeos/login/help_app_launcher.h index cd939778..5f7a33c4 100644 --- a/chrome/browser/chromeos/login/help_app_launcher.h +++ b/chrome/browser/chromeos/login/help_app_launcher.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_HELP_APP_LAUNCHER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/login/ui/login_web_dialog.h"
diff --git a/chrome/browser/chromeos/login/helper.h b/chrome/browser/chromeos/login/helper.h index 5a5e958..dd5f2b4 100644 --- a/chrome/browser/chromeos/login/helper.h +++ b/chrome/browser/chromeos/login/helper.h
@@ -10,6 +10,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/views/view.h"
diff --git a/chrome/browser/chromeos/login/hid_detection_browsertest.cc b/chrome/browser/chromeos/login/hid_detection_browsertest.cc index a64fd8ca..0afcd81 100644 --- a/chrome/browser/chromeos/login/hid_detection_browsertest.cc +++ b/chrome/browser/chromeos/login/hid_detection_browsertest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/login/language_list.cc b/chrome/browser/chromeos/login/language_list.cc index 9e39539..90dc3082 100644 --- a/chrome/browser/chromeos/login/language_list.cc +++ b/chrome/browser/chromeos/login/language_list.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/login/language_list.h" +#include <stddef.h> + #include "base/i18n/rtl.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/chromeos/login/language_list.h b/chrome/browser/chromeos/login/language_list.h index bf46190..6bf23ec 100644 --- a/chrome/browser/chromeos/login/language_list.h +++ b/chrome/browser/chromeos/login/language_list.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc index 38514038a..63b492a 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker.cc +++ b/chrome/browser/chromeos/login/lock/screen_locker.cc
@@ -18,6 +18,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h"
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.h b/chrome/browser/chromeos/login/lock/screen_locker.h index 1708dae4..e9c1261 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker.h +++ b/chrome/browser/chromeos/login/lock/screen_locker.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc index 6632afe2..1cf8062 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc +++ b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
@@ -6,6 +6,7 @@ #include "ash/wm/window_state.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/chromeos/login/lock/screen_locker_delegate.h b/chrome/browser/chromeos/login/lock/screen_locker_delegate.h index 8ddd8bc..e2e73d83 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker_delegate.h +++ b/chrome/browser/chromeos/login/lock/screen_locker_delegate.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_SCREEN_LOCKER_DELEGATE_H_ #include "base/callback_forward.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" #include "chrome/browser/chromeos/login/ui/login_display.h"
diff --git a/chrome/browser/chromeos/login/lock/screen_locker_tester.cc b/chrome/browser/chromeos/login/lock/screen_locker_tester.cc index 2b6720b..23a6a194 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker_tester.cc +++ b/chrome/browser/chromeos/login/lock/screen_locker_tester.cc
@@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/chromeos/login/lock/screen_locker_tester.h b/chrome/browser/chromeos/login/lock/screen_locker_tester.h index a6e4014a..b6ebb21 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker_tester.h +++ b/chrome/browser/chromeos/login/lock/screen_locker_tester.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" namespace views { class Widget;
diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.h b/chrome/browser/chromeos/login/lock/webui_screen_locker.h index 28e0f58..671b397 100644 --- a/chrome/browser/chromeos/login/lock/webui_screen_locker.h +++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.h
@@ -5,11 +5,14 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_ +#include <stdint.h> + #include <string> #include "ash/shell_delegate.h" #include "ash/wm/lock_state_observer.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/login/login_manager_test.h b/chrome/browser/chromeos/login/login_manager_test.h index 9e23abec..686f8fdf 100644 --- a/chrome/browser/chromeos/login/login_manager_test.h +++ b/chrome/browser/chromeos/login/login_manager_test.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chrome/browser/chromeos/login/mixin_based_browser_test.h" #include "chrome/browser/chromeos/login/test/https_forwarder.h" #include "chrome/browser/chromeos/login/test/js_checker.h"
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc index 56cdaa1..5668508 100644 --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/login/oobe_browsertest.cc b/chrome/browser/chromeos/login/oobe_browsertest.cc index 67ac3ab2..e566d290 100644 --- a/chrome/browser/chromeos/login/oobe_browsertest.cc +++ b/chrome/browser/chromeos/login/oobe_browsertest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/login/existing_user_controller.h" #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
diff --git a/chrome/browser/chromeos/login/oobe_localization_browsertest.cc b/chrome/browser/chromeos/login/oobe_localization_browsertest.cc index 17d38f2..2ceaa0c3 100644 --- a/chrome/browser/chromeos/login/oobe_localization_browsertest.cc +++ b/chrome/browser/chromeos/login/oobe_localization_browsertest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/chromeos/login/resource_loader_browsertest.cc b/chrome/browser/chromeos/login/resource_loader_browsertest.cc index 9a7e309..c2b7bc9 100644 --- a/chrome/browser/chromeos/login/resource_loader_browsertest.cc +++ b/chrome/browser/chromeos/login/resource_loader_browsertest.cc
@@ -7,6 +7,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h index e6cdd2bd..a9bcc7f 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SAML_SAML_OFFLINE_SIGNIN_LIMITER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SAML_SAML_OFFLINE_SIGNIN_LIMITER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/time/default_clock.h"
diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h index 080f51e..f18e74f 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SAML_SAML_OFFLINE_SIGNIN_LIMITER_FACTORY_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SAML_SAML_OFFLINE_SIGNIN_LIMITER_FACTORY_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc index bf8fbfe..b0cfc0c 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_service.h" #include "base/prefs/testing_pref_service.h"
diff --git a/chrome/browser/chromeos/login/screens/base_screen.h b/chrome/browser/chromeos/login/screens/base_screen.h index a0136fd3..39b624d 100644 --- a/chrome/browser/chromeos/login/screens/base_screen.h +++ b/chrome/browser/chromeos/login/screens/base_screen.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" #include "components/login/base_screen_handler_utils.h" #include "components/login/screens/screen_context.h"
diff --git a/chrome/browser/chromeos/login/screens/enable_debugging_screen.h b/chrome/browser/chromeos/login/screens/enable_debugging_screen.h index a82d825..ea727c0 100644 --- a/chrome/browser/chromeos/login/screens/enable_debugging_screen.h +++ b/chrome/browser/chromeos/login/screens/enable_debugging_screen.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/base_screen.h" #include "chrome/browser/chromeos/login/screens/enable_debugging_screen_actor.h"
diff --git a/chrome/browser/chromeos/login/screens/error_screen.h b/chrome/browser/chromeos/login/screens/error_screen.h index b73284c..726cd1d2 100644 --- a/chrome/browser/chromeos/login/screens/error_screen.h +++ b/chrome/browser/chromeos/login/screens/error_screen.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ERROR_SCREEN_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ERROR_SCREEN_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/login/screens/network_error.h"
diff --git a/chrome/browser/chromeos/login/screens/error_screen_actor.h b/chrome/browser/chromeos/login/screens/error_screen_actor.h index 1d40cdff..e5e05bdf 100644 --- a/chrome/browser/chromeos/login/screens/error_screen_actor.h +++ b/chrome/browser/chromeos/login/screens/error_screen_actor.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/error_screen_actor_delegate.h" #include "chrome/browser/chromeos/login/screens/network_error.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
diff --git a/chrome/browser/chromeos/login/screens/eula_screen.h b/chrome/browser/chromeos/login/screens/eula_screen.h index dd0df245..d6137e7 100644 --- a/chrome/browser/chromeos/login/screens/eula_screen.h +++ b/chrome/browser/chromeos/login/screens/eula_screen.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/base_screen.h" #include "chrome/browser/chromeos/login/screens/eula_model.h" #include "chromeos/tpm/tpm_password_fetcher.h"
diff --git a/chrome/browser/chromeos/login/screens/gaia_screen.h b/chrome/browser/chromeos/login/screens/gaia_screen.h index 7fa188f8..f19671190 100644 --- a/chrome/browser/chromeos/login/screens/gaia_screen.h +++ b/chrome/browser/chromeos/login/screens/gaia_screen.h
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" +#include "base/macros.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/login/screens/hid_detection_screen.cc b/chrome/browser/chromeos/login/screens/hid_detection_screen.cc index 76c27cf2..0891fce 100644 --- a/chrome/browser/chromeos/login/screens/hid_detection_screen.cc +++ b/chrome/browser/chromeos/login/screens/hid_detection_screen.cc
@@ -182,8 +182,8 @@ SendKeyboardDeviceNotification(); } -void HIDDetectionScreen::DisplayPasskey( - device::BluetoothDevice* device, uint32 passkey) { +void HIDDetectionScreen::DisplayPasskey(device::BluetoothDevice* device, + uint32_t passkey) { VLOG(1) << "DisplayPassKey id = " << device->GetDeviceID() << " name = " << device->GetName(); std::string pincode = base::UintToString(passkey); @@ -192,8 +192,8 @@ DisplayPinCode(device, pincode); } -void HIDDetectionScreen::KeysEntered( - device::BluetoothDevice* device, uint32 entered) { +void HIDDetectionScreen::KeysEntered(device::BluetoothDevice* device, + uint32_t entered) { VLOG(1) << "Number of keys entered " << entered; GetContextEditor() .SetBoolean(kContextKeyNumKeysEnteredExpected, true) @@ -201,8 +201,8 @@ SendKeyboardDeviceNotification(); } -void HIDDetectionScreen::ConfirmPasskey( - device::BluetoothDevice* device, uint32 passkey) { +void HIDDetectionScreen::ConfirmPasskey(device::BluetoothDevice* device, + uint32_t passkey) { VLOG(1) << "Confirm Passkey"; device->CancelPairing(); }
diff --git a/chrome/browser/chromeos/login/screens/hid_detection_screen.h b/chrome/browser/chromeos/login/screens/hid_detection_screen.h index 42860a2..4f6e3e1 100644 --- a/chrome/browser/chromeos/login/screens/hid_detection_screen.h +++ b/chrome/browser/chromeos/login/screens/hid_detection_screen.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_HID_DETECTION_SCREEN_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_HID_DETECTION_SCREEN_H_ +#include <stdint.h> + #include <string> #include <vector> @@ -60,11 +62,11 @@ void RequestPasskey(device::BluetoothDevice* device) override; void DisplayPinCode(device::BluetoothDevice* device, const std::string& pincode) override; - void DisplayPasskey( - device::BluetoothDevice* device, uint32 passkey) override; - void KeysEntered(device::BluetoothDevice* device, uint32 entered) override; - void ConfirmPasskey( - device::BluetoothDevice* device, uint32 passkey) override; + void DisplayPasskey(device::BluetoothDevice* device, + uint32_t passkey) override; + void KeysEntered(device::BluetoothDevice* device, uint32_t entered) override; + void ConfirmPasskey(device::BluetoothDevice* device, + uint32_t passkey) override; void AuthorizePairing(device::BluetoothDevice* device) override; // device::BluetoothAdapter::Observer implementation.
diff --git a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h index 9814191a..f9316d0a 100644 --- a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h +++ b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/base_screen.h" #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen_actor.h"
diff --git a/chrome/browser/chromeos/login/screens/kiosk_enable_screen.h b/chrome/browser/chromeos/login/screens/kiosk_enable_screen.h index d2954603..c154612e 100644 --- a/chrome/browser/chromeos/login/screens/kiosk_enable_screen.h +++ b/chrome/browser/chromeos/login/screens/kiosk_enable_screen.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/base_screen.h" #include "chrome/browser/chromeos/login/screens/kiosk_enable_screen_actor.h"
diff --git a/chrome/browser/chromeos/login/screens/network_screen.h b/chrome/browser/chromeos/login/screens/network_screen.h index 114f4d81..8937fc3 100644 --- a/chrome/browser/chromeos/login/screens/network_screen.h +++ b/chrome/browser/chromeos/login/screens/network_screen.h
@@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc index daa7ddd0..7f77ce00 100644 --- a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/screens/network_screen_browsertest.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 "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/screens/base_screen.h"
diff --git a/chrome/browser/chromeos/login/screens/reset_screen.h b/chrome/browser/chromeos/login/screens/reset_screen.h index 8fb87db..0785934 100644 --- a/chrome/browser/chromeos/login/screens/reset_screen.h +++ b/chrome/browser/chromeos/login/screens/reset_screen.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/login/help_app_launcher.h"
diff --git a/chrome/browser/chromeos/login/screens/terms_of_service_screen.h b/chrome/browser/chromeos/login/screens/terms_of_service_screen.h index 1d8aa1d..4cf4367 100644 --- a/chrome/browser/chromeos/login/screens/terms_of_service_screen.h +++ b/chrome/browser/chromeos/login/screens/terms_of_service_screen.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" #include "chrome/browser/chromeos/login/screens/base_screen.h"
diff --git a/chrome/browser/chromeos/login/screens/update_screen.h b/chrome/browser/chromeos/login/screens/update_screen.h index cdc1d7ad..b86da89f 100644 --- a/chrome/browser/chromeos/login/screens/update_screen.h +++ b/chrome/browser/chromeos/login/screens/update_screen.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc index 70e03a34..f56fa07 100644 --- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.h b/chrome/browser/chromeos/login/screens/user_image_screen.h index 5050f99..221e715 100644 --- a/chrome/browser/chromeos/login/screens/user_image_screen.h +++ b/chrome/browser/chromeos/login/screens/user_image_screen.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_IMAGE_SCREEN_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "chrome/browser/chromeos/camera_presence_notifier.h"
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc index 444c60e5..3a892df 100644 --- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc +++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" +#include <stddef.h> + #include "base/location.h" #include "base/logging.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.h b/chrome/browser/chromeos/login/screens/user_selection_screen.h index 2ec86fb..ad30fab 100644 --- a/chrome/browser/chromeos/login/screens/user_selection_screen.h +++ b/chrome/browser/chromeos/login/screens/user_selection_screen.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/timer/timer.h" #include "base/values.h" #include "chrome/browser/chromeos/login/signin/token_handle_util.h"
diff --git a/chrome/browser/chromeos/login/screens/wrong_hwid_screen.h b/chrome/browser/chromeos/login/screens/wrong_hwid_screen.h index 3f082ce..1631d1e 100644 --- a/chrome/browser/chromeos/login/screens/wrong_hwid_screen.h +++ b/chrome/browser/chromeos/login/screens/wrong_hwid_screen.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/base_screen.h" #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen_actor.h"
diff --git a/chrome/browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric_cpu.cpp b/chrome/browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric_cpu.cpp index 7c48b5e..03c3789c 100644 --- a/chrome/browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric_cpu.cpp +++ b/chrome/browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric_cpu.cpp
@@ -7,6 +7,8 @@ // can make no sense. // TODO(elizavetai): remove this file and reuse the original one in Skia +#include <stdint.h> + #include "chrome/browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric.h" #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.cc b/chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.cc index 0f7c591..3262593b 100644 --- a/chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.cc +++ b/chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.h" +#include <stddef.h> +#include <stdint.h> + #include "ash/shell.h" #include "base/command_line.h" #include "base/files/file_util.h" @@ -228,7 +231,7 @@ return 0; } - int64 golden_screenshot_size; + int64_t golden_screenshot_size; base::GetFileSize(image_path, &golden_screenshot_size); if (golden_screenshot_size == -1) {
diff --git a/chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.h b/chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.h index 0f4562e..7f9938f4 100644 --- a/chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.h +++ b/chrome/browser/chromeos/login/screenshot_testing/screenshot_tester.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/chromeos/login/session/chrome_session_manager.h b/chrome/browser/chromeos/login/session/chrome_session_manager.h index 0e284b9..fcac8d3 100644 --- a/chrome/browser/chromeos/login/session/chrome_session_manager.h +++ b/chrome/browser/chromeos/login/session/chrome_session_manager.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_CHROME_SESSION_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_CHROME_SESSION_MANAGER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "components/session_manager/core/session_manager.h" namespace base {
diff --git a/chrome/browser/chromeos/login/session/kiosk_auto_launcher_session_manager_delegate.h b/chrome/browser/chromeos/login/session/kiosk_auto_launcher_session_manager_delegate.h index 6b2ff13..34af5f9e 100644 --- a/chrome/browser/chromeos/login/session/kiosk_auto_launcher_session_manager_delegate.h +++ b/chrome/browser/chromeos/login/session/kiosk_auto_launcher_session_manager_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_KIOSK_AUTO_LAUNCHER_SESSION_MANAGER_DELEGATE_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_KIOSK_AUTO_LAUNCHER_SESSION_MANAGER_DELEGATE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/session_manager/core/session_manager.h"
diff --git a/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.h b/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.h index 43f10d7..7eb933b 100644 --- a/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.h +++ b/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_LOGIN_OOBE_SESSION_MANAGER_DELEGATE_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_LOGIN_OOBE_SESSION_MANAGER_DELEGATE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/session_manager/core/session_manager.h"
diff --git a/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.h b/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.h index a70a4de..ad9f1ba3 100644 --- a/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.h +++ b/chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/session_manager/core/session_manager.h"
diff --git a/chrome/browser/chromeos/login/session/stub_login_session_manager_delegate.h b/chrome/browser/chromeos/login/session/stub_login_session_manager_delegate.h index 55fa3532..bab5e38 100644 --- a/chrome/browser/chromeos/login/session/stub_login_session_manager_delegate.h +++ b/chrome/browser/chromeos/login/session/stub_login_session_manager_delegate.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/login/session/restore_after_crash_session_manager_delegate.h"
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc index 04eb05f..a937370b 100644 --- a/chrome/browser/chromeos/login/session/user_session_manager.cc +++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/login/session/user_session_manager.h" +#include <stddef.h> + #include <string> #include "base/base_paths.h"
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h index 755132cd..e875f2c 100644 --- a/chrome/browser/chromeos/login/session/user_session_manager.h +++ b/chrome/browser/chromeos/login/session/user_session_manager.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/login/session/user_session_manager_test_api.h b/chrome/browser/chromeos/login/session/user_session_manager_test_api.h index 3312a96..da6e014 100644 --- a/chrome/browser/chromeos/login/session/user_session_manager_test_api.h +++ b/chrome/browser/chromeos/login/session/user_session_manager_test_api.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_TEST_API_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_TEST_API_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/session/user_session_manager.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/login/signin/auth_sync_observer.h b/chrome/browser/chromeos/login/signin/auth_sync_observer.h index 983f7ac..88ffc808 100644 --- a/chrome/browser/chromeos/login/signin/auth_sync_observer.h +++ b/chrome/browser/chromeos/login/signin/auth_sync_observer.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/keyed_service/core/keyed_service.h" #include "components/sync_driver/sync_service_observer.h"
diff --git a/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h b/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h index 3f708a71..86863e0 100644 --- a/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h +++ b/chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_AUTH_SYNC_OBSERVER_FACTORY_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_AUTH_SYNC_OBSERVER_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/chromeos/login/signin/merge_session_load_page.h b/chrome/browser/chromeos/login/signin/merge_session_load_page.h index 00a5b3e..7a77f7bf 100644 --- a/chrome/browser/chromeos/login/signin/merge_session_load_page.h +++ b/chrome/browser/chromeos/login/signin/merge_session_load_page.h
@@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" #include "content/public/browser/interstitial_page_delegate.h"
diff --git a/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc b/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc index 622483a..b61f430 100644 --- a/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc +++ b/chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "base/macros.h" #include "base/run_loop.h" #include "base/time/time.h" #include "chrome/browser/chromeos/login/signin/merge_session_load_page.h" @@ -26,7 +29,7 @@ const char kURL1[] = "http://www.google.com/"; const char kURL2[] = "http://mail.google.com/"; -const int64 kSessionMergeTimeout = 60; +const int64_t kSessionMergeTimeout = 60; } // namespace
diff --git a/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc b/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc index 4ee5d623..68a74d75 100644 --- a/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc +++ b/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" +#include <stdint.h> + #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/threading/non_thread_safe.h" #include "base/time/time.h" @@ -26,7 +29,7 @@ namespace { -const int64 kMaxSessionRestoreTimeInSec = 60; +const int64_t kMaxSessionRestoreTimeInSec = 60; // The set of blocked profiles. class ProfileSet : public base::NonThreadSafe, public std::set<Profile*> {
diff --git a/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h b/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h index 975608f..c4a289d 100644 --- a/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h +++ b/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h" #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
diff --git a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc index 77ea1c3b..52921142 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc +++ b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
@@ -4,6 +4,7 @@ #include <string> +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager.h b/chrome/browser/chromeos/login/signin/oauth2_login_manager.h index 371781c..3042a485 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_login_manager.h +++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h b/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h index 64e76b7..49a7a8a 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h +++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_OAUTH2_LOGIN_MANAGER_FACTORY_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_OAUTH2_LOGIN_MANAGER_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_verifier.h b/chrome/browser/chromeos/login/signin/oauth2_login_verifier.h index 2180696..38563a3 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_login_verifier.h +++ b/chrome/browser/chromeos/login/signin/oauth2_login_verifier.h
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/profiles/profile.h" #include "components/signin/core/browser/gaia_cookie_manager_service.h"
diff --git a/chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h b/chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h index 3cea28b8f..af2ab6a 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h +++ b/chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "google_apis/gaia/gaia_auth_consumer.h" #include "google_apis/gaia/gaia_auth_fetcher.h"
diff --git a/chrome/browser/chromeos/login/signin/token_handle_fetcher.cc b/chrome/browser/chromeos/login/signin/token_handle_fetcher.cc index 83a287a..221ae4f 100644 --- a/chrome/browser/chromeos/login/signin/token_handle_fetcher.cc +++ b/chrome/browser/chromeos/login/signin/token_handle_fetcher.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/chromeos/login/signin/token_handle_fetcher.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/chromeos/login/signin/token_handle_util.h" #include "chrome/browser/chromeos/profiles/profile_helper.h"
diff --git a/chrome/browser/chromeos/login/signin/token_handle_fetcher.h b/chrome/browser/chromeos/login/signin/token_handle_fetcher.h index 77ebb8a..7de3065 100644 --- a/chrome/browser/chromeos/login/signin/token_handle_fetcher.h +++ b/chrome/browser/chromeos/login/signin/token_handle_fetcher.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "components/keyed_service/core/keyed_service_shutdown_notifier.h"
diff --git a/chrome/browser/chromeos/login/signin/token_handle_util.h b/chrome/browser/chromeos/login/signin/token_handle_util.h index 8520966..d64558b 100644 --- a/chrome/browser/chromeos/login/signin/token_handle_util.h +++ b/chrome/browser/chromeos/login/signin/token_handle_util.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "components/signin/core/account_id/account_id.h"
diff --git a/chrome/browser/chromeos/login/signin_screen_controller.h b/chrome/browser/chromeos/login/signin_screen_controller.h index fb9b9817..83f2de5 100644 --- a/chrome/browser/chromeos/login/signin_screen_controller.h +++ b/chrome/browser/chromeos/login/signin_screen_controller.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_SCREEN_CONTROLLER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_SCREEN_CONTROLLER_H_ +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/gaia_screen.h" #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" #include "chrome/browser/chromeos/login/ui/login_display_host.h"
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_authentication.h b/chrome/browser/chromeos/login/supervised/supervised_user_authentication.h index c636abf7..0a39d352 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_authentication.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_authentication.h
@@ -4,8 +4,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_AUTHENTICATION_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_AUTHENTICATION_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_authentication_unittest.cc b/chrome/browser/chromeos/login/supervised/supervised_user_authentication_unittest.cc index 0d7aeec6..248894a 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_authentication_unittest.cc +++ b/chrome/browser/chromeos/login/supervised/supervised_user_authentication_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" #include "chromeos/login/auth/key.h"
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_authenticator.h b/chrome/browser/chromeos/login/supervised/supervised_user_authenticator.h index 4402946..eeb45d18 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_authenticator.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_authenticator.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc index 0c58cad..7329c68 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc +++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc
@@ -5,6 +5,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h"
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller.h b/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller.h index 8c7dfb7c..10efbbd3 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller.h
@@ -8,6 +8,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h b/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h index b272102..9700fc8 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h
@@ -8,6 +8,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h b/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h index 0cda0855..d78ba93 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_FLOW_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_FLOW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/chromeos/login/user_flow.h" #include "components/user_manager/user.h"
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h index 6c975d9..227bc55b 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/camera_presence_notifier.h" #include "chrome/browser/chromeos/login/screens/base_screen.h" #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_controller.h"
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h b/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h index f2eb558..1920a71f 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_LOGIN_FLOW_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_LOGIN_FLOW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/chromeos/login/user_flow.h"
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_password_browsertest.cc b/chrome/browser/chromeos/login/supervised/supervised_user_password_browsertest.cc index 81b9ab5..0be6cc72 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_password_browsertest.cc +++ b/chrome/browser/chromeos/login/supervised/supervised_user_password_browsertest.cc
@@ -5,6 +5,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h"
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h index dd77277..15c3c4c 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h
@@ -4,9 +4,12 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_ +#include <stddef.h> + #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/login_manager_test.h" #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/chromeos/login/test/app_window_waiter.h b/chrome/browser/chromeos/login/test/app_window_waiter.h index 4a88750f..bb2bfc8 100644 --- a/chrome/browser/chromeos/login/test/app_window_waiter.h +++ b/chrome/browser/chromeos/login/test/app_window_waiter.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/run_loop.h" #include "extensions/browser/app_window/app_window_registry.h"
diff --git a/chrome/browser/chromeos/login/test/https_forwarder.cc b/chrome/browser/chromeos/login/test/https_forwarder.cc index 4101476..30044b0 100644 --- a/chrome/browser/chromeos/login/test/https_forwarder.cc +++ b/chrome/browser/chromeos/login/test/https_forwarder.cc
@@ -9,6 +9,7 @@ #include "base/base_paths.h" #include "base/files/file_path.h" #include "base/logging.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/values.h" #include "net/cert/test_root_certs.h"
diff --git a/chrome/browser/chromeos/login/test/oobe_base_test.h b/chrome/browser/chromeos/login/test/oobe_base_test.h index f2f12d1e..961a869 100644 --- a/chrome/browser/chromeos/login/test/oobe_base_test.h +++ b/chrome/browser/chromeos/login/test/oobe_base_test.h
@@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/command_line.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/test/https_forwarder.h" #include "chrome/browser/chromeos/login/test/js_checker.h" #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
diff --git a/chrome/browser/chromeos/login/test/oobe_screen_waiter.h b/chrome/browser/chromeos/login/test/oobe_screen_waiter.h index 4f93790f..179703f 100644 --- a/chrome/browser/chromeos/login/test/oobe_screen_waiter.h +++ b/chrome/browser/chromeos/login/test/oobe_screen_waiter.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_SCREEN_WAITER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_TEST_OOBE_SCREEN_WAITER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/ui/oobe_display.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
diff --git a/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h b/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h index f8ef3800..041c851a 100644 --- a/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h +++ b/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/test/base/in_process_browser_test.h" class Browser;
diff --git a/chrome/browser/chromeos/login/ui/captive_portal_view.h b/chrome/browser/chromeos/login/ui/captive_portal_view.h index aa5c05e..2acb713a5 100644 --- a/chrome/browser/chromeos/login/ui/captive_portal_view.h +++ b/chrome/browser/chromeos/login/ui/captive_portal_view.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_VIEW_H_ #include <string> +#include "base/macros.h" #include "chrome/browser/chromeos/login/ui/simple_web_view_dialog.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc b/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc index 18ea84e..1742b01f1 100644 --- a/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc +++ b/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc
@@ -5,6 +5,7 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/login/login_manager_test.h" #include "chrome/browser/chromeos/login/screens/error_screen.h"
diff --git a/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h b/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h index f301d46..03a0b38 100644 --- a/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h +++ b/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_CAPTIVE_PORTAL_WINDOW_PROXY_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "ui/views/widget/widget_observer.h"
diff --git a/chrome/browser/chromeos/login/ui/input_events_blocker.h b/chrome/browser/chromeos/login/ui/input_events_blocker.h index 6e92eb5c..174b13f 100644 --- a/chrome/browser/chromeos/login/ui/input_events_blocker.h +++ b/chrome/browser/chromeos/login/ui/input_events_blocker.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_INPUT_EVENTS_BLOCKER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/events/event_handler.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.h b/chrome/browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.h index 2f0075ad..54c747d 100644 --- a/chrome/browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.h +++ b/chrome/browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_KEYBOARD_DRIVEN_OOBE_KEY_HANDLER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_KEYBOARD_DRIVEN_OOBE_KEY_HANDLER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/events/event_handler.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/login/ui/lock_window.h b/chrome/browser/chromeos/login/ui/lock_window.h index be42a8bd..b3076a2 100644 --- a/chrome/browser/chromeos/login/ui/lock_window.h +++ b/chrome/browser/chromeos/login/ui/lock_window.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOCK_WINDOW_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOCK_WINDOW_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace views { class View;
diff --git a/chrome/browser/chromeos/login/ui/lock_window_aura.h b/chrome/browser/chromeos/login/ui/lock_window_aura.h index 8646968..548ae162 100644 --- a/chrome/browser/chromeos/login/ui/lock_window_aura.h +++ b/chrome/browser/chromeos/login/ui/lock_window_aura.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOCK_WINDOW_AURA_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/ui/lock_window.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h"
diff --git a/chrome/browser/chromeos/login/ui/login_display.h b/chrome/browser/chromeos/login/ui/login_display.h index 11fdb4f..a650d03 100644 --- a/chrome/browser/chromeos/login/ui/login_display.h +++ b/chrome/browser/chromeos/login/ui/login_display.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" #include "chrome/browser/chromeos/login/signin_specifics.h"
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc index e8621c41..9d88728 100644 --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -14,6 +14,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" @@ -134,7 +135,7 @@ // The delay of triggering initialization of the device policy subsystem // after the login screen is initialized. This makes sure that device policy // network requests are made while the system is idle waiting for user input. -const int64 kPolicyServiceInitializationDelayMilliseconds = 100; +const int64_t kPolicyServiceInitializationDelayMilliseconds = 100; // A class to observe an implicit animation and invokes the callback after the // animation is completed.
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.h b/chrome/browser/chromeos/login/ui/login_display_host_impl.h index 78f88be..fc12ce62 100644 --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.h +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.h
@@ -5,11 +5,14 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_ +#include <stdint.h> + #include <string> #include <vector> #include "ash/shell_delegate.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/login/app_launch_controller.h"
diff --git a/chrome/browser/chromeos/login/ui/login_web_dialog.h b/chrome/browser/chromeos/login/ui/login_web_dialog.h index 29ccb328..cb7db30 100644 --- a/chrome/browser/chromeos/login/ui/login_web_dialog.h +++ b/chrome/browser/chromeos/login/ui/login_web_dialog.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" #include "ui/gfx/geometry/size.h"
diff --git a/chrome/browser/chromeos/login/ui/mock_login_display.h b/chrome/browser/chromeos/login/ui/mock_login_display.h index ae65703..eab108b1 100644 --- a/chrome/browser/chromeos/login/ui/mock_login_display.h +++ b/chrome/browser/chromeos/login/ui/mock_login_display.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_MOCK_LOGIN_DISPLAY_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_MOCK_LOGIN_DISPLAY_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/ui/login_display.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/chromeos/login/ui/mock_login_display_host.h b/chrome/browser/chromeos/login/ui/mock_login_display_host.h index 9ac83d2..8b26bf5d 100644 --- a/chrome/browser/chromeos/login/ui/mock_login_display_host.h +++ b/chrome/browser/chromeos/login/ui/mock_login_display_host.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_MOCK_LOGIN_DISPLAY_HOST_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_MOCK_LOGIN_DISPLAY_HOST_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/ui/login_display_host.h" #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/chromeos/login/ui/oobe_display.h b/chrome/browser/chromeos/login/ui/oobe_display.h index 75f6614b..860f8b3 100644 --- a/chrome/browser/chromeos/login/ui/oobe_display.h +++ b/chrome/browser/chromeos/login/ui/oobe_display.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/login/ui/proxy_settings_dialog.h b/chrome/browser/chromeos/login/ui/proxy_settings_dialog.h index bc5d715..89721f1 100644 --- a/chrome/browser/chromeos/login/ui/proxy_settings_dialog.h +++ b/chrome/browser/chromeos/login/ui/proxy_settings_dialog.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_PROXY_SETTINGS_DIALOG_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_PROXY_SETTINGS_DIALOG_H_ +#include "base/macros.h" #include "chrome/browser/chromeos/login/ui/login_web_dialog.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc index f64498747..0018845 100644 --- a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc +++ b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc
@@ -6,6 +6,7 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h index 2dcf8ed6..1c704b6 100644 --- a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h +++ b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_SIMPLE_WEB_VIEW_DIALOG_H_ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/command_updater_delegate.h" #include "chrome/browser/ssl/security_state_model.h"
diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen.h b/chrome/browser/chromeos/login/ui/user_adding_screen.h index a55de6d..7d0c46ff 100644 --- a/chrome/browser/chromeos/login/ui/user_adding_screen.h +++ b/chrome/browser/chromeos/login/ui/user_adding_screen.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_USER_ADDING_SCREEN_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_USER_ADDING_SCREEN_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc index e406267..b4e1b98 100644 --- a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
@@ -4,6 +4,7 @@ #include "ash/session/session_state_delegate.h" #include "ash/shell.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/login/lock/screen_locker.h"
diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_controller.h b/chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_controller.h index d3af00e..96b1130 100644 --- a/chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_controller.h +++ b/chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_controller.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_USER_ADDING_SCREEN_INPUT_METHODS_CONTROLLER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_USER_ADDING_SCREEN_INPUT_METHODS_CONTROLLER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" #include "ui/base/ime/chromeos/input_method_manager.h"
diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.h b/chrome/browser/chromeos/login/ui/webui_login_display.h index de4fb84..025dd3e 100644 --- a/chrome/browser/chromeos/login/ui/webui_login_display.h +++ b/chrome/browser/chromeos/login/ui/webui_login_display.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/signin_specifics.h" #include "chrome/browser/chromeos/login/ui/login_display.h" #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc index 38f0efc30..72d23d1 100644 --- a/chrome/browser/chromeos/login/ui/webui_login_view.cc +++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.h b/chrome/browser/chromeos/login/ui/webui_login_view.h index 37d7147..e6a337b 100644 --- a/chrome/browser/chromeos/login/ui/webui_login_view.h +++ b/chrome/browser/chromeos/login/ui/webui_login_view.h
@@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "base/observer_list.h" #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" #include "components/web_modal/web_contents_modal_dialog_host.h"
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_loader.h b/chrome/browser/chromeos/login/users/avatar/user_image_loader.h index dea30ce8..b8bc3741 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_loader.h +++ b/chrome/browser/chromeos/login/users/avatar/user_image_loader.h
@@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/image_decoder.h"
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc index df168436..46f8ff1 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc +++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
@@ -2,15 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <map> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" @@ -655,7 +657,7 @@ const base::FilePath user_key_file = user_keys_dir.AppendASCII(sanitized_username) .AppendASCII("policy.pub"); - std::vector<uint8> user_key_bits; + std::vector<uint8_t> user_key_bits; ASSERT_TRUE(user_policy_.GetSigningKey()->ExportPublicKey(&user_key_bits)); ASSERT_TRUE(base::CreateDirectory(user_key_file.DirName())); ASSERT_EQ(base::WriteFile(
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc index df6d304..62270c54 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc +++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
@@ -4,10 +4,13 @@ #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/prefs/pref_registry_simple.h"
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h index 5b42bcc..fdffa19 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h +++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h
@@ -9,8 +9,8 @@ #include <set> #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc index 2275e46..17eb2ca2 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc +++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/files/file_util.h"
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h b/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h index 6e237ec..53ebb62 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h +++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_MANAGER_TEST_UTIL_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_MANAGER_TEST_UTIL_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "chrome/browser/image_decoder.h"
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager.h b/chrome/browser/chromeos/login/users/chrome_user_manager.h index fc99274..9b53aef 100644 --- a/chrome/browser/chromeos/login/users/chrome_user_manager.h +++ b/chrome/browser/chromeos/login/users/chrome_user_manager.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/task_runner.h" #include "chrome/browser/chromeos/login/users/affiliation.h"
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc index e026c5a..cf03f6a7 100644 --- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc +++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" +#include <stddef.h> + #include <cstddef> #include <set>
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h index 8a96e78..69b85b5 100644 --- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h +++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.h b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.h index dc30613..b6aed652 100644 --- a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.h +++ b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.h
@@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/login/user_flow.h" #include "chrome/browser/chromeos/login/users/user_manager_interface.h"
diff --git a/chrome/browser/chromeos/login/users/fake_supervised_user_manager.h b/chrome/browser/chromeos/login/users/fake_supervised_user_manager.h index d2a9a43..5d690f3 100644 --- a/chrome/browser/chromeos/login/users/fake_supervised_user_manager.h +++ b/chrome/browser/chromeos/login/users/fake_supervised_user_manager.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_SUPERVISED_USER_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_SUPERVISED_USER_MANAGER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/login/users/multi_profile_user_controller.h b/chrome/browser/chromeos/login/users/multi_profile_user_controller.h index 506794f..794170c 100644 --- a/chrome/browser/chromeos/login/users/multi_profile_user_controller.h +++ b/chrome/browser/chromeos/login/users/multi_profile_user_controller.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" class PrefChangeRegistrar;
diff --git a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc index 68cceed..405a084 100644 --- a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc +++ b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/chromeos/login/users/scoped_test_user_manager.h b/chrome/browser/chromeos/login/users/scoped_test_user_manager.h index ec07d2c..cb60d9c 100644 --- a/chrome/browser/chromeos/login/users/scoped_test_user_manager.h +++ b/chrome/browser/chromeos/login/users/scoped_test_user_manager.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_TEST_USER_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_TEST_USER_MANAGER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h b/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h index 38880f6e..92ba565b 100644 --- a/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h +++ b/chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_USER_MANAGER_ENABLER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_USER_MANAGER_ENABLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace user_manager { class UserManager;
diff --git a/chrome/browser/chromeos/login/users/supervised_user_manager.h b/chrome/browser/chromeos/login/users/supervised_user_manager.h index 82a4b0c5..f16d0e2 100644 --- a/chrome/browser/chromeos/login/users/supervised_user_manager.h +++ b/chrome/browser/chromeos/login/users/supervised_user_manager.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h index 06ecc4a..ee74a37 100644 --- a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h +++ b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h" #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
diff --git a/chrome/browser/chromeos/login/users/user_manager_interface.h b/chrome/browser/chromeos/login/users/user_manager_interface.h index c6bf205..10e0238 100644 --- a/chrome/browser/chromeos/login/users/user_manager_interface.h +++ b/chrome/browser/chromeos/login/users/user_manager_interface.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_INTERFACE_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_INTERFACE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "components/user_manager/user.h" #include "components/user_manager/user_type.h"
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc index 390ee1f..8acbf4f 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" +#include <stdint.h> + #include <numeric> #include <vector> @@ -16,6 +18,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/prefs/pref_registry_simple.h" @@ -892,7 +895,7 @@ std::string date_string; if (!info_dict->GetString(kNewWallpaperDateNodeName, &date_string)) return false; - int64 date_val; + int64_t date_val; if (!base::StringToInt64(date_string, &date_val)) return false;
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h index d24b077..8e88e2a5 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h
@@ -5,12 +5,15 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_ +#include <stddef.h> + #include <deque> #include <string> #include <vector> #include "ash/desktop_background/desktop_background_controller.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc index ae5e8fd..417196f 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" +#include <stddef.h> + #include "ash/desktop_background/desktop_background_controller.h" #include "ash/desktop_background/desktop_background_controller_observer.h" #include "ash/desktop_background/desktop_background_controller_test_api.h"
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc index 95e377c13..c52b3f76 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc
@@ -2,18 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include <vector> #include "ash/desktop_background/desktop_background_controller.h" #include "ash/desktop_background/desktop_background_controller_observer.h" #include "ash/shell.h" -#include "base/basictypes.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/run_loop.h" @@ -89,7 +91,7 @@ ADD_FAILURE() << "Bitmap has not been configured."; return SkColorSetARGB(0, 0, 0, 0); } - uint64 a = 0, r = 0, g = 0, b = 0; + uint64_t a = 0, r = 0, g = 0, b = 0; bitmap.lockPixels(); for (int x = 0; x < bitmap.width(); ++x) { for (int y = 0; y < bitmap.height(); ++y) { @@ -101,7 +103,7 @@ } } bitmap.unlockPixels(); - uint64 pixel_number = bitmap.width() * bitmap.height(); + uint64_t pixel_number = bitmap.width() * bitmap.height(); return SkColorSetARGB((a + pixel_number / 2) / pixel_number, (r + pixel_number / 2) / pixel_number, (g + pixel_number / 2) / pixel_number, @@ -151,7 +153,7 @@ const base::FilePath user_key_file = user_keys_dir.AppendASCII(sanitized_user_id) .AppendASCII("policy.pub"); - std::vector<uint8> user_key_bits; + std::vector<uint8_t> user_key_bits; EXPECT_TRUE(user_policy_builder->GetSigningKey()-> ExportPublicKey(&user_key_bits)); EXPECT_TRUE(base::CreateDirectory(user_key_file.DirName()));
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc index d30b87f..d45be473 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc
@@ -4,12 +4,15 @@ #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h" +#include <stddef.h> + #include "ash/ash_switches.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/time/time.h" #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
diff --git a/chrome/browser/chromeos/login/version_info_updater.cc b/chrome/browser/chromeos/login/version_info_updater.cc index c326255..1eec4900 100644 --- a/chrome/browser/chromeos/login/version_info_updater.cc +++ b/chrome/browser/chromeos/login/version_info_updater.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/chromeos/login/version_info_updater.h b/chrome/browser/chromeos/login/version_info_updater.h index f1ee1c5..8371fef 100644 --- a/chrome/browser/chromeos/login/version_info_updater.h +++ b/chrome/browser/chromeos/login/version_info_updater.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/settings/cros_settings.h"
diff --git a/chrome/browser/chromeos/login/webview_login_browsertest.cc b/chrome/browser/chromeos/login/webview_login_browsertest.cc index 2915529..17c72b2a 100644 --- a/chrome/browser/chromeos/login/webview_login_browsertest.cc +++ b/chrome/browser/chromeos/login/webview_login_browsertest.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 "base/macros.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/login/test/oobe_base_test.h" #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index 6c4e907..932d2df 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/login/wizard_controller.h" #include <signal.h> +#include <stddef.h> #include <stdlib.h> #include <sys/types.h> @@ -15,6 +16,7 @@ #include "base/callback_helpers.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h index 1b5f1bce..3c80944 100644 --- a/chrome/browser/chromeos/login/wizard_controller.h +++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -8,10 +8,10 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index 702489e..28bcd45 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/login/wizard_controller.h" -#include "base/basictypes.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/prefs/pref_service_factory.h"
diff --git a/chrome/browser/chromeos/mobile/mobile_activator.h b/chrome/browser/chromeos/mobile/mobile_activator.h index ecc3769..19acc66 100644 --- a/chrome/browser/chromeos/mobile/mobile_activator.h +++ b/chrome/browser/chromeos/mobile/mobile_activator.h
@@ -9,6 +9,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/mobile/mobile_activator_unittest.cc b/chrome/browser/chromeos/mobile/mobile_activator_unittest.cc index 47cee210..40af942 100644 --- a/chrome/browser/chromeos/mobile/mobile_activator_unittest.cc +++ b/chrome/browser/chromeos/mobile/mobile_activator_unittest.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/mobile/mobile_activator.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/values.h" #include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/chromeos/mobile_config.cc b/chrome/browser/chromeos/mobile_config.cc index 6e560f88..f231fe67 100644 --- a/chrome/browser/chromeos/mobile_config.cc +++ b/chrome/browser/chromeos/mobile_config.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/mobile_config.h" +#include <stddef.h> + #include <algorithm> #include "base/bind.h"
diff --git a/chrome/browser/chromeos/mobile_config.h b/chrome/browser/chromeos/mobile_config.h index 8c33a9a..9343252 100644 --- a/chrome/browser/chromeos/mobile_config.h +++ b/chrome/browser/chromeos/mobile_config.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc b/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc index dc65814..4f268c6 100644 --- a/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc +++ b/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" +#include <stddef.h> + #include "crypto/nss_util_internal.h" #include "crypto/scoped_test_nss_chromeos_user.h" #include "net/base/net_errors.h"
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.h b/chrome/browser/chromeos/net/network_portal_detector_impl.h index 161ae25..9b4e6c3 100644 --- a/chrome/browser/chromeos/net/network_portal_detector_impl.h +++ b/chrome/browser/chromeos/net/network_portal_detector_impl.h
@@ -7,10 +7,10 @@ #include <string> -#include "base/basictypes.h" #include "base/cancelable_callback.h" #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/net/network_portal_detector_test_impl.h b/chrome/browser/chromeos/net/network_portal_detector_test_impl.h index e94d3743..2e06e8d 100644 --- a/chrome/browser/chromeos/net/network_portal_detector_test_impl.h +++ b/chrome/browser/chromeos/net/network_portal_detector_test_impl.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "chromeos/network/portal_detector/network_portal_detector.h"
diff --git a/chrome/browser/chromeos/net/network_portal_detector_test_utils.cc b/chrome/browser/chromeos/net/network_portal_detector_test_utils.cc index 45e7dd0..c5d9adb 100644 --- a/chrome/browser/chromeos/net/network_portal_detector_test_utils.cc +++ b/chrome/browser/chromeos/net/network_portal_detector_test_utils.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/net/network_portal_detector_test_utils.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h"
diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller.cc b/chrome/browser/chromeos/net/network_portal_notification_controller.cc index e7cd222..d9b913e6 100644 --- a/chrome/browser/chromeos/net/network_portal_notification_controller.cc +++ b/chrome/browser/chromeos/net/network_portal_notification_controller.cc
@@ -4,14 +4,16 @@ #include "chrome/browser/chromeos/net/network_portal_notification_controller.h" +#include <stdint.h> + #include <vector> #include "ash/shell.h" #include "ash/system/system_notifier.h" #include "ash/system/tray/system_tray_notifier.h" -#include "base/basictypes.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc b/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc index 49f5e07..464d03c 100644 --- a/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc +++ b/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" #include "chrome/browser/chromeos/net/network_portal_notification_controller.h"
diff --git a/chrome/browser/chromeos/net/onc_utils.cc b/chrome/browser/chromeos/net/onc_utils.cc index 1f6b510..00e283bf 100644 --- a/chrome/browser/chromeos/net/onc_utils.cc +++ b/chrome/browser/chromeos/net/onc_utils.cc
@@ -7,6 +7,7 @@ #include "base/bind_helpers.h" #include "base/json/json_writer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/chromeos/options/cert_library.h b/chrome/browser/chromeos/options/cert_library.h index 99fc56b3..2e86ead 100644 --- a/chrome/browser/chromeos/options/cert_library.h +++ b/chrome/browser/chromeos/options/cert_library.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/string16.h" #include "chromeos/cert_loader.h" #include "net/cert/x509_certificate.h"
diff --git a/chrome/browser/chromeos/options/network_config_view.h b/chrome/browser/chromeos/options/network_config_view.h index 2de514e..af541db 100644 --- a/chrome/browser/chromeos/options/network_config_view.h +++ b/chrome/browser/chromeos/options/network_config_view.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow #include "ui/views/controls/button/button.h" // views::ButtonListener
diff --git a/chrome/browser/chromeos/options/network_property_ui_data.h b/chrome/browser/chromeos/options/network_property_ui_data.h index 10db2d7..b93736b5 100644 --- a/chrome/browser/chromeos/options/network_property_ui_data.h +++ b/chrome/browser/chromeos/options/network_property_ui_data.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/onc/onc_constants.h"
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc index 23f0218..b06ec09 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.cc +++ b/chrome/browser/chromeos/options/vpn_config_view.cc
@@ -4,7 +4,10 @@ #include "chrome/browser/chromeos/options/vpn_config_view.h" +#include <stddef.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/chromeos/options/vpn_config_view.h b/chrome/browser/chromeos/options/vpn_config_view.h index 1d5f2c4..60334e09 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.h +++ b/chrome/browser/chromeos/options/vpn_config_view.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/chromeos/options/cert_library.h"
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc index c3197f8..80034b6 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.cc +++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -4,7 +4,10 @@ #include "chrome/browser/chromeos/options/wifi_config_view.h" +#include <stddef.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h index 44829974..6a68f7e7 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.h +++ b/chrome/browser/chromeos/options/wifi_config_view.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/options/wimax_config_view.h b/chrome/browser/chromeos/options/wimax_config_view.h index fbe31a95..97d0ceb5 100644 --- a/chrome/browser/chromeos/options/wimax_config_view.h +++ b/chrome/browser/chromeos/options/wimax_config_view.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/chromeos/options/network_config_view.h"
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc index a6c5d91c7..56151cc6 100644 --- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc +++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" #include <keyhi.h> +#include <stdint.h> #include <algorithm> #include <string> @@ -101,7 +102,7 @@ const base::Callback<void(const scoped_refptr<PublicKey>& public_key, const scoped_refptr<PrivateKey>& private_key)>& callback) { - std::vector<uint8> public_key_data; + std::vector<uint8_t> public_key_data; scoped_refptr<PublicKey> public_key; if (!owner_key_util->ImportPublicKey(&public_key_data)) { scoped_refptr<PrivateKey> private_key; @@ -129,7 +130,7 @@ bool DoesPrivateKeyExistAsyncHelper( const scoped_refptr<OwnerKeyUtil>& owner_key_util) { - std::vector<uint8> public_key; + std::vector<uint8_t> public_key; if (!owner_key_util->ImportPublicKey(&public_key)) return false; crypto::ScopedSECKEYPrivateKey key =
diff --git a/chrome/browser/chromeos/platform_keys/key_permissions.h b/chrome/browser/chromeos/platform_keys/key_permissions.h index 69eb403..fd94edb6 100644 --- a/chrome/browser/chromeos/platform_keys/key_permissions.h +++ b/chrome/browser/chromeos/platform_keys/key_permissions.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys.h b/chrome/browser/chromeos/platform_keys/platform_keys.h index 8b957f03..9b3a1b3 100644 --- a/chrome/browser/chromeos/platform_keys/platform_keys.h +++ b/chrome/browser/chromeos/platform_keys/platform_keys.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_PLATFORM_KEYS_H_ #define CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_PLATFORM_KEYS_H_ +#include <stddef.h> + #include <string> #include <vector>
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc b/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc index 053a673..6ed2898 100644 --- a/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc +++ b/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc
@@ -8,6 +8,8 @@ #include <cryptohi.h> #include <keyhi.h> #include <secder.h> +#include <stddef.h> +#include <stdint.h> #include "base/bind.h" #include "base/bind_helpers.h" @@ -444,9 +446,9 @@ // Does the actual signing on a worker thread. Used by SignRSAWithDB(). void SignRSAOnWorkerThread(scoped_ptr<SignRSAState> state) { - const uint8* public_key_uint8 = - reinterpret_cast<const uint8*>(state->public_key_.data()); - std::vector<uint8> public_key_vector( + const uint8_t* public_key_uint8 = + reinterpret_cast<const uint8_t*>(state->public_key_.data()); + std::vector<uint8_t> public_key_vector( public_key_uint8, public_key_uint8 + state->public_key_.size()); crypto::ScopedSECKEYPrivateKey rsa_key;
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_service.cc b/chrome/browser/chromeos/platform_keys/platform_keys_service.cc index d61e41f..8d73702 100644 --- a/chrome/browser/chromeos/platform_keys/platform_keys_service.cc +++ b/chrome/browser/chromeos/platform_keys/platform_keys_service.cc
@@ -4,11 +4,14 @@ #include "chrome/browser/chromeos/platform_keys/platform_keys_service.h" +#include <stddef.h> + #include <utility> #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/chromeos/platform_keys/platform_keys.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc b/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc index c3595e48..77f340d 100644 --- a/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc +++ b/chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h b/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h index 162f39b1..9856d11 100644 --- a/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h +++ b/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h
@@ -5,7 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_AFFILIATED_CLOUD_POLICY_INVALIDATOR_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_AFFILIATED_CLOUD_POLICY_INVALIDATOR_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provider.h" @@ -57,7 +58,7 @@ AffiliatedInvalidationServiceProvider* const invalidation_service_provider_; // The highest invalidation version that was handled already. - int64 highest_handled_invalidation_version_; + int64_t highest_handled_invalidation_version_; // The current |CloudPolicyInvalidator|. nullptr if no connected invalidation // service is available.
diff --git a/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator_unittest.cc b/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator_unittest.cc index 23be632..d2052235 100644 --- a/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator_unittest.cc +++ b/chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator_unittest.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h" +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/policy/device_policy_builder.h" @@ -123,7 +126,7 @@ // Trigger an invalidation. The invalidation version is interpreted as a // timestamp in microseconds. The policy blob contains a timestamp in // milliseconds. Convert from one to the other by multiplying by 1000. - const int64 invalidation_version = policy.policy_data().timestamp() * 1000; + const int64_t invalidation_version = policy.policy_data().timestamp() * 1000; syncer::Invalidation invalidation = syncer::Invalidation::Init( invalidation::ObjectId(kInvalidationSource, kInvalidationName), invalidation_version,
diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc index 672a6de..3e44c84 100644 --- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc +++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
@@ -7,6 +7,7 @@ #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part_chromeos.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc index e0f9010..fdd9d15 100644 --- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc +++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
@@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/chromeos/policy/affiliation_test_helper.cc b/chrome/browser/chromeos/policy/affiliation_test_helper.cc index bfedc57d..89507b5a 100644 --- a/chrome/browser/chromeos/policy/affiliation_test_helper.cc +++ b/chrome/browser/chromeos/policy/affiliation_test_helper.cc
@@ -3,6 +3,8 @@ // found in the LICENSE file. #include "chrome/browser/chromeos/policy/affiliation_test_helper.h" +#include <stdint.h> + #include <string> #include <vector> @@ -49,7 +51,7 @@ chromeos::CryptohomeClient::GetStubSanitizedUsername(username); const base::FilePath user_key_file = user_keys_dir.AppendASCII(sanitized_username).AppendASCII("policy.pub"); - std::vector<uint8> user_key_bits; + std::vector<uint8_t> user_key_bits; ASSERT_TRUE(user_policy->GetSigningKey()->ExportPublicKey(&user_key_bits)); ASSERT_TRUE(base::CreateDirectory(user_key_file.DirName())); ASSERT_EQ(base::WriteFile(user_key_file,
diff --git a/chrome/browser/chromeos/policy/auto_enrollment_client.cc b/chrome/browser/chromeos/policy/auto_enrollment_client.cc index edce444..c75ec4a 100644 --- a/chrome/browser/chromeos/policy/auto_enrollment_client.cc +++ b/chrome/browser/chromeos/policy/auto_enrollment_client.cc
@@ -43,12 +43,12 @@ "Enterprise.AutoEnrollmentRequestNetworkErrorCode"; // Returns the power of the next power-of-2 starting at |value|. -int NextPowerOf2(int64 value) { +int NextPowerOf2(int64_t value) { for (int i = 0; i <= AutoEnrollmentClient::kMaximumPower; ++i) { if ((INT64_C(1) << i) >= value) return i; } - // No other value can be represented in an int64. + // No other value can be represented in an int64_t. return AutoEnrollmentClient::kMaximumPower + 1; } @@ -236,9 +236,9 @@ void AutoEnrollmentClient::SendBucketDownloadRequest() { // Only power-of-2 moduli are supported for now. These are computed by taking // the lower |current_power_| bits of the hash. - uint64 remainder = 0; + uint64_t remainder = 0; for (int i = 0; 8 * i < current_power_; ++i) { - uint64 byte = server_backed_state_key_hash_[31 - i] & 0xff; + uint64_t byte = server_backed_state_key_hash_[31 - i] & 0xff; remainder = remainder | (byte << (8 * i)); } remainder = remainder & ((UINT64_C(1) << current_power_) - 1); @@ -321,7 +321,7 @@ // Server is asking us to retry with a different modulus. modulus_updates_received_++; - int64 modulus = enrollment_response.expected_modulus(); + int64_t modulus = enrollment_response.expected_modulus(); int power = NextPowerOf2(modulus); if ((INT64_C(1) << power) != modulus) { LOG(ERROR) << "Auto enrollment: the server didn't ask for a power-of-2 "
diff --git a/chrome/browser/chromeos/policy/auto_enrollment_client.h b/chrome/browser/chromeos/policy/auto_enrollment_client.h index b214079..d42c1a58 100644 --- a/chrome/browser/chromeos/policy/auto_enrollment_client.h +++ b/chrome/browser/chromeos/policy/auto_enrollment_client.h
@@ -5,11 +5,13 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_AUTO_ENROLLMENT_CLIENT_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_AUTO_ENROLLMENT_CLIENT_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" @@ -54,9 +56,9 @@ class AutoEnrollmentClient : public net::NetworkChangeNotifier::NetworkChangeObserver { public: - // The modulus value is sent in an int64 field in the protobuf, whose maximum - // value is 2^63-1. So 2^64 and 2^63 can't be represented as moduli and the - // max is 2^62 (when the moduli are restricted to powers-of-2). + // The modulus value is sent in an int64_t field in the protobuf, whose + // maximum value is 2^63-1. So 2^64 and 2^63 can't be represented as moduli + // and the max is 2^62 (when the moduli are restricted to powers-of-2). static const int kMaximumPower = 62; // Used for signaling progress to a consumer.
diff --git a/chrome/browser/chromeos/policy/auto_enrollment_client_unittest.cc b/chrome/browser/chromeos/policy/auto_enrollment_client_unittest.cc index 1813430c..f89722e 100644 --- a/chrome/browser/chromeos/policy/auto_enrollment_client_unittest.cc +++ b/chrome/browser/chromeos/policy/auto_enrollment_client_unittest.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" #include "base/prefs/testing_pref_service.h" @@ -90,7 +91,7 @@ .WillOnce(service_->FailJob(error)); } - void ServerWillReply(int64 modulus, bool with_hashes, bool with_id_hash) { + void ServerWillReply(int64_t modulus, bool with_hashes, bool with_id_hash) { em::DeviceManagementResponse response; em::DeviceAutoEnrollmentResponse* enrollment_response = response.mutable_auto_enrollment_response(); @@ -387,7 +388,7 @@ } TEST_F(AutoEnrollmentClientTest, ManyBitsUploaded) { - int64 bottom62 = INT64_C(0x386e7244d097c3e6); + int64_t bottom62 = INT64_C(0x386e7244d097c3e6); for (int i = 0; i <= 62; ++i) { CreateClient(kStateKey, i, i); ServerWillReply(-1, false, false);
diff --git a/chrome/browser/chromeos/policy/blocking_login_browsertest.cc b/chrome/browser/chromeos/policy/blocking_login_browsertest.cc index 47f0a65..b6f7972 100644 --- a/chrome/browser/chromeos/policy/blocking_login_browsertest.cc +++ b/chrome/browser/chromeos/policy/blocking_login_browsertest.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/stl_util.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h index 41164c2..714fec8 100644 --- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h +++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
@@ -8,7 +8,7 @@ #include <set> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base.cc b/chrome/browser/chromeos/policy/cloud_external_data_manager_base.cc index ebde8d37..82cc488 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base.cc +++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base.h" +#include <stddef.h> +#include <stdint.h> + #include <map> #include <string> #include <vector> @@ -13,6 +16,7 @@ #include "base/callback.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" @@ -386,7 +390,7 @@ const base::DictionaryValue* dict = NULL; std::string url; std::string hex_hash; - std::vector<uint8> hash; + std::vector<uint8_t> hash; if (it->second.value && it->second.value->GetAsDictionary(&dict) && dict->GetStringWithoutPathExpansion("url", &url) && dict->GetStringWithoutPathExpansion("hash", &hex_hash) &&
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base.h b/chrome/browser/chromeos/policy/cloud_external_data_manager_base.h index 181f13e..ad48edf 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base.h +++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_CLOUD_EXTERNAL_DATA_MANAGER_BASE_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_CLOUD_EXTERNAL_DATA_MANAGER_BASE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h"
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc index af3c4ea1..d4cb4a8 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc +++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/scoped_temp_dir.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/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc index 2c7f590..bb0881d 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc +++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/logging.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h index 8c61b0e1..6793a352 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h +++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h
@@ -8,8 +8,8 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc index e963d02..56adb688 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc +++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc
@@ -10,6 +10,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_store.h b/chrome/browser/chromeos/policy/cloud_external_data_store.h index 8f229f5..7be302b 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_store.h +++ b/chrome/browser/chromeos/policy/cloud_external_data_store.h
@@ -5,9 +5,11 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_CLOUD_EXTERNAL_DATA_STORE_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_CLOUD_EXTERNAL_DATA_STORE_H_ +#include <stddef.h> + #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "components/policy/core/common/cloud/cloud_external_data_manager.h"
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_store_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_store_unittest.cc index 4cb564e..fd41a1c 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_store_unittest.cc +++ b/chrome/browser/chromeos/policy/cloud_external_data_store_unittest.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/chromeos/policy/cloud_external_data_store.h" +#include <stddef.h> + #include "base/compiler_specific.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/test_simple_task_runner.h" #include "components/policy/core/common/cloud/resource_cache.h"
diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc index bba8c83..2c7642e 100644 --- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc +++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h" +#include <stdint.h> + #include <string> #include <vector> @@ -154,7 +156,7 @@ return false; } - std::vector<uint8> hash; + std::vector<uint8_t> hash; if (!base::HexStringToBytes(hash_string, &hash) || hash.size() != crypto::kSHA256Length) { errors->AddError(policy, kSubkeyHash, IDS_POLICY_VALUE_FORMAT_ERROR);
diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h index 1eb90d5..8ddbeb1 100644 --- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h +++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_CONFIGURATION_POLICY_HANDLER_CHROMEOS_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_CONFIGURATION_POLICY_HANDLER_CHROMEOS_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/extensions/policy_handlers.h" #include "chromeos/network/network_ui_data.h" #include "components/onc/onc_constants.h"
diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc index 8b1f251e..a222c6c 100644 --- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
@@ -6,6 +6,7 @@ #include "base/callback.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_value_map.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/policy/consumer_management_notifier.cc b/chrome/browser/chromeos/policy/consumer_management_notifier.cc index 72eb6dc..ec80349 100644 --- a/chrome/browser/chromeos/policy/consumer_management_notifier.cc +++ b/chrome/browser/chromeos/policy/consumer_management_notifier.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/policy/consumer_management_service.cc b/chrome/browser/chromeos/policy/consumer_management_service.cc index 2e64d9b5..676c92c 100644 --- a/chrome/browser/chromeos/policy/consumer_management_service.cc +++ b/chrome/browser/chromeos/policy/consumer_management_service.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/logging.h" +#include "base/macros.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc index 94924e6..8e4853b18 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc +++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
@@ -4,11 +4,14 @@ #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h index ea0634d6..e2d69815 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h +++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc index 3795901..e383d94a4 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -4,12 +4,14 @@ #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" +#include <stdint.h> + #include <algorithm> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/testing_pref_service.h" @@ -739,7 +741,7 @@ protected: DeviceCloudPolicyManagerChromeOSEnrollmentBlankSystemSaltTest() { // Set up a FakeCryptohomeClient with a blank system salt. - fake_cryptohome_client_->set_system_salt(std::vector<uint8>()); + fake_cryptohome_client_->set_system_salt(std::vector<uint8_t>()); } };
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h index 645b47e..ea8d4d3 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h +++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_CLOUD_POLICY_STORE_CHROMEOS_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_CLOUD_POLICY_STORE_CHROMEOS_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc index 7f4fab4..5e03bae 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h"
diff --git a/chrome/browser/chromeos/policy/device_local_account.cc b/chrome/browser/chromeos/policy/device_local_account.cc index 6f8a8fd..e8cfa2c 100644 --- a/chrome/browser/chromeos/policy/device_local_account.cc +++ b/chrome/browser/chromeos/policy/device_local_account.cc
@@ -4,10 +4,12 @@ #include "chrome/browser/chromeos/policy/device_local_account.h" +#include <stddef.h> + #include <set> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc index 35d00176..8d7c527 100644 --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <map> #include <set> #include <string> @@ -10,7 +12,6 @@ #include "ash/shell.h" #include "ash/system/chromeos/session/logout_confirmation_controller.h" #include "ash/system/chromeos/session/logout_confirmation_dialog.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h"
diff --git a/chrome/browser/chromeos/policy/device_local_account_external_data_manager.h b/chrome/browser/chromeos/policy/device_local_account_external_data_manager.h index ebfe8ec..202f173 100644 --- a/chrome/browser/chromeos/policy/device_local_account_external_data_manager.h +++ b/chrome/browser/chromeos/policy/device_local_account_external_data_manager.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base.h" #include "components/policy/core/common/policy_details.h"
diff --git a/chrome/browser/chromeos/policy/device_local_account_external_data_service.h b/chrome/browser/chromeos/policy/device_local_account_external_data_service.h index 15400ae5..42602438 100644 --- a/chrome/browser/chromeos/policy/device_local_account_external_data_service.h +++ b/chrome/browser/chromeos/policy/device_local_account_external_data_service.h
@@ -8,8 +8,8 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/policy/device_local_account_external_data_manager.h"
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_provider.h b/chrome/browser/chromeos/policy/device_local_account_policy_provider.h index 3ff0f56..16bfe12 100644 --- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.h +++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service.h b/chrome/browser/chromeos/policy/device_local_account_policy_service.h index 530f7ce6..ca03719c 100644 --- a/chrome/browser/chromeos/policy/device_local_account_policy_service.h +++ b/chrome/browser/chromeos/policy/device_local_account_policy_service.h
@@ -9,10 +9,10 @@ #include <set> #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc index 0e957c87..981ca77 100644 --- a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
@@ -12,6 +12,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_store.h b/chrome/browser/chromeos/policy/device_local_account_policy_store.h index e6e021b..e3ad0d0 100644 --- a/chrome/browser/chromeos/policy/device_local_account_policy_store.h +++ b/chrome/browser/chromeos/policy/device_local_account_policy_store.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/policy/device_network_configuration_updater.h b/chrome/browser/chromeos/policy/device_network_configuration_updater.h index c180a17..b80be0d2 100644 --- a/chrome/browser/chromeos/policy/device_network_configuration_updater.h +++ b/chrome/browser/chromeos/policy/device_network_configuration_updater.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback_list.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/policy/network_configuration_updater.h"
diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc index c7443f2..548a121 100644 --- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc +++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" +#include <stdint.h> + #include <vector> #include "base/files/file_path.h" @@ -56,7 +58,7 @@ base::FilePath owner_key_file; ASSERT_TRUE(PathService::Get(chromeos::FILE_OWNER_KEY, &owner_key_file)); - std::vector<uint8> owner_key_bits; + std::vector<uint8_t> owner_key_bits; ASSERT_TRUE( device_policy()->GetSigningKey()->ExportPublicKey(&owner_key_bits)); ASSERT_EQ(base::WriteFile(owner_key_file, reinterpret_cast<const char*>(
diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h index ca528977..ae0b189d 100644 --- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h +++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/policy/device_policy_builder.h" #include "chrome/test/base/in_process_browser_test.h" #include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc index 03ea6c0..58185df5 100644 --- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc +++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
@@ -4,12 +4,15 @@ #include "chrome/browser/chromeos/policy/device_policy_decoder_chromeos.h" +#include <stdint.h> + #include <limits> #include <string> #include "base/callback.h" #include "base/json/json_reader.h" #include "base/logging.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/policy/device_local_account.h" @@ -36,7 +39,7 @@ // Decodes a protobuf integer to an IntegerValue. Returns NULL in case the input // value is out of bounds. -scoped_ptr<base::Value> DecodeIntegerValue(google::protobuf::int64 value) { +scoped_ptr<base::Value> DecodeIntegerValue(google::protobuf::int64_t value) { if (value < std::numeric_limits<int>::min() || value > std::numeric_limits<int>::max()) { LOG(WARNING) << "Integer value " << value
diff --git a/chrome/browser/chromeos/policy/device_status_collector.cc b/chrome/browser/chromeos/policy/device_status_collector.cc index 7a2afc89..bc0d2e3 100644 --- a/chrome/browser/chromeos/policy/device_status_collector.cc +++ b/chrome/browser/chromeos/policy/device_status_collector.cc
@@ -4,11 +4,12 @@ #include "chrome/browser/chromeos/policy/device_status_collector.h" +#include <stddef.h> #include <stdint.h> +#include <sys/statvfs.h> #include <cstdio> #include <limits> #include <sstream> -#include <sys/statvfs.h> #include "base/bind.h" #include "base/bind_helpers.h" @@ -17,6 +18,7 @@ #include "base/format_macros.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/posix/eintr_wrapper.h" #include "base/prefs/pref_registry_simple.h" @@ -96,7 +98,7 @@ // Determine the day key (milliseconds since epoch for corresponding day in UTC) // for a given |timestamp|. -int64 TimestampToDayKey(Time timestamp) { +int64_t TimestampToDayKey(Time timestamp) { Time::Exploded exploded; timestamp.LocalMidnight().LocalExplode(&exploded); return (Time::FromUTCExploded(exploded) - Time::UnixEpoch()).InMilliseconds(); @@ -188,7 +190,7 @@ // Read temperature in millidegree Celsius. std::string temperature_string; - int32 temperature = 0; + int32_t temperature = 0; if (base::ReadFileToString(temperature_path, &temperature_string) && sscanf(temperature_string.c_str(), "%d", &temperature) == 1) { // CPU temp in millidegree Celsius to Celsius @@ -312,7 +314,7 @@ // reacquire the location on every user session change or browser crash. content::Geoposition position; std::string timestamp_str; - int64 timestamp; + int64_t timestamp; const base::DictionaryValue* location = local_state_->GetDictionary(prefs::kDeviceLocation); if (location->GetDouble(kLatitude, &position.latitude) && @@ -447,16 +449,16 @@ TimestampToDayKey(max_time)); } -void DeviceStatusCollector::TrimStoredActivityPeriods(int64 min_day_key, +void DeviceStatusCollector::TrimStoredActivityPeriods(int64_t min_day_key, int min_day_trim_duration, - int64 max_day_key) { + int64_t max_day_key) { const base::DictionaryValue* activity_times = local_state_->GetDictionary(prefs::kDeviceActivityTimes); scoped_ptr<base::DictionaryValue> copy(activity_times->DeepCopy()); for (base::DictionaryValue::Iterator it(*activity_times); !it.IsAtEnd(); it.Advance()) { - int64 timestamp; + int64_t timestamp; if (base::StringToInt64(it.key(), ×tamp)) { // Remove data that is too old, or too far in the future. if (timestamp >= min_day_key && timestamp < max_day_key) { @@ -488,7 +490,7 @@ Time midnight = start.LocalMidnight(); while (midnight < end) { midnight += TimeDelta::FromDays(1); - int64 activity = (std::min(end, midnight) - start).InMilliseconds(); + int64_t activity = (std::min(end, midnight) - start).InMilliseconds(); std::string day_key = base::Int64ToString(TimestampToDayKey(start)); int previous_activity = 0; activity_times->GetInteger(day_key, &previous_activity); @@ -603,7 +605,7 @@ // // We only care about the first four numbers: user_time, nice_time, // sys_time, and idle_time. - uint64 user = 0, nice = 0, system = 0, idle = 0; + uint64_t user = 0, nice = 0, system = 0, idle = 0; int vals = sscanf(stats.c_str(), "cpu %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64, &user, &nice, &system, &idle); @@ -611,9 +613,9 @@ // The values returned from /proc/stat are cumulative totals, so calculate // the difference between the last sample and this one. - uint64 active = user + nice + system; - uint64 total = active + idle; - uint64 last_total = last_cpu_active_ + last_cpu_idle_; + uint64_t active = user + nice + system; + uint64_t total = active + idle; + uint64_t last_total = last_cpu_active_ + last_cpu_idle_; DCHECK_GE(active, last_cpu_active_); DCHECK_GE(idle, last_cpu_idle_); DCHECK_GE(total, last_total); @@ -655,13 +657,13 @@ for (base::DictionaryValue::Iterator it(*activity_times); !it.IsAtEnd(); it.Advance()) { - int64 start_timestamp; + int64_t start_timestamp; int activity_milliseconds; if (base::StringToInt64(it.key(), &start_timestamp) && it.value().GetAsInteger(&activity_milliseconds)) { // This is correct even when there are leap seconds, because when a leap // second occurs, two consecutive seconds have the same timestamp. - int64 end_timestamp = start_timestamp + Time::kMillisecondsPerDay; + int64_t end_timestamp = start_timestamp + Time::kMillisecondsPerDay; em::ActiveTimePeriod* active_period = request->add_active_period(); em::TimePeriod* period = active_period->mutable_time_period(); @@ -978,7 +980,7 @@ void DeviceStatusCollector::OnSubmittedSuccessfully() { TrimStoredActivityPeriods(last_reported_day_, duration_for_last_reported_day_, - std::numeric_limits<int64>::max()); + std::numeric_limits<int64_t>::max()); } void DeviceStatusCollector::OnOSVersion(const std::string& version) {
diff --git a/chrome/browser/chromeos/policy/device_status_collector.h b/chrome/browser/chromeos/policy/device_status_collector.h index c0c97d8..ac45e11 100644 --- a/chrome/browser/chromeos/policy/device_status_collector.h +++ b/chrome/browser/chromeos/policy/device_status_collector.h
@@ -5,14 +5,16 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_ +#include <stdint.h> + #include <deque> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/callback_list.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -148,9 +150,9 @@ // Trims the store activity periods to only retain data within the // [|min_day_key|, |max_day_key|). The record for |min_day_key| will be // adjusted by subtracting |min_day_trim_duration|. - void TrimStoredActivityPeriods(int64 min_day_key, + void TrimStoredActivityPeriods(int64_t min_day_key, int min_day_trim_duration, - int64 max_day_key); + int64_t max_day_key); void AddActivePeriod(base::Time start, base::Time end); @@ -209,7 +211,7 @@ // GetDeviceStatus(), and the duration for it. This is used to trim the // stored data in OnSubmittedSuccessfully(). Trimming is delayed so // unsuccessful uploads don't result in dropped data. - int64 last_reported_day_; + int64_t last_reported_day_; int duration_for_last_reported_day_; // Whether a geolocation update is currently in progress. @@ -236,7 +238,7 @@ // Amount of free RAM (measures raw memory used by processes, not internal // memory waiting to be reclaimed by GC). - int64 bytes_of_ram_free; + int64_t bytes_of_ram_free; }; // Samples of resource usage (contains multiple samples taken @@ -257,8 +259,8 @@ chromeos::CrosSettings* cros_settings_; // The most recent CPU readings. - uint64 last_cpu_active_; - uint64 last_cpu_idle_; + uint64_t last_cpu_active_; + uint64_t last_cpu_idle_; // TODO(bartfab): Remove this once crbug.com/125931 is addressed and a proper // way to mock geolocation exists.
diff --git a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc index c24d867..410a462 100644 --- a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
@@ -4,12 +4,16 @@ #include "chrome/browser/chromeos/policy/device_status_collector.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> #include "base/bind.h" #include "base/environment.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" @@ -61,7 +65,7 @@ namespace { -const int64 kMillisecondsPerDay = Time::kMicrosecondsPerDay / 1000; +const int64_t kMillisecondsPerDay = Time::kMicrosecondsPerDay / 1000; const char kKioskAccountId[] = "kiosk_user@localhost"; const char kKioskAppId[] = "kiosk_app_id"; const char kExternalMountPoint[] = "/a/b/c"; @@ -178,8 +182,8 @@ // Return the total number of active milliseconds contained in a device // status report. -int64 GetActiveMilliseconds(em::DeviceStatusReportRequest& status) { - int64 active_milliseconds = 0; +int64_t GetActiveMilliseconds(em::DeviceStatusReportRequest& status) { + int64_t active_milliseconds = 0; for (int i = 0; i < status.active_period_size(); i++) { active_milliseconds += status.active_period(i).active_duration(); } @@ -386,7 +390,7 @@ protected: // Convenience method. - int64 ActivePeriodMilliseconds() { + int64_t ActivePeriodMilliseconds() { return policy::DeviceStatusCollector::kIdlePollIntervalSeconds * 1000; }
diff --git a/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc b/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc index 8d7084082..9986c027 100644 --- a/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc
@@ -7,6 +7,7 @@ #include "ash/system/date/date_view.h" #include "ash/system/user/login_status.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
diff --git a/chrome/browser/chromeos/policy/display_rotation_default_handler_browsertest.cc b/chrome/browser/chromeos/policy/display_rotation_default_handler_browsertest.cc index 65f51b69..084e4293 100644 --- a/chrome/browser/chromeos/policy/display_rotation_default_handler_browsertest.cc +++ b/chrome/browser/chromeos/policy/display_rotation_default_handler_browsertest.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h"
diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h index c356a8b..6cc00e1 100644 --- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h +++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/policy/enterprise_install_attributes.cc b/chrome/browser/chromeos/policy/enterprise_install_attributes.cc index 5e0db82d..26454110 100644 --- a/chrome/browser/chromeos/policy/enterprise_install_attributes.cc +++ b/chrome/browser/chromeos/policy/enterprise_install_attributes.cc
@@ -4,12 +4,15 @@ #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" +#include <stddef.h> + #include <utility> #include "base/bind.h" #include "base/files/file_util.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram_base.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/chromeos/policy/enterprise_install_attributes.h b/chrome/browser/chromeos/policy/enterprise_install_attributes.h index 8f1ff2a..e9ca48b 100644 --- a/chrome/browser/chromeos/policy/enterprise_install_attributes.h +++ b/chrome/browser/chromeos/policy/enterprise_install_attributes.h
@@ -8,11 +8,11 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chromeos/dbus/cryptohome_client.h" #include "chromeos/dbus/dbus_method_call_status.h"
diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc b/chrome/browser/chromeos/policy/heartbeat_scheduler.cc index 5bb6bd8f..ff263ed 100644 --- a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc +++ b/chrome/browser/chromeos/policy/heartbeat_scheduler.cc
@@ -10,6 +10,7 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/location.h" +#include "base/macros.h" #include "base/sequenced_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" @@ -44,7 +45,7 @@ const char* kUpstreamNotificationRegIdKey = "registration_id"; // If we get an error registering with GCM, try again in two minutes. -const int64 kRegistrationRetryDelayMs = 2 * 60 * 1000; +const int64_t kRegistrationRetryDelayMs = 2 * 60 * 1000; const char* kHeartbeatSchedulerScope = "policy.heartbeat_scheduler.upstream_notification"; @@ -64,8 +65,8 @@ namespace policy { -const int64 HeartbeatScheduler::kDefaultHeartbeatIntervalMs = - 2 * 60 * 1000; // 2 minutes +const int64_t HeartbeatScheduler::kDefaultHeartbeatIntervalMs = + 2 * 60 * 1000; // 2 minutes // Helper class used to manage GCM registration (handles retrying after // errors, etc).
diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler.h b/chrome/browser/chromeos/policy/heartbeat_scheduler.h index 1b46709..a447850 100644 --- a/chrome/browser/chromeos/policy/heartbeat_scheduler.h +++ b/chrome/browser/chromeos/policy/heartbeat_scheduler.h
@@ -5,9 +5,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_HEARTBEAT_SCHEDULER_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_HEARTBEAT_SCHEDULER_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/cancelable_callback.h" #include "base/macros.h" #include "base/memory/ref_counted.h" @@ -38,7 +39,7 @@ gcm::GCMConnectionObserver { public: // Default interval for how often we send up a heartbeat. - static const int64 kDefaultHeartbeatIntervalMs; + static const int64_t kDefaultHeartbeatIntervalMs; // Constructor. |cloud_policy_client| will be used to send registered GCM id // to DM server, and can be null. |driver| can be null for tests.
diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc b/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc index d08077a..56ffc94 100644 --- a/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc +++ b/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/policy/heartbeat_scheduler.h" +#include <stdint.h> + #include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/test/test_simple_task_runner.h" @@ -298,7 +300,7 @@ // Check the values in the message payload. EXPECT_EQ("hb", message.data["type"]); - int64 timestamp; + int64_t timestamp; EXPECT_TRUE(base::StringToInt64(message.data["timestamp"], ×tamp)); EXPECT_EQ(kFakeEnrollmentDomain, message.data["domain_name"]); EXPECT_EQ(kFakeDeviceId, message.data["device_id"]);
diff --git a/chrome/browser/chromeos/policy/login_profile_policy_provider.h b/chrome/browser/chromeos/policy/login_profile_policy_provider.h index 77e89532..8098052 100644 --- a/chrome/browser/chromeos/policy/login_profile_policy_provider.h +++ b/chrome/browser/chromeos/policy/login_profile_policy_provider.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_LOGIN_PROFILE_POLICY_PROVIDER_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_LOGIN_PROFILE_POLICY_PROVIDER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "components/policy/core/common/configuration_policy_provider.h" #include "components/policy/core/common/policy_service.h"
diff --git a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc index b62786c..4ced80c1 100644 --- a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc +++ b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc
@@ -4,12 +4,12 @@ #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/location.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater.h b/chrome/browser/chromeos/policy/network_configuration_updater.h index 7f453ea..564d362 100644 --- a/chrome/browser/chromeos/policy/network_configuration_updater.h +++ b/chrome/browser/chromeos/policy/network_configuration_updater.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/onc/onc_constants.h" #include "components/policy/core/common/policy_service.h"
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc index 45367bdf..1f2ffd3 100644 --- a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc +++ b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc
@@ -2,10 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/policy/policy_cert_service.h b/chrome/browser/chromeos/policy/policy_cert_service.h index 0220b88..ff6a9ac 100644 --- a/chrome/browser/chromeos/policy/policy_cert_service.h +++ b/chrome/browser/chromeos/policy/policy_cert_service.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/policy/policy_cert_service_factory.h b/chrome/browser/chromeos/policy/policy_cert_service_factory.h index 5d5b74b..f5f01822 100644 --- a/chrome/browser/chromeos/policy/policy_cert_service_factory.h +++ b/chrome/browser/chromeos/policy/policy_cert_service_factory.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/chromeos/policy/policy_cert_verifier.h b/chrome/browser/chromeos/policy/policy_cert_verifier.h index 9511b91..c43601b 100644 --- a/chrome/browser/chromeos/policy/policy_cert_verifier.h +++ b/chrome/browser/chromeos/policy/policy_cert_verifier.h
@@ -7,9 +7,9 @@ #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "net/base/completion_callback.h"
diff --git a/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h b/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h index 5aaa64c2..a0d020b 100644 --- a/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h +++ b/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/chrome/browser/chromeos/policy/power_policy_browsertest.cc index 5b5aee0..4f95ae9 100644 --- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc +++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
@@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h" @@ -13,6 +14,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/location.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/run_loop.h" @@ -208,7 +210,7 @@ base::FilePath user_key_file = user_keys_dir.AppendASCII(sanitized_username) .AppendASCII("policy.pub"); - std::vector<uint8> user_key_bits; + std::vector<uint8_t> user_key_bits; ASSERT_TRUE(user_policy_.GetSigningKey()->ExportPublicKey(&user_key_bits)); ASSERT_TRUE(base::CreateDirectory(user_key_file.DirName())); ASSERT_EQ(base::WriteFile(
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer.h b/chrome/browser/chromeos/policy/recommendation_restorer.h index d3577945f..9cef1d5 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer.h +++ b/chrome/browser/chromeos/policy/recommendation_restorer.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/timer/timer.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_factory.h b/chrome/browser/chromeos/policy/recommendation_restorer_factory.h index a683c4a..1adb31e 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer_factory.h +++ b/chrome/browser/chromeos/policy/recommendation_restorer_factory.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_RECOMMENDATION_RESTORER_FACTORY_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_RECOMMENDATION_RESTORER_FACTORY_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc index bd8c9d2..c096b6a 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc +++ b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/chromeos/policy/recommendation_restorer.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_notifier_impl.h" #include "base/prefs/testing_pref_store.h"
diff --git a/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.cc b/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.cc index 93f24eb..1b1e6998 100644 --- a/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.cc +++ b/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.cc
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h"
diff --git a/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.h b/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.h index 49032be..6cd8d50 100644 --- a/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.h +++ b/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_REMOTE_COMMANDS_DEVICE_COMMAND_SCREENSHOT_JOB_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_REMOTE_COMMANDS_DEVICE_COMMAND_SCREENSHOT_JOB_H_ +#include <stddef.h> + #include <list> #include <map> #include <string>
diff --git a/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job_unittest.cc b/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job_unittest.cc index 8b07687..b0f9075 100644 --- a/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job_unittest.cc +++ b/chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job_unittest.cc
@@ -7,6 +7,7 @@ #include "ash/test/ash_test_base.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/test/test_mock_time_task_runner.h"
diff --git a/chrome/browser/chromeos/policy/status_uploader.cc b/chrome/browser/chromeos/policy/status_uploader.cc index 39c7c72..30fd673a 100644 --- a/chrome/browser/chromeos/policy/status_uploader.cc +++ b/chrome/browser/chromeos/policy/status_uploader.cc
@@ -27,7 +27,7 @@ namespace policy { -const int64 StatusUploader::kDefaultUploadDelayMs = +const int64_t StatusUploader::kDefaultUploadDelayMs = 3 * 60 * 60 * 1000; // 3 hours StatusUploader::StatusUploader(
diff --git a/chrome/browser/chromeos/policy/status_uploader.h b/chrome/browser/chromeos/policy/status_uploader.h index c202f3f5..907b777 100644 --- a/chrome/browser/chromeos/policy/status_uploader.h +++ b/chrome/browser/chromeos/policy/status_uploader.h
@@ -5,7 +5,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_STATUS_UPLOADER_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_STATUS_UPLOADER_H_ +#include <stdint.h> + #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -29,7 +32,7 @@ class StatusUploader : public MediaCaptureDevicesDispatcher::Observer { public: // Refresh constants. - static const int64 kDefaultUploadDelayMs; + static const int64_t kDefaultUploadDelayMs; // Constructor. |client| must be registered and must stay // valid and registered through the lifetime of this StatusUploader
diff --git a/chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h b/chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h index 84b4473..fc418b01 100644 --- a/chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h +++ b/chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h"
diff --git a/chrome/browser/chromeos/policy/system_log_uploader.cc b/chrome/browser/chromeos/policy/system_log_uploader.cc index c1ccf7a..5bea0a9 100644 --- a/chrome/browser/chromeos/policy/system_log_uploader.cc +++ b/chrome/browser/chromeos/policy/system_log_uploader.cc
@@ -7,6 +7,7 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/location.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" @@ -166,12 +167,13 @@ namespace policy { // Determines the time between log uploads. -const int64 SystemLogUploader::kDefaultUploadDelayMs = +const int64_t SystemLogUploader::kDefaultUploadDelayMs = 12 * 60 * 60 * 1000; // 12 hours // Determines the time, measured from the time of last failed upload, // after which the log upload is retried. -const int64 SystemLogUploader::kErrorUploadDelayMs = 120 * 1000; // 120 seconds +const int64_t SystemLogUploader::kErrorUploadDelayMs = + 120 * 1000; // 120 seconds // String constant identifying the header field which stores the file type. const char* const SystemLogUploader::kFileTypeHeaderName = "File-Type";
diff --git a/chrome/browser/chromeos/policy/system_log_uploader.h b/chrome/browser/chromeos/policy/system_log_uploader.h index ead2eba..5a3d624 100644 --- a/chrome/browser/chromeos/policy/system_log_uploader.h +++ b/chrome/browser/chromeos/policy/system_log_uploader.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_SYSTEM_LOG_UPLOADER_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_SYSTEM_LOG_UPLOADER_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" @@ -30,8 +32,8 @@ typedef std::vector<std::pair<std::string, std::string>> SystemLogs; // Refresh constants. - static const int64 kDefaultUploadDelayMs; - static const int64 kErrorUploadDelayMs; + static const int64_t kDefaultUploadDelayMs; + static const int64_t kErrorUploadDelayMs; // Http header constants to upload. static const char* const kNameFieldTemplate;
diff --git a/chrome/browser/chromeos/policy/upload_job_impl.cc b/chrome/browser/chromeos/policy/upload_job_impl.cc index 22cbf4d2..0dc3e12 100644 --- a/chrome/browser/chromeos/policy/upload_job_impl.cc +++ b/chrome/browser/chromeos/policy/upload_job_impl.cc
@@ -7,6 +7,7 @@ #include <set> #include "base/logging.h" +#include "base/macros.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" #include "google_apis/gaia/gaia_constants.h"
diff --git a/chrome/browser/chromeos/policy/upload_job_impl.h b/chrome/browser/chromeos/policy/upload_job_impl.h index ea94e58..958eef3 100644 --- a/chrome/browser/chromeos/policy/upload_job_impl.h +++ b/chrome/browser/chromeos/policy/upload_job_impl.h
@@ -5,10 +5,11 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_UPLOAD_JOB_IMPL_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_UPLOAD_JOB_IMPL_H_ +#include <stddef.h> + #include <map> #include <string> -#include "base/basictypes.h" #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h"
diff --git a/chrome/browser/chromeos/policy/upload_job_unittest.cc b/chrome/browser/chromeos/policy/upload_job_unittest.cc index fffbabe2..f98efaed 100644 --- a/chrome/browser/chromeos/policy/upload_job_unittest.cc +++ b/chrome/browser/chromeos/policy/upload_job_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/policy/upload_job.h" +#include <stddef.h> + #include <queue> #include <set> #include <utility> @@ -11,6 +13,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h"
diff --git a/chrome/browser/chromeos/policy/user_affiliation_browsertest.cc b/chrome/browser/chromeos/policy/user_affiliation_browsertest.cc index 8c9e368..c2a3000 100644 --- a/chrome/browser/chromeos/policy/user_affiliation_browsertest.cc +++ b/chrome/browser/chromeos/policy/user_affiliation_browsertest.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 "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/policy/affiliation_test_helper.h" #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
diff --git a/chrome/browser/chromeos/policy/user_cloud_external_data_manager.h b/chrome/browser/chromeos/policy/user_cloud_external_data_manager.h index b7dfa0f..94c8ce0d 100644 --- a/chrome/browser/chromeos/policy/user_cloud_external_data_manager.h +++ b/chrome/browser/chromeos/policy/user_cloud_external_data_manager.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_EXTERNAL_DATA_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_EXTERNAL_DATA_MANAGER_H_ -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base.h" #include "components/policy/core/common/policy_details.h"
diff --git a/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc b/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc index 1d917ae..2dbddc8 100644 --- a/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc +++ b/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc
@@ -12,6 +12,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base.h" #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h" #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h index e7001e54..a0eb497 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc index 41df898..70c5a429 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/testing_pref_service.h"
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h index d018515..4929da2b 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_base_factory.h"
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc index 43b7289..b4db86e 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc
@@ -4,12 +4,15 @@ #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" #include "base/files/file_util.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/sequenced_task_runner.h" #include "base/stl_util.h"
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h index 9d7a2cd..edf34d89 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc index 7bd03e3..0d32195d4 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc
@@ -4,12 +4,14 @@ #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h" +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/threading/sequenced_worker_pool.h" @@ -72,7 +74,7 @@ // Install the initial public key, so that by default the validation of // the stored/loaded policy blob succeeds. - std::vector<uint8> public_key; + std::vector<uint8_t> public_key; ASSERT_TRUE(policy_.GetSigningKey()->ExportPublicKey(&public_key)); StoreUserPolicyKey(public_key); @@ -122,7 +124,7 @@ EXPECT_TRUE(base::StringValue(expected_value).Equals(entry->value)); } - void StoreUserPolicyKey(const std::vector<uint8>& public_key) { + void StoreUserPolicyKey(const std::vector<uint8_t>& public_key) { ASSERT_TRUE(base::CreateDirectory(user_policy_key_file().DirName())); ASSERT_TRUE( base::WriteFile(user_policy_key_file(), @@ -137,7 +139,7 @@ // value will be expected; otherwise no previous policy is expected. // If |new_value| is set then a new policy with that value is expected after // storing the |policy_| blob. - void PerformStorePolicy(const std::vector<uint8>* new_public_key, + void PerformStorePolicy(const std::vector<uint8_t>* new_public_key, const char* previous_value, const char* new_value) { chromeos::SessionManagerClient::StorePolicyCallback store_callback; @@ -238,7 +240,7 @@ // Make the policy blob contain a new public key. policy_.SetDefaultNewSigningKey(); policy_.Build(); - std::vector<uint8> new_public_key; + std::vector<uint8_t> new_public_key; ASSERT_TRUE(policy_.GetNewSigningKey()->ExportPublicKey(&new_public_key)); ASSERT_NO_FATAL_FAILURE( PerformStorePolicy(&new_public_key, NULL, kDefaultHomepage)); @@ -285,7 +287,7 @@ // Make the policy blob contain a new public key. policy_.SetDefaultNewSigningKey(); policy_.Build(); - std::vector<uint8> new_public_key; + std::vector<uint8_t> new_public_key; ASSERT_TRUE(policy_.GetNewSigningKey()->ExportPublicKey(&new_public_key)); ASSERT_NO_FATAL_FAILURE( PerformStorePolicy(&new_public_key, NULL, kDefaultHomepage)); @@ -565,7 +567,7 @@ policy_.payload().mutable_homepagelocation()->set_value(kNewHomepage); policy_.SetDefaultNewSigningKey(); policy_.Build(); - std::vector<uint8> new_public_key; + std::vector<uint8_t> new_public_key; ASSERT_TRUE(policy_.GetNewSigningKey()->ExportPublicKey(&new_public_key)); ASSERT_NO_FATAL_FAILURE( PerformStorePolicy(&new_public_key, kDefaultHomepage, kNewHomepage));
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h index 0d9ad42..c3a75d5 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_TOKEN_FORWARDER_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_TOKEN_FORWARDER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "components/keyed_service/core/keyed_service.h" #include "components/policy/core/common/cloud/cloud_policy_service.h" #include "google_apis/gaia/oauth2_token_service.h"
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h index 53f5d8b..44ecf59 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_TOKEN_FORWARDER_FACTORY_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_TOKEN_FORWARDER_FACTORY_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater.h b/chrome/browser/chromeos/policy/user_network_configuration_updater.h index d3db409..e5bb775f 100644 --- a/chrome/browser/chromeos/policy/user_network_configuration_updater.h +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h index d91dcab..fea07f7 100644 --- a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_USER_NETWORK_CONFIGURATION_UPDATER_FACTORY_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_USER_NETWORK_CONFIGURATION_UPDATER_FACTORY_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" namespace base {
diff --git a/chrome/browser/chromeos/policy/user_policy_disk_cache.h b/chrome/browser/chromeos/policy/user_policy_disk_cache.h index b22ad90a..6588ea5 100644 --- a/chrome/browser/chromeos/policy/user_policy_disk_cache.h +++ b/chrome/browser/chromeos/policy/user_policy_disk_cache.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_USER_POLICY_DISK_CACHE_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_USER_POLICY_DISK_CACHE_H_ -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/policy/user_policy_token_loader.h b/chrome/browser/chromeos/policy/user_policy_token_loader.h index 919e4ae..731435fa 100644 --- a/chrome/browser/chromeos/policy/user_policy_token_loader.h +++ b/chrome/browser/chromeos/policy/user_policy_token_loader.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc b/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc index 9969b9b..c2fb056 100644 --- a/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc +++ b/chrome/browser/chromeos/policy/variations_service_policy_browsertest.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 "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/policy/wildcard_login_checker.h b/chrome/browser/chromeos/policy/wildcard_login_checker.h index 2d2b346..e4f9d118 100644 --- a/chrome/browser/chromeos/policy/wildcard_login_checker.h +++ b/chrome/browser/chromeos/policy/wildcard_login_checker.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_WILDCARD_LOGIN_CHECKER_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_WILDCARD_LOGIN_CHECKER_H_ -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "components/policy/core/common/cloud/user_info_fetcher.h"
diff --git a/chrome/browser/chromeos/power/cpu_data_collector.cc b/chrome/browser/chromeos/power/cpu_data_collector.cc index 21c65fa4..94fec3195 100644 --- a/chrome/browser/chromeos/power/cpu_data_collector.cc +++ b/chrome/browser/chromeos/power/cpu_data_collector.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/power/cpu_data_collector.h" +#include <stddef.h> + #include <vector> #include "base/bind.h" @@ -146,7 +148,7 @@ DCHECK(base::PathExists(base::FilePath(time_file_path))); std::string state_name, occupancy_time_string; - int64 occupancy_time_usec; + int64_t occupancy_time_usec; if (!base::ReadFileToString(base::FilePath(name_file_path), &state_name) || !base::ReadFileToString(base::FilePath(time_file_path), @@ -165,7 +167,7 @@ &occupancy_time_string); if (base::StringToInt64(occupancy_time_string, &occupancy_time_usec)) { // idle state occupancy time in sysfs is recorded in microseconds. - int64 time_in_state_ms = occupancy_time_usec / 1000; + int64_t time_in_state_ms = occupancy_time_usec / 1000; size_t index = IndexInVector(state_name, cpu_idle_state_names); if (index >= idle_sample.time_in_state.size()) idle_sample.time_in_state.resize(index + 1); @@ -184,7 +186,7 @@ // If there was an interruption in sampling (like system suspended), // discard the samples! - int64 delay = + int64_t delay = base::TimeDelta(base::Time::Now() - start_time).InMilliseconds(); if (delay > kSamplingDurationLimitMs) { idle_samples->clear(); @@ -216,7 +218,7 @@ state_count -= 1; for (size_t state = 0; state < state_count; ++state) { int freq_in_khz; - int64 occupancy_time_centisecond; + int64_t occupancy_time_centisecond; // Occupancy of each state is in the format "<state> <time>" std::vector<base::StringPiece> pair = base::SplitStringPiece( @@ -286,7 +288,7 @@ // If there was an interruption in sampling (like system suspended), // discard the samples! - int64 delay = + int64_t delay = base::TimeDelta(base::Time::Now() - start_time).InMilliseconds(); if (delay > kSamplingDurationLimitMs) { freq_samples->clear();
diff --git a/chrome/browser/chromeos/power/cpu_data_collector.h b/chrome/browser/chromeos/power/cpu_data_collector.h index 59ad804..f4213a56 100644 --- a/chrome/browser/chromeos/power/cpu_data_collector.h +++ b/chrome/browser/chromeos/power/cpu_data_collector.h
@@ -5,12 +5,14 @@ #ifndef CHROME_BROWSER_CHROMEOS_POWER_CPU_DATA_COLLECTOR_H_ #define CHROME_BROWSER_CHROMEOS_POWER_CPU_DATA_COLLECTOR_H_ +#include <stdint.h> + #include <deque> #include <map> #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h" @@ -40,7 +42,7 @@ // is the name at index i in the vector returned by cpu_idle_state_names(). // Similarly, for freq state occupancy, similar information is in the vector // returned by cpu_freq_state_names(). - std::vector<int64> time_in_state; + std::vector<int64_t> time_in_state; }; typedef std::deque<StateOccupancySample> StateOccupancySampleDeque;
diff --git a/chrome/browser/chromeos/power/extension_event_observer.cc b/chrome/browser/chromeos/power/extension_event_observer.cc index c986ef8..3bc7964 100644 --- a/chrome/browser/chromeos/power/extension_event_observer.cc +++ b/chrome/browser/chromeos/power/extension_event_observer.cc
@@ -55,7 +55,7 @@ struct ExtensionEventObserver::KeepaliveSources { std::set<int> unacked_push_messages; - std::set<uint64> pending_network_requests; + std::set<uint64_t> pending_network_requests; }; ExtensionEventObserver::ExtensionEventObserver() @@ -174,7 +174,7 @@ void ExtensionEventObserver::OnNetworkRequestStarted( const extensions::ExtensionHost* host, - uint64 request_id) { + uint64_t request_id) { DCHECK(keepalive_sources_.contains(host)); KeepaliveSources* sources = keepalive_sources_.get(host); @@ -191,7 +191,7 @@ void ExtensionEventObserver::OnNetworkRequestDone( const extensions::ExtensionHost* host, - uint64 request_id) { + uint64_t request_id) { DCHECK(keepalive_sources_.contains(host)); if (keepalive_sources_.get(host)->pending_network_requests.erase(request_id) >
diff --git a/chrome/browser/chromeos/power/extension_event_observer.h b/chrome/browser/chromeos/power/extension_event_observer.h index b576992a..0df6463f 100644 --- a/chrome/browser/chromeos/power/extension_event_observer.h +++ b/chrome/browser/chromeos/power/extension_event_observer.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POWER_EXTENSION_EVENT_OBSERVER_H_ #define CHROME_BROWSER_CHROMEOS_POWER_EXTENSION_EVENT_OBSERVER_H_ +#include <stdint.h> + #include <set> #include <string> @@ -88,9 +90,9 @@ void OnBackgroundEventAcked(const extensions::ExtensionHost* host, int event_id) override; void OnNetworkRequestStarted(const extensions::ExtensionHost* host, - uint64 request_id) override; + uint64_t request_id) override; void OnNetworkRequestDone(const extensions::ExtensionHost* host, - uint64 request_id) override; + uint64_t request_id) override; // PowerManagerClient::Observer overrides. void SuspendImminent() override;
diff --git a/chrome/browser/chromeos/power/extension_event_observer_unittest.cc b/chrome/browser/chromeos/power/extension_event_observer_unittest.cc index 07592af..4557fa0 100644 --- a/chrome/browser/chromeos/power/extension_event_observer_unittest.cc +++ b/chrome/browser/chromeos/power/extension_event_observer_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/power/extension_event_observer.h" +#include <stdint.h> + #include <string> #include "base/macros.h" @@ -244,7 +246,7 @@ // Test that network requests started while there is no pending push message // are ignored. - const uint64 kNonPushRequestId = 5170725; + const uint64_t kNonPushRequestId = 5170725; extension_event_observer_->OnNetworkRequestStarted(host, kNonPushRequestId); power_manager_client_->SendSuspendImminent(); @@ -254,7 +256,7 @@ // Test that network requests started while a push message is pending delay // the suspend even after the push message has been acked. const int kPushMessageId = 178674; - const uint64 kNetworkRequestId = 78917089; + const uint64_t kNetworkRequestId = 78917089; power_manager_client_->SendDarkSuspendImminent(); extension_event_observer_->OnBackgroundEventDispatched( host, extensions::api::gcm::OnMessage::kEventName, kPushMessageId); @@ -286,7 +288,7 @@ EXPECT_TRUE(test_api_->WillDelaySuspendForExtensionHost(host)); const int kPushId = 156178; - const uint64 kNetworkId = 791605; + const uint64_t kNetworkId = 791605; extension_event_observer_->OnBackgroundEventDispatched( host, extensions::api::gcm::OnMessage::kEventName, kPushId); extension_event_observer_->OnNetworkRequestStarted(host, kNetworkId);
diff --git a/chrome/browser/chromeos/power/freezer_cgroup_process_manager.cc b/chrome/browser/chromeos/power/freezer_cgroup_process_manager.cc index aa412a9..e11155a4 100644 --- a/chrome/browser/chromeos/power/freezer_cgroup_process_manager.cc +++ b/chrome/browser/chromeos/power/freezer_cgroup_process_manager.cc
@@ -10,6 +10,7 @@ #include "base/bind_helpers.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/sequenced_task_runner.h" #include "base/strings/string_number_conversions.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc index c09036b..d85cc44 100644 --- a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc +++ b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc
@@ -8,6 +8,7 @@ #include "ash/shell.h" #include "base/location.h" +#include "base/macros.h" #include "chrome/grit/generated_resources.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.h b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.h index 52e2daf2..e9a7305 100644 --- a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.h +++ b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POWER_IDLE_ACTION_WARNING_DIALOG_VIEW_H_ #define CHROME_BROWSER_CHROMEOS_POWER_IDLE_ACTION_WARNING_DIALOG_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/chromeos/power/idle_action_warning_observer.h b/chrome/browser/chromeos/power/idle_action_warning_observer.h index 79ff07d..f98ea71 100644 --- a/chrome/browser/chromeos/power/idle_action_warning_observer.h +++ b/chrome/browser/chromeos/power/idle_action_warning_observer.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POWER_IDLE_ACTION_WARNING_OBSERVER_H_ #define CHROME_BROWSER_CHROMEOS_POWER_IDLE_ACTION_WARNING_OBSERVER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chromeos/dbus/power_manager_client.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer.cc b/chrome/browser/chromeos/power/peripheral_battery_observer.cc index 6f2e927b..ff1c57b 100644 --- a/chrome/browser/chromeos/power/peripheral_battery_observer.cc +++ b/chrome/browser/chromeos/power/peripheral_battery_observer.cc
@@ -9,6 +9,7 @@ #include "ash/shell.h" #include "ash/strings/grit/ash_strings.h" #include "base/bind.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer.h b/chrome/browser/chromeos/power/peripheral_battery_observer.h index 947e029..2f2fa57 100644 --- a/chrome/browser/chromeos/power/peripheral_battery_observer.h +++ b/chrome/browser/chromeos/power/peripheral_battery_observer.h
@@ -7,9 +7,9 @@ #include <map> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/test/simple_test_tick_clock.h" #include "chromeos/dbus/power_manager_client.h"
diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc index 8c08e0d1..4ce7322 100644 --- a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc +++ b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/notifications/notification_ui_manager.h"
diff --git a/chrome/browser/chromeos/power/power_button_observer.h b/chrome/browser/chromeos/power/power_button_observer.h index ac35e6b..06414db1 100644 --- a/chrome/browser/chromeos/power/power_button_observer.h +++ b/chrome/browser/chromeos/power/power_button_observer.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POWER_POWER_BUTTON_OBSERVER_H_ #define CHROME_BROWSER_CHROMEOS_POWER_POWER_BUTTON_OBSERVER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chromeos/dbus/power_manager_client.h" #include "chromeos/dbus/session_manager_client.h" #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/chromeos/power/power_data_collector.h b/chrome/browser/chromeos/power/power_data_collector.h index 6e95b007..91eeca6 100644 --- a/chrome/browser/chromeos/power/power_data_collector.h +++ b/chrome/browser/chromeos/power/power_data_collector.h
@@ -7,8 +7,8 @@ #include <deque> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "chrome/browser/chromeos/power/cpu_data_collector.h" #include "chromeos/chromeos_export.h"
diff --git a/chrome/browser/chromeos/power/power_data_collector_unittest.cc b/chrome/browser/chromeos/power/power_data_collector_unittest.cc index c5465dd..18cd169 100644 --- a/chrome/browser/chromeos/power/power_data_collector_unittest.cc +++ b/chrome/browser/chromeos/power/power_data_collector_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "chrome/browser/chromeos/power/power_data_collector.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager/power_supply_properties.pb.h" @@ -57,13 +60,13 @@ const std::deque<PowerDataCollector::SystemResumedSample>& data1 = power_data_collector_->system_resumed_data(); ASSERT_EQ(static_cast<size_t>(1), data1.size()); - ASSERT_EQ(static_cast<int64>(10), data1[0].sleep_duration.InSeconds()); + ASSERT_EQ(static_cast<int64_t>(10), data1[0].sleep_duration.InSeconds()); power_data_collector_->SuspendDone(base::TimeDelta::FromSeconds(20)); const std::deque<PowerDataCollector::SystemResumedSample>& data2 = power_data_collector_->system_resumed_data(); ASSERT_EQ(static_cast<size_t>(2), data2.size()); - ASSERT_EQ(static_cast<int64>(20), data2[1].sleep_duration.InSeconds()); + ASSERT_EQ(static_cast<int64_t>(20), data2[1].sleep_duration.InSeconds()); } TEST_F(PowerDataCollectorTest, AddSample) {
diff --git a/chrome/browser/chromeos/power/power_prefs.h b/chrome/browser/chromeos/power/power_prefs.h index 4fce494d..3f576ab4 100644 --- a/chrome/browser/chromeos/power/power_prefs.h +++ b/chrome/browser/chromeos/power/power_prefs.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_POWER_POWER_PREFS_H_ #define CHROME_BROWSER_CHROMEOS_POWER_POWER_PREFS_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/chromeos/power/power_prefs_unittest.cc b/chrome/browser/chromeos/power/power_prefs_unittest.cc index 194e4698..1f0e5f4 100644 --- a/chrome/browser/chromeos/power/power_prefs_unittest.cc +++ b/chrome/browser/chromeos/power/power_prefs_unittest.cc
@@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_service.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/chromeos/power/renderer_freezer_unittest.cc b/chrome/browser/chromeos/power/renderer_freezer_unittest.cc index 1671511..28316573 100644 --- a/chrome/browser/chromeos/power/renderer_freezer_unittest.cc +++ b/chrome/browser/chromeos/power/renderer_freezer_unittest.cc
@@ -8,6 +8,7 @@ #include <utility> #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h b/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h index 2f8a9eaf..1613e6f 100644 --- a/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h +++ b/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h
@@ -6,8 +6,8 @@ #define CHROME_BROWSER_CHROMEOS_POWER_SESSION_STATE_CONTROLLER_DELEGATE_CHROMEOS_H_ #include "ash/wm/lock_state_controller.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h index 0c983d4..b9aed56 100644 --- a/chrome/browser/chromeos/preferences.h +++ b/chrome/browser/chromeos/preferences.h
@@ -9,6 +9,7 @@ #include "ash/shell_observer.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_member.h" #include "chrome/browser/chromeos/language_preferences.h"
diff --git a/chrome/browser/chromeos/preferences_chromeos_browsertest.cc b/chrome/browser/chromeos/preferences_chromeos_browsertest.cc index afbd9f5e..2958ceb9 100644 --- a/chrome/browser/chromeos/preferences_chromeos_browsertest.cc +++ b/chrome/browser/chromeos/preferences_chromeos_browsertest.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 <stddef.h> #include <sys/types.h> #include "ash/shell.h"
diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc index af11c91..2e4b1cbf 100644 --- a/chrome/browser/chromeos/preferences_unittest.cc +++ b/chrome/browser/chromeos/preferences_unittest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/preferences.h" #include "base/json/json_string_value_serializer.h" +#include "base/macros.h" #include "base/prefs/pref_member.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/chromeos/printer_detector/printer_detector.cc b/chrome/browser/chromeos/printer_detector/printer_detector.cc index e37f48e..f3652355 100644 --- a/chrome/browser/chromeos/printer_detector/printer_detector.cc +++ b/chrome/browser/chromeos/printer_detector/printer_detector.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" @@ -53,7 +54,7 @@ // Base class used for printer USB interfaces // (https://www.usb.org/developers/defined_class). -const uint8 kPrinterInterfaceClass = 7; +const uint8_t kPrinterInterfaceClass = 7; enum PrinterServiceEvent { PRINTER_ADDED, @@ -64,7 +65,7 @@ PRINTER_SERVICE_EVENT_MAX, }; -base::string16 GetNotificationTitle(uint16 vendor_id, uint16 product_id) { +base::string16 GetNotificationTitle(uint16_t vendor_id, uint16_t product_id) { const char* vendor_name = device::UsbIds::GetVendorName(vendor_id); if (vendor_name) { return l10n_util::GetStringFUTF16(IDS_PRINTER_DETECTED_NOTIFICATION_TITLE, @@ -142,9 +143,9 @@ class SearchPrinterAppNotificationDelegate : public NotificationDelegate { public: SearchPrinterAppNotificationDelegate(content::BrowserContext* browser_context, - uint16 vendor_id, + uint16_t vendor_id, const std::string& vendor_id_str, - uint16 product_id, + uint16_t product_id, const std::string& product_id_str) : browser_context_(browser_context), vendor_id_(vendor_id), @@ -182,9 +183,9 @@ ~SearchPrinterAppNotificationDelegate() override = default; content::BrowserContext* browser_context_; - uint16 vendor_id_; + uint16_t vendor_id_; std::string vendor_id_str_; - uint16 product_id_; + uint16_t product_id_; std::string product_id_str_; DISALLOW_COPY_AND_ASSIGN(SearchPrinterAppNotificationDelegate);
diff --git a/chrome/browser/chromeos/printer_detector/printer_detector.h b/chrome/browser/chromeos/printer_detector/printer_detector.h index 9f99b98..77baf302 100644 --- a/chrome/browser/chromeos/printer_detector/printer_detector.h +++ b/chrome/browser/chromeos/printer_detector/printer_detector.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc b/chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc index f1ba6c6..42c76cbd 100644 --- a/chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc +++ b/chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/chromeos/printer_detector/printer_detector.h" +#include <stdint.h> + #include <utility> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" @@ -37,7 +40,7 @@ namespace { -const uint8 kPrinterInterfaceClass = 7; +const uint8_t kPrinterInterfaceClass = 7; const char kTestUserId[] = "test_user"; @@ -115,9 +118,9 @@ ->SetNotificationUIManagerForTesting(¬ification_ui_manager_); } - void InvokeUsbAdded(uint16 vendor_id, - uint16 product_id, - uint8 interface_class) { + void InvokeUsbAdded(uint16_t vendor_id, + uint16_t product_id, + uint8_t interface_class) { device::UsbInterfaceDescriptor interface; interface.interface_number = 1; interface.interface_class = interface_class;
diff --git a/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.h b/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.h index 75420f8..9311c47 100644 --- a/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.h +++ b/chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.h
@@ -7,8 +7,12 @@ #include "chrome/browser/profiles/avatar_menu_actions.h" +#include <stddef.h> + #include <string> +#include "base/macros.h" + class Browser; namespace chromeos {
diff --git a/chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.cc b/chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.cc index 4d141da..c4287399 100644 --- a/chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.cc +++ b/chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h" #include "ash/shell.h" +#include "base/macros.h" #include "chrome/grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc b/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc index 64cc35b..93edf23b 100644 --- a/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc +++ b/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.h" #include "ash/shell.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/chromeos/profiles/profile_helper.h b/chrome/browser/chromeos/profiles/profile_helper.h index f0b5a36e..c0f8d34 100644 --- a/chrome/browser/chromeos/profiles/profile_helper.h +++ b/chrome/browser/chromeos/profiles/profile_helper.h
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos.h b/chrome/browser/chromeos/profiles/profile_list_chromeos.h index 65e3bd7..e7854eb 100644 --- a/chrome/browser/chromeos/profiles/profile_list_chromeos.h +++ b/chrome/browser/chromeos/profiles/profile_list_chromeos.h
@@ -7,8 +7,12 @@ #include "chrome/browser/profiles/profile_list.h" +#include <stddef.h> + #include <vector> +#include "base/macros.h" + class ProfileInfoInterface; namespace chromeos {
diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc index c5c751ae..41350f5c 100644 --- a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc +++ b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
@@ -6,6 +6,7 @@ #include "ash/ash_switches.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h index da24d8a..3276fc6 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.h +++ b/chrome/browser/chromeos/proxy_config_service_impl.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "chromeos/network/network_state_handler_observer.h" #include "components/onc/onc_constants.h"
diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc index 8d2ac89..0919fa5 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
@@ -4,11 +4,14 @@ #include "chrome/browser/chromeos/proxy_config_service_impl.h" +#include <stddef.h> + #include <vector> #include "base/format_macros.h" #include "base/json/json_writer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/prefs/testing_pref_service.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/chromeos/proxy_cros_settings_parser.cc b/chrome/browser/chromeos/proxy_cros_settings_parser.cc index fbf315b40..1f75521 100644 --- a/chrome/browser/chromeos/proxy_cros_settings_parser.cc +++ b/chrome/browser/chromeos/proxy_cros_settings_parser.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/values.h" #include "chrome/browser/chromeos/ui_proxy_config.h" @@ -68,11 +71,11 @@ } net::ProxyServer CreateProxyServer(std::string host, - uint16 port, + uint16_t port, net::ProxyServer::Scheme scheme) { if (host.empty() && port == 0) return net::ProxyServer(); - uint16 default_port = net::ProxyServer::GetDefaultPortForScheme(scheme); + uint16_t default_port = net::ProxyServer::GetDefaultPortForScheme(scheme); net::HostPortPair host_port_pair; // Check if host is a valid URL or a string of valid format <server>::<port>. GURL url(host); @@ -91,14 +94,14 @@ const std::string& host, const UIProxyConfig::ManualProxy& proxy, net::ProxyServer::Scheme scheme) { - uint16 port = 0; + uint16_t port = 0; if (proxy.server.is_valid()) port = proxy.server.host_port_pair().port(); return CreateProxyServer(host, port, scheme); } net::ProxyServer CreateProxyServerFromPort( - uint16 port, + uint16_t port, const UIProxyConfig::ManualProxy& proxy, net::ProxyServer::Scheme scheme) { std::string host;
diff --git a/chrome/browser/chromeos/proxy_cros_settings_parser.h b/chrome/browser/chromeos/proxy_cros_settings_parser.h index 7c81fcc..57848c4 100644 --- a/chrome/browser/chromeos/proxy_cros_settings_parser.h +++ b/chrome/browser/chromeos/proxy_cros_settings_parser.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PARSER_H_ #define CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PARSER_H_ +#include <stddef.h> + #include <string> namespace base {
diff --git a/chrome/browser/chromeos/resource_reporter/resource_reporter.h b/chrome/browser/chromeos/resource_reporter/resource_reporter.h index d4c8975..d238b5a 100644 --- a/chrome/browser/chromeos/resource_reporter/resource_reporter.h +++ b/chrome/browser/chromeos/resource_reporter/resource_reporter.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_CHROMEOS_RESOURCE_REPORTER_RESOURCE_REPORTER_H_ #define CHROME_BROWSER_CHROMEOS_RESOURCE_REPORTER_RESOURCE_REPORTER_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <string> #include <vector>
diff --git a/chrome/browser/chromeos/resource_reporter/resource_reporter_unittest.cc b/chrome/browser/chromeos/resource_reporter/resource_reporter_unittest.cc index 530dbe0..469dffd8 100644 --- a/chrome/browser/chromeos/resource_reporter/resource_reporter_unittest.cc +++ b/chrome/browser/chromeos/resource_reporter/resource_reporter_unittest.cc
@@ -2,11 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <limits> #include <map> #include <string> #include <vector> +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/timer/mock_timer.h" #include "chrome/browser/chromeos/resource_reporter/resource_reporter.h" @@ -71,7 +75,7 @@ double GetCpuUsage(TaskId task_id) const override { return tasks_.at(task_id)->cpu_percent; } - int64 GetPhysicalMemoryUsage(TaskId task_id) const override { + int64_t GetPhysicalMemoryUsage(TaskId task_id) const override { return tasks_.at(task_id)->memory_bytes; } const std::string& GetTaskNameForRappor(TaskId task_id) const override {
diff --git a/chrome/browser/chromeos/session_length_limiter.cc b/chrome/browser/chromeos/session_length_limiter.cc index 7bc17ad..c3f2f740 100644 --- a/chrome/browser/chromeos/session_length_limiter.cc +++ b/chrome/browser/chromeos/session_length_limiter.cc
@@ -10,6 +10,7 @@ #include "base/bind_helpers.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/session_length_limiter.h b/chrome/browser/chromeos/session_length_limiter.h index 46a2765..226932e0 100644 --- a/chrome/browser/chromeos/session_length_limiter.h +++ b/chrome/browser/chromeos/session_length_limiter.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_SESSION_LENGTH_LIMITER_H_ #define CHROME_BROWSER_CHROMEOS_SESSION_LENGTH_LIMITER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/threading/thread_checker.h"
diff --git a/chrome/browser/chromeos/set_time_dialog.h b/chrome/browser/chromeos/set_time_dialog.h index 2862b8fb..e0970b7 100644 --- a/chrome/browser/chromeos/set_time_dialog.h +++ b/chrome/browser/chromeos/set_time_dialog.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/values.h" #include "ui/gfx/native_widget_types.h" #include "ui/web_dialogs/web_dialog_delegate.h"
diff --git a/chrome/browser/chromeos/settings/cros_settings.cc b/chrome/browser/chromeos/settings/cros_settings.cc index 76cc290..0e3c7ea0 100644 --- a/chrome/browser/chromeos/settings/cros_settings.cc +++ b/chrome/browser/chromeos/settings/cros_settings.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/settings/cros_settings.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h"
diff --git a/chrome/browser/chromeos/settings/cros_settings.h b/chrome/browser/chromeos/settings/cros_settings.h index 366e15c..569eb3f 100644 --- a/chrome/browser/chromeos/settings/cros_settings.h +++ b/chrome/browser/chromeos/settings/cros_settings.h
@@ -11,6 +11,7 @@ #include "base/callback_forward.h" #include "base/callback_list.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "chromeos/settings/cros_settings_names.h"
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service.h b/chrome/browser/chromeos/settings/device_oauth2_token_service.h index b763daf..d3182eaf 100644 --- a/chrome/browser/chromeos/settings/device_oauth2_token_service.h +++ b/chrome/browser/chromeos/settings/device_oauth2_token_service.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h" #include "google_apis/gaia/oauth2_token_service.h" #include "net/url_request/url_request_context_getter.h"
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h b/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h index 7a8bd6b7..011c19f 100644 --- a/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h +++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/stl_util.h"
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h b/chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h index ccb370b..11bce88 100644 --- a/chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h +++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h
@@ -8,7 +8,7 @@ #include <queue> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc b/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc index 84607588..21e7019 100644 --- a/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc +++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" +#include <stdint.h> + #include "base/message_loop/message_loop.h" #include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" @@ -76,7 +78,7 @@ } void SetUpWithPendingSalt() { - fake_cryptohome_client_->set_system_salt(std::vector<uint8>()); + fake_cryptohome_client_->set_system_salt(std::vector<uint8_t>()); fake_cryptohome_client_->SetServiceIsAvailable(false); SetUpDefaultValues(); } @@ -334,7 +336,7 @@ } TEST_F(DeviceOAuth2TokenServiceTest, RefreshTokenValidation_NoSalt) { - fake_cryptohome_client_->set_system_salt(std::vector<uint8>()); + fake_cryptohome_client_->set_system_salt(std::vector<uint8_t>()); fake_cryptohome_client_->SetServiceIsAvailable(true); SetUpDefaultValues();
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc index c78e9fe..5abbff3 100644 --- a/chrome/browser/chromeos/settings/device_settings_provider.cc +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -4,10 +4,13 @@ #include "chrome/browser/chromeos/settings/device_settings_provider.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.h b/chrome/browser/chromeos/settings/device_settings_provider.h index c5eddfb..5f1e8b4 100644 --- a/chrome/browser/chromeos/settings/device_settings_provider.h +++ b/chrome/browser/chromeos/settings/device_settings_provider.h
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_value_map.h" #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
diff --git a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc index 7315a5d4..052f80b 100644 --- a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc +++ b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/test/scoped_path_override.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/settings/device_settings_service.h b/chrome/browser/chromeos/settings/device_settings_service.h index d15956d..11eca816 100644 --- a/chrome/browser/chromeos/settings/device_settings_service.h +++ b/chrome/browser/chromeos/settings/device_settings_service.h
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h"
diff --git a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc index a2e7b56..b25dbf6 100644 --- a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc +++ b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc
@@ -4,10 +4,12 @@ #include "chrome/browser/chromeos/settings/device_settings_service.h" -#include "base/basictypes.h" +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" @@ -203,7 +205,7 @@ CheckPolicy(); // Check the new key has been loaded. - std::vector<uint8> key; + std::vector<uint8_t> key; ASSERT_TRUE(device_policy_.GetNewSigningKey()->ExportPublicKey(&key)); EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); } @@ -236,7 +238,7 @@ EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); - std::vector<uint8> key; + std::vector<uint8_t> key; ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, @@ -282,7 +284,7 @@ EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); - std::vector<uint8> key; + std::vector<uint8_t> key; ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, @@ -323,7 +325,7 @@ EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); - std::vector<uint8> key; + std::vector<uint8_t> key; ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, @@ -361,7 +363,7 @@ EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey()); ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); - std::vector<uint8> key; + std::vector<uint8_t> key; ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, @@ -402,7 +404,7 @@ EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey()); ASSERT_TRUE(device_settings_service_.GetPublicKey().get()); ASSERT_TRUE(device_settings_service_.GetPublicKey()->is_loaded()); - std::vector<uint8> key; + std::vector<uint8_t> key; ASSERT_TRUE(device_policy_.GetSigningKey()->ExportPublicKey(&key)); EXPECT_EQ(device_settings_service_.GetPublicKey()->data(), key); EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h index b191eb9b..cb36b6a 100644 --- a/chrome/browser/chromeos/settings/device_settings_test_helper.h +++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/chromeos/settings/session_manager_operation.h b/chrome/browser/chromeos/settings/session_manager_operation.h index 6a9af8ed..01c9568 100644 --- a/chrome/browser/chromeos/settings/session_manager_operation.h +++ b/chrome/browser/chromeos/settings/session_manager_operation.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_SESSION_MANAGER_OPERATION_H_ #define CHROME_BROWSER_CHROMEOS_SETTINGS_SESSION_MANAGER_OPERATION_H_ -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/policy/device_cloud_policy_validator.h"
diff --git a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc index 5a63d61e..75884a7 100644 --- a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc +++ b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
@@ -4,12 +4,14 @@ #include "chrome/browser/chromeos/settings/session_manager_operation.h" +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" @@ -77,7 +79,7 @@ void CheckPublicKeyLoaded(SessionManagerOperation* op) { ASSERT_TRUE(op->public_key().get()); ASSERT_TRUE(op->public_key()->is_loaded()); - std::vector<uint8> public_key; + std::vector<uint8_t> public_key; ASSERT_TRUE(policy_.GetSigningKey()->ExportPublicKey(&public_key)); EXPECT_EQ(public_key, op->public_key()->data()); }
diff --git a/chrome/browser/chromeos/settings/stub_cros_settings_provider.h b/chrome/browser/chromeos/settings/stub_cros_settings_provider.h index 4d54a3e..bff65d1 100644 --- a/chrome/browser/chromeos/settings/stub_cros_settings_provider.h +++ b/chrome/browser/chromeos/settings/stub_cros_settings_provider.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/prefs/pref_value_map.h" #include "chromeos/settings/cros_settings_provider.h"
diff --git a/chrome/browser/chromeos/settings/system_settings_provider.h b/chrome/browser/chromeos/settings/system_settings_provider.h index 91834c8..886f811 100644 --- a/chrome/browser/chromeos/settings/system_settings_provider.h +++ b/chrome/browser/chromeos/settings/system_settings_provider.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chromeos/settings/cros_settings_provider.h" #include "chromeos/settings/timezone_settings.h"
diff --git a/chrome/browser/chromeos/settings/token_encryptor.cc b/chrome/browser/chromeos/settings/token_encryptor.cc index dbe26c5..8ff42eeb 100644 --- a/chrome/browser/chromeos/settings/token_encryptor.cc +++ b/chrome/browser/chromeos/settings/token_encryptor.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/settings/token_encryptor.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/logging.h" @@ -97,7 +100,7 @@ crypto::SymmetricKey* key, const std::string& salt, const std::string& encrypted_token_hex) { - std::vector<uint8> encrypted_token_bytes; + std::vector<uint8_t> encrypted_token_bytes; if (!base::HexStringToBytes(encrypted_token_hex, &encrypted_token_bytes)) { LOG(WARNING) << "Corrupt encrypted token found."; return std::string();
diff --git a/chrome/browser/chromeos/settings/token_encryptor.h b/chrome/browser/chromeos/settings/token_encryptor.h index 057d344..00d8edc 100644 --- a/chrome/browser/chromeos/settings/token_encryptor.h +++ b/chrome/browser/chromeos/settings/token_encryptor.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace crypto {
diff --git a/chrome/browser/chromeos/sim_dialog_delegate.h b/chrome/browser/chromeos/sim_dialog_delegate.h index 120d28e..b145a3a 100644 --- a/chrome/browser/chromeos/sim_dialog_delegate.h +++ b/chrome/browser/chromeos/sim_dialog_delegate.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_SIM_DIALOG_DELEGATE_H_ #define CHROME_BROWSER_CHROMEOS_SIM_DIALOG_DELEGATE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/gfx/native_widget_types.h" #include "ui/web_dialogs/web_dialog_delegate.h"
diff --git a/chrome/browser/chromeos/status/data_promo_notification.h b/chrome/browser/chromeos/status/data_promo_notification.h index 88a58fd4..cbb6d3a 100644 --- a/chrome/browser/chromeos/status/data_promo_notification.h +++ b/chrome/browser/chromeos/status/data_promo_notification.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_STATUS_DATA_PROMO_NOTIFICATION_H_ #define CHROME_BROWSER_CHROMEOS_STATUS_DATA_PROMO_NOTIFICATION_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chromeos/network/network_state_handler_observer.h"
diff --git a/chrome/browser/chromeos/status/data_promo_notification_unittest.cc b/chrome/browser/chromeos/status/data_promo_notification_unittest.cc index 9eaede3..29e866c 100644 --- a/chrome/browser/chromeos/status/data_promo_notification_unittest.cc +++ b/chrome/browser/chromeos/status/data_promo_notification_unittest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/status/data_promo_notification.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/run_loop.h" #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index acb574a8..5767286 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/status/network_menu.h" +#include <stddef.h> + #include <algorithm> #include "ash/shell.h" @@ -11,6 +13,7 @@ #include "ash/strings/grit/ash_strings.h" #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chromeos/mobile_config.h"
diff --git a/chrome/browser/chromeos/status/network_menu.h b/chrome/browser/chromeos/status/network_menu.h index 76cd637..b06ed87 100644 --- a/chrome/browser/chromeos/status/network_menu.h +++ b/chrome/browser/chromeos/status/network_menu.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.cc b/chrome/browser/chromeos/system/automatic_reboot_manager.cc index 050b767..76f4221 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager.cc +++ b/chrome/browser/chromeos/system/automatic_reboot_manager.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" #include <fcntl.h> +#include <stddef.h> #include <sys/stat.h> #include <sys/types.h>
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.h b/chrome/browser/chromeos/system/automatic_reboot_manager.h index 6f03913..c961308 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager.h +++ b/chrome/browser/chromeos/system/automatic_reboot_manager.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc index 3fe61fbe..96ad4a21 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc +++ b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
@@ -12,6 +12,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h"
diff --git a/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc b/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc index 2fcf87d..b27b69a4 100644 --- a/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc +++ b/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/prefs/testing_pref_service.h"
diff --git a/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc b/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc index 3a3d98e..c0ad7b6 100644 --- a/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc +++ b/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/chromeos/system/input_device_settings.h" +#include "base/macros.h" #include "content/public/browser/browser_thread.h" #include "ui/ozone/public/input_controller.h" #include "ui/ozone/public/ozone_platform.h"
diff --git a/chrome/browser/chromeos/system/input_device_settings_impl_x11.cc b/chrome/browser/chromeos/system/input_device_settings_impl_x11.cc index ea870bd..79d108e 100644 --- a/chrome/browser/chromeos/system/input_device_settings_impl_x11.cc +++ b/chrome/browser/chromeos/system/input_device_settings_impl_x11.cc
@@ -11,6 +11,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_loop.h" #include "base/process/kill.h"
diff --git a/chrome/browser/chromeos/system/pointer_device_observer.cc b/chrome/browser/chromeos/system/pointer_device_observer.cc index 125e3af..c4d3a31 100644 --- a/chrome/browser/chromeos/system/pointer_device_observer.cc +++ b/chrome/browser/chromeos/system/pointer_device_observer.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/system/pointer_device_observer.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "chrome/browser/chromeos/system/input_device_settings.h"
diff --git a/chrome/browser/chromeos/system/pointer_device_observer.h b/chrome/browser/chromeos/system/pointer_device_observer.h index 0938a325..8eae0519 100644 --- a/chrome/browser/chromeos/system/pointer_device_observer.h +++ b/chrome/browser/chromeos/system/pointer_device_observer.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_POINTER_DEVICE_OBSERVER_H_ #define CHROME_BROWSER_CHROMEOS_SYSTEM_POINTER_DEVICE_OBSERVER_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "ui/events/devices/input_device_event_observer.h"
diff --git a/chrome/browser/chromeos/system/timezone_util.cc b/chrome/browser/chromeos/system/timezone_util.cc index 7ab822d6..4692d843 100644 --- a/chrome/browser/chromeos/system/timezone_util.cc +++ b/chrome/browser/chromeos/system/timezone_util.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/system/timezone_util.h" +#include <stddef.h> + #include <string> #include "base/i18n/rtl.h"
diff --git a/chrome/browser/chromeos/system_logs/command_line_log_source.cc b/chrome/browser/chromeos/system_logs/command_line_log_source.cc index c0b58e5..f2b12ca 100644 --- a/chrome/browser/chromeos/system_logs/command_line_log_source.cc +++ b/chrome/browser/chromeos/system_logs/command_line_log_source.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/system_logs/command_line_log_source.h" +#include <stddef.h> + #include <string> #include <vector>
diff --git a/chrome/browser/chromeos/system_logs/command_line_log_source.h b/chrome/browser/chromeos/system_logs/command_line_log_source.h index 4ecc8c1..8883212d 100644 --- a/chrome/browser/chromeos/system_logs/command_line_log_source.h +++ b/chrome/browser/chromeos/system_logs/command_line_log_source.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_COMMAND_LINE_LOG_SOURCE_H_ #define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_COMMAND_LINE_LOG_SOURCE_H_ +#include "base/macros.h" #include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h" namespace system_logs {
diff --git a/chrome/browser/chromeos/system_logs/dbus_log_source.h b/chrome/browser/chromeos/system_logs/dbus_log_source.h index 88113fe..1d17b6c 100644 --- a/chrome/browser/chromeos/system_logs/dbus_log_source.h +++ b/chrome/browser/chromeos/system_logs/dbus_log_source.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_DBUS_LOG_SOURCE_H_ #define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_DBUS_LOG_SOURCE_H_ +#include "base/macros.h" #include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h" namespace system_logs {
diff --git a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc index 9b4fd73..a1d2fd842 100644 --- a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc +++ b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/system_logs/debug_daemon_log_source.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/file_util.h"
diff --git a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.h b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.h index 06db6bdc..1c8bb5d 100644 --- a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.h +++ b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h"
diff --git a/chrome/browser/chromeos/system_logs/debug_log_writer.cc b/chrome/browser/chromeos/system_logs/debug_log_writer.cc index 032b1ebf..92ff9b0f 100644 --- a/chrome/browser/chromeos/system_logs/debug_log_writer.cc +++ b/chrome/browser/chromeos/system_logs/debug_log_writer.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/system_logs/debug_log_writer.h" +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" @@ -203,7 +205,7 @@ void IntializeLogFile(base::File* file, const base::FilePath& file_path, - uint32 flags) { + uint32_t flags) { base::FilePath dir = file_path.DirName(); if (!base::DirectoryExists(dir)) { if (!base::CreateDirectory(dir)) {
diff --git a/chrome/browser/chromeos/system_logs/debug_log_writer.h b/chrome/browser/chromeos/system_logs/debug_log_writer.h index 31a3ed1..9d5b9fd1 100644 --- a/chrome/browser/chromeos/system_logs/debug_log_writer.h +++ b/chrome/browser/chromeos/system_logs/debug_log_writer.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_DEBUG_LOG_WRITER_H_ #define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_DEBUG_LOG_WRITER_H_ -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/macros.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/system_logs/device_event_log_source.h b/chrome/browser/chromeos/system_logs/device_event_log_source.h index 1d62367..c5cf6a0 100644 --- a/chrome/browser/chromeos/system_logs/device_event_log_source.h +++ b/chrome/browser/chromeos/system_logs/device_event_log_source.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_DEVICE_EVENT_LOG_SOURCE_H_ #define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_DEVICE_EVENT_LOG_SOURCE_H_ +#include "base/macros.h" #include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h" namespace system_logs {
diff --git a/chrome/browser/chromeos/system_logs/lsb_release_log_source.h b/chrome/browser/chromeos/system_logs/lsb_release_log_source.h index 4939683b..39239c6f 100644 --- a/chrome/browser/chromeos/system_logs/lsb_release_log_source.h +++ b/chrome/browser/chromeos/system_logs/lsb_release_log_source.h
@@ -4,6 +4,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_LSB_RELEASE_LOG_SOURCE_H_ #define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_LSB_RELEASE_LOG_SOURCE_H_ +#include "base/macros.h" #include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h" namespace system_logs {
diff --git a/chrome/browser/chromeos/system_logs/touch_log_source.h b/chrome/browser/chromeos/system_logs/touch_log_source.h index 6cb780c..89c4f95 100644 --- a/chrome/browser/chromeos/system_logs/touch_log_source.h +++ b/chrome/browser/chromeos/system_logs/touch_log_source.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_TOUCH_LOG_SOURCE_H_ #define CHROME_BROWSER_CHROMEOS_SYSTEM_LOGS_TOUCH_LOG_SOURCE_H_ +#include "base/macros.h" #include "chrome/browser/feedback/system_logs/system_logs_fetcher_base.h" namespace system_logs {
diff --git a/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc b/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc index e812047..6d5d2cf 100644 --- a/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc +++ b/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/system_logs/touch_log_source.h" +#include <stddef.h> + #include "ash/touch/touch_hud_debug.h" #include "base/bind.h" #include "base/bind_helpers.h"
diff --git a/chrome/browser/chromeos/system_logs/touch_log_source_x11.cc b/chrome/browser/chromeos/system_logs/touch_log_source_x11.cc index 0d1d833..d2d9fa68 100644 --- a/chrome/browser/chromeos/system_logs/touch_log_source_x11.cc +++ b/chrome/browser/chromeos/system_logs/touch_log_source_x11.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/system_logs/touch_log_source.h" +#include <stddef.h> + #include "ash/touch/touch_hud_debug.h" #include "base/bind.h" #include "base/command_line.h"
diff --git a/chrome/browser/chromeos/ui/accessibility_focus_ring.cc b/chrome/browser/chromeos/ui/accessibility_focus_ring.cc index ea15902..d682387 100644 --- a/chrome/browser/chromeos/ui/accessibility_focus_ring.cc +++ b/chrome/browser/chromeos/ui/accessibility_focus_ring.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/ui/accessibility_focus_ring.h" +#include <stddef.h> + #include "base/logging.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc index 21630664..12eab388 100644 --- a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc +++ b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h" +#include <stddef.h> + #include "ash/display/window_tree_host_manager.h" #include "ash/shell.h" #include "base/logging.h"
diff --git a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h index 22c9a0d..c5f4a0f 100644 --- a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h +++ b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/memory/singleton.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/ui/accessibility_focus_ring_layer.h b/chrome/browser/chromeos/ui/accessibility_focus_ring_layer.h index ae9b7c9..58e2d3d 100644 --- a/chrome/browser/chromeos/ui/accessibility_focus_ring_layer.h +++ b/chrome/browser/chromeos/ui/accessibility_focus_ring_layer.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_LAYER_H_ #define CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_LAYER_H_ +#include "base/macros.h" #include "chrome/browser/chromeos/ui/accessibility_focus_ring.h" #include "chrome/browser/chromeos/ui/focus_ring_layer.h"
diff --git a/chrome/browser/chromeos/ui/choose_mobile_network_dialog.h b/chrome/browser/chromeos/ui/choose_mobile_network_dialog.h index b7554d6..0d65630 100644 --- a/chrome/browser/chromeos/ui/choose_mobile_network_dialog.h +++ b/chrome/browser/chromeos/ui/choose_mobile_network_dialog.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_UI_CHOOSE_MOBILE_NETWORK_DIALOG_H_ #define CHROME_BROWSER_CHROMEOS_UI_CHOOSE_MOBILE_NETWORK_DIALOG_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/gfx/native_widget_types.h" #include "ui/web_dialogs/web_dialog_delegate.h"
diff --git a/chrome/browser/chromeos/ui/echo_dialog_view.cc b/chrome/browser/chromeos/ui/echo_dialog_view.cc index 1c373b9..726d7fd 100644 --- a/chrome/browser/chromeos/ui/echo_dialog_view.cc +++ b/chrome/browser/chromeos/ui/echo_dialog_view.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/ui/echo_dialog_view.h" +#include <stddef.h> + #include "chrome/browser/chromeos/ui/echo_dialog_listener.h" #include "chrome/grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/chromeos/ui/echo_dialog_view.h b/chrome/browser/chromeos/ui/echo_dialog_view.h index 935b4e3..6f8a3c5 100644 --- a/chrome/browser/chromeos/ui/echo_dialog_view.h +++ b/chrome/browser/chromeos/ui/echo_dialog_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROMEOS_UI_ECHO_DIALOG_VIEW_H_ #define CHROME_BROWSER_CHROMEOS_UI_ECHO_DIALOG_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/controls/styled_label_listener.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/chromeos/ui/focus_ring_controller.h b/chrome/browser/chromeos/ui/focus_ring_controller.h index 200e95f4..3b789a8 100644 --- a/chrome/browser/chromeos/ui/focus_ring_controller.h +++ b/chrome/browser/chromeos/ui/focus_ring_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_CONTROLLER_H_ #define CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_CONTROLLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/ui/focus_ring_layer.h" #include "ui/views/focus/focus_manager.h"
diff --git a/chrome/browser/chromeos/ui/focus_ring_layer.h b/chrome/browser/chromeos/ui/focus_ring_layer.h index 7c70b5d..7fa56c9 100644 --- a/chrome/browser/chromeos/ui/focus_ring_layer.h +++ b/chrome/browser/chromeos/ui/focus_ring_layer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_LAYER_H_ #define CHROME_BROWSER_CHROMEOS_UI_FOCUS_RING_LAYER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/compositor/layer_delegate.h" #include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc b/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc index c9114f0..f4bd9bc8 100644 --- a/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc +++ b/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc
@@ -10,6 +10,7 @@ #include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" #include "ash/wm/window_animations.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/ui/idle_app_name_notification_view.h b/chrome/browser/chromeos/ui/idle_app_name_notification_view.h index 7fd0cc9..b5519e8c 100644 --- a/chrome/browser/chromeos/ui/idle_app_name_notification_view.h +++ b/chrome/browser/chromeos/ui/idle_app_name_notification_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_UI_IDLE_APP_NAME_NOTIFICATION_VIEW_H_ #define CHROME_BROWSER_CHROMEOS_UI_IDLE_APP_NAME_NOTIFICATION_VIEW_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc b/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc index 8502eae..a1d5428 100644 --- a/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc +++ b/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/ui/idle_app_name_notification_view.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_system.h"
diff --git a/chrome/browser/chromeos/ui/kiosk_external_update_notification.cc b/chrome/browser/chromeos/ui/kiosk_external_update_notification.cc index ecb32726..178164b 100644 --- a/chrome/browser/chromeos/ui/kiosk_external_update_notification.cc +++ b/chrome/browser/chromeos/ui/kiosk_external_update_notification.cc
@@ -6,6 +6,7 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" +#include "base/macros.h" #include "ui/aura/window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h"
diff --git a/chrome/browser/chromeos/ui/mobile_config_ui.h b/chrome/browser/chromeos/ui/mobile_config_ui.h index 121edc5..2e4e298 100644 --- a/chrome/browser/chromeos/ui/mobile_config_ui.h +++ b/chrome/browser/chromeos/ui/mobile_config_ui.h
@@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_CHROMEOS_UI_MOBILE_CONFIG_UI_H_ #define CHROME_BROWSER_CHROMEOS_UI_MOBILE_CONFIG_UI_H_ -#include "base/basictypes.h" namespace chromeos { namespace mobile_config_ui {
diff --git a/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.h b/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.h index 6f90943..fb3632a 100644 --- a/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.h +++ b/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_UI_SCREEN_CAPTURE_NOTIFICATION_UI_CHROMEOS_H_ #define CHROME_BROWSER_CHROMEOS_UI_SCREEN_CAPTURE_NOTIFICATION_UI_CHROMEOS_H_ +#include "base/macros.h" #include "base/observer_list.h" #include "chrome/browser/ui/screen_capture_notification_ui.h"
diff --git a/chrome/browser/chromeos/ui_proxy_config_service.h b/chrome/browser/chromeos/ui_proxy_config_service.h index a85e1c3..0e4b507 100644 --- a/chrome/browser/chromeos/ui_proxy_config_service.h +++ b/chrome/browser/chromeos/ui_proxy_config_service.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/chromeos/ui_proxy_config.h" class PrefService;
diff --git a/chrome/browser/chromeos/upgrade_detector_chromeos.cc b/chrome/browser/chromeos/upgrade_detector_chromeos.cc index 41c533b..ecc130b3 100644 --- a/chrome/browser/chromeos/upgrade_detector_chromeos.cc +++ b/chrome/browser/chromeos/upgrade_detector_chromeos.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/singleton.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/update_engine_client.h" @@ -102,7 +105,7 @@ void UpgradeDetectorChromeos::NotifyOnUpgrade() { base::TimeDelta delta = base::Time::Now() - upgrade_detected_time_; - int64 time_passed = delta.InDays(); + int64_t time_passed = delta.InDays(); const int kSevereThreshold = 7; const int kHighThreshold = 4;
diff --git a/chrome/browser/chromeos/upgrade_detector_chromeos.h b/chrome/browser/chromeos/upgrade_detector_chromeos.h index d92b4d9..9f62eaa 100644 --- a/chrome/browser/chromeos/upgrade_detector_chromeos.h +++ b/chrome/browser/chromeos/upgrade_detector_chromeos.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_UPGRADE_DETECTOR_CHROMEOS_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" #include "chrome/browser/upgrade_detector.h"
diff --git a/chrome/browser/extensions/active_script_controller.cc b/chrome/browser/extensions/active_script_controller.cc index 1eb1ae2..4970de2b 100644 --- a/chrome/browser/extensions/active_script_controller.cc +++ b/chrome/browser/extensions/active_script_controller.cc
@@ -160,7 +160,7 @@ void ActiveScriptController::OnRequestScriptInjectionPermission( const std::string& extension_id, UserScript::InjectionType script_type, - int64 request_id) { + int64_t request_id) { if (!crx_file::id_util::IdIsValid(extension_id)) { NOTREACHED() << "'" << extension_id << "' is not a valid id."; return; @@ -197,7 +197,7 @@ } } -void ActiveScriptController::PermitScriptInjection(int64 request_id) { +void ActiveScriptController::PermitScriptInjection(int64_t request_id) { // This only sends the response to the renderer - the process of adding the // extension to the list of |permitted_extensions_| is done elsewhere. // TODO(devlin): Instead of sending this to all frames, we should include the
diff --git a/chrome/browser/extensions/active_script_controller.h b/chrome/browser/extensions/active_script_controller.h index 1db2f74b..e2d05bbd 100644 --- a/chrome/browser/extensions/active_script_controller.h +++ b/chrome/browser/extensions/active_script_controller.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVE_SCRIPT_CONTROLLER_H_ #define CHROME_BROWSER_EXTENSIONS_ACTIVE_SCRIPT_CONTROLLER_H_ +#include <stdint.h> + #include <map> #include <set> #include <string> @@ -12,6 +14,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "content/public/browser/web_contents_observer.h" #include "extensions/browser/extension_registry_observer.h" @@ -96,13 +99,12 @@ void RunPendingForExtension(const Extension* extension); // Handle the RequestScriptInjectionPermission message. - void OnRequestScriptInjectionPermission( - const std::string& extension_id, - UserScript::InjectionType script_type, - int64 request_id); + void OnRequestScriptInjectionPermission(const std::string& extension_id, + UserScript::InjectionType script_type, + int64_t request_id); // Grants permission for the given request to run. - void PermitScriptInjection(int64 request_id); + void PermitScriptInjection(int64_t request_id); // Notifies the ExtensionActionAPI of a change (either that an extension now // wants permission to run, or that it has been run).
diff --git a/chrome/browser/extensions/active_script_controller_browsertest.cc b/chrome/browser/extensions/active_script_controller_browsertest.cc index 3b81195..ff8ac9b 100644 --- a/chrome/browser/extensions/active_script_controller_browsertest.cc +++ b/chrome/browser/extensions/active_script_controller_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <utility> #include <vector>
diff --git a/chrome/browser/extensions/active_script_controller_unittest.cc b/chrome/browser/extensions/active_script_controller_unittest.cc index 6876c575..96532ba 100644 --- a/chrome/browser/extensions/active_script_controller_unittest.cc +++ b/chrome/browser/extensions/active_script_controller_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <map> #include <utility>
diff --git a/chrome/browser/extensions/active_tab_permission_granter.h b/chrome/browser/extensions/active_tab_permission_granter.h index 498c6e82..bc29237 100644 --- a/chrome/browser/extensions/active_tab_permission_granter.h +++ b/chrome/browser/extensions/active_tab_permission_granter.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/scoped_observer.h" #include "content/public/browser/web_contents_observer.h" #include "extensions/browser/extension_registry_observer.h"
diff --git a/chrome/browser/extensions/activity_log/activity_actions.cc b/chrome/browser/extensions/activity_log/activity_actions.cc index 05ff82fb..85cad83 100644 --- a/chrome/browser/extensions/activity_log/activity_actions.cc +++ b/chrome/browser/extensions/activity_log/activity_actions.cc
@@ -44,7 +44,7 @@ const base::Time& time, const ActionType action_type, const std::string& api_name, - int64 action_id) + int64_t action_id) : extension_id_(extension_id), time_(time), action_type_(action_type),
diff --git a/chrome/browser/extensions/activity_log/activity_actions.h b/chrome/browser/extensions/activity_log/activity_actions.h index 902b550..cb92b9f 100644 --- a/chrome/browser/extensions/activity_log/activity_actions.h +++ b/chrome/browser/extensions/activity_log/activity_actions.h
@@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_ACTIONS_H_ #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_ACTIONS_H_ +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/time/time.h" #include "chrome/browser/profiles/profile.h" @@ -49,7 +52,7 @@ const base::Time& time, const ActionType action_type, const std::string& api_name, - int64 action_id = -1); + int64_t action_id = -1); // Creates and returns a mutable copy of an Action. scoped_refptr<Action> Clone() const; @@ -105,7 +108,7 @@ // An ID that identifies an action stored in the Activity Log database. If the // action is not retrieved from the database, e.g., live stream, then the ID // is set to -1. - int64 action_id() const { return action_id_; } + int64_t action_id() const { return action_id_; } // Helper methods for serializing and deserializing URLs into strings. If // the URL is marked as incognito, then the string is prefixed with @@ -144,7 +147,7 @@ bool arg_incognito_; scoped_ptr<base::DictionaryValue> other_; int count_; - int64 action_id_; + int64_t action_id_; DISALLOW_COPY_AND_ASSIGN(Action); };
diff --git a/chrome/browser/extensions/activity_log/activity_database.cc b/chrome/browser/extensions/activity_log/activity_database.cc index 226c658..246e0e8b 100644 --- a/chrome/browser/extensions/activity_log/activity_database.cc +++ b/chrome/browser/extensions/activity_log/activity_database.cc
@@ -14,6 +14,7 @@ #include "base/threading/thread_checker.h" #include "base/time/clock.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/extensions/activity_log/fullstream_ui_policy.h" #include "chrome/common/chrome_switches.h" #include "sql/error_delegate_util.h"
diff --git a/chrome/browser/extensions/activity_log/activity_database.h b/chrome/browser/extensions/activity_log/activity_database.h index 2011f0f..43a77e1f 100644 --- a/chrome/browser/extensions/activity_log/activity_database.h +++ b/chrome/browser/extensions/activity_log/activity_database.h
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/synchronization/lock.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/extensions/activity_log/activity_database_unittest.cc b/chrome/browser/extensions/activity_log/activity_database_unittest.cc index 7d49898..9608923 100644 --- a/chrome/browser/extensions/activity_log/activity_database_unittest.cc +++ b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
@@ -2,15 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <string> #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/test/simple_test_clock.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/extensions/activity_log/activity_action_constants.h" #include "chrome/browser/extensions/activity_log/activity_database.h" #include "chrome/browser/extensions/activity_log/fullstream_ui_policy.h"
diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc index 1870ee4..3fe65ea 100644 --- a/chrome/browser/extensions/activity_log/activity_log.cc +++ b/chrome/browser/extensions/activity_log/activity_log.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/activity_log/activity_log.h" +#include <stddef.h> + #include <set> #include <vector> @@ -11,6 +13,7 @@ #include "base/json/json_string_value_serializer.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_checker.h" @@ -618,7 +621,7 @@ // DELETE ACTIONS. ------------------------------------------------------------- -void ActivityLog::RemoveActions(const std::vector<int64>& action_ids) { +void ActivityLog::RemoveActions(const std::vector<int64_t>& action_ids) { if (!database_policy_) return; database_policy_->RemoveActions(action_ids);
diff --git a/chrome/browser/extensions/activity_log/activity_log.h b/chrome/browser/extensions/activity_log/activity_log.h index d9a4ccf6..dab84d1 100644 --- a/chrome/browser/extensions/activity_log/activity_log.h +++ b/chrome/browser/extensions/activity_log/activity_log.h
@@ -5,12 +5,15 @@ #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_H_ #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> #include "base/callback.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/observer_list_threadsafe.h" #include "base/scoped_observer.h" #include "base/synchronization/lock.h" @@ -108,7 +111,7 @@ // Remove actions from the activity log database which IDs specified in the // action_ids array. - void RemoveActions(const std::vector<int64>& action_ids); + void RemoveActions(const std::vector<int64_t>& action_ids); // Clean up URLs from the activity log database. // If restrict_urls is empty then all URLs in the activity log database are
diff --git a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc index 7cfd7c0..4069efd 100644 --- a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc +++ b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/location.h" #include "base/single_thread_task_runner.h" #include "base/strings/stringprintf.h" @@ -38,8 +40,8 @@ static void Prerender_Arguments( const std::string& extension_id, - uint16 port, - scoped_ptr<std::vector<scoped_refptr<Action> > > i) { + uint16_t port, + scoped_ptr<std::vector<scoped_refptr<Action>>> i) { // This is to exit RunLoop (base::MessageLoop::current()->Run()) below base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); @@ -67,7 +69,7 @@ IN_PROC_BROWSER_TEST_F(ActivityLogPrerenderTest, TestScriptInjected) { host_resolver()->AddRule("*", "127.0.0.1"); ASSERT_TRUE(StartEmbeddedTestServer()); - uint16 port = embedded_test_server()->port(); + uint16_t port = embedded_test_server()->port(); // Get the extension (chrome/test/data/extensions/activity_log) const Extension* ext =
diff --git a/chrome/browser/extensions/activity_log/activity_log_policy.cc b/chrome/browser/extensions/activity_log/activity_log_policy.cc index 58c9f6b..99ef17c 100644 --- a/chrome/browser/extensions/activity_log/activity_log_policy.cc +++ b/chrome/browser/extensions/activity_log/activity_log_policy.cc
@@ -4,11 +4,13 @@ #include "chrome/browser/extensions/activity_log/activity_log_policy.h" +#include <stddef.h> #include <stdint.h> #include "base/files/file_path.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/time/clock.h" #include "base/time/time.h" @@ -148,8 +150,8 @@ // static void ActivityLogPolicy::Util::ComputeDatabaseTimeBounds(const base::Time& now, int days_ago, - int64* early_bound, - int64* late_bound) { + int64_t* early_bound, + int64_t* late_bound) { base::Time morning_midnight = now.LocalMidnight(); if (days_ago == 0) { *early_bound = morning_midnight.ToInternalValue();
diff --git a/chrome/browser/extensions/activity_log/activity_log_policy.h b/chrome/browser/extensions/activity_log/activity_log_policy.h index 9239919c..dff6d7ac 100644 --- a/chrome/browser/extensions/activity_log/activity_log_policy.h +++ b/chrome/browser/extensions/activity_log/activity_log_policy.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_POLICY_H_ #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_POLICY_H_ +#include <stdint.h> + #include <map> #include <set> #include <string> @@ -13,6 +15,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/activity_log/activity_actions.h" @@ -114,8 +117,8 @@ // time. static void ComputeDatabaseTimeBounds(const base::Time& now, int days_ago, - int64* early_bound, - int64* late_bound); + int64_t* early_bound, + int64_t* late_bound); // Deletes obsolete database tables from an activity log database. This // can be used in InitDatabase() methods of ActivityLogDatabasePolicy @@ -178,7 +181,7 @@ <void(scoped_ptr<Action::ActionVector>)>& callback) = 0; // Remove actions (rows) which IDs are in the action_ids array. - virtual void RemoveActions(const std::vector<int64>& action_ids) = 0; + virtual void RemoveActions(const std::vector<int64_t>& action_ids) = 0; // Clean the relevant URL data. The cleaning may need to be different for // different policies. If restrict_urls is empty then all URLs are removed.
diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc index be3473ee..7267ff5 100644 --- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc +++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
@@ -2,11 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" +#include "build/build_config.h" #include "chrome/browser/extensions/activity_log/activity_action_constants.h" #include "chrome/browser/extensions/activity_log/activity_log.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/activity_log/counting_policy.cc b/chrome/browser/extensions/activity_log/counting_policy.cc index 94512e8..dbe432a 100644 --- a/chrome/browser/extensions/activity_log/counting_policy.cc +++ b/chrome/browser/extensions/activity_log/counting_policy.cc
@@ -30,6 +30,8 @@ #include "chrome/browser/extensions/activity_log/counting_policy.h" +#include <stddef.h> + #include <map> #include <string> #include <vector> @@ -38,6 +40,7 @@ #include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "chrome/common/chrome_constants.h" @@ -293,8 +296,8 @@ // The contents in values must match up with fields in matched_columns. A // value of -1 is used to encode a null database value. - int64 id; - std::vector<int64> matched_values; + int64_t id; + std::vector<int64_t> matched_values; if (!string_table_.StringToInt(db, action.extension_id(), &id)) return false; @@ -377,7 +380,7 @@ if (locate_statement.Step()) { // A matching row was found. Update the count and time. - int64 rowid = locate_statement.ColumnInt64(0); + int64_t rowid = locate_statement.ColumnInt64(0); sql::Statement update_statement(db->GetCachedStatement( sql::StatementID(SQL_FROM_HERE), update_str.c_str())); update_statement.BindInt(0, count); @@ -480,8 +483,8 @@ if (!arg_url.empty()) query.BindString(++i, arg_url + "%"); if (days_ago >= 0) { - int64 early_bound; - int64 late_bound; + int64_t early_bound; + int64_t late_bound; Util::ComputeDatabaseTimeBounds(Now(), days_ago, &early_bound, &late_bound); query.BindInt64(++i, early_bound); query.BindInt64(++i, late_bound); @@ -523,7 +526,7 @@ return actions.Pass(); } -void CountingPolicy::DoRemoveActions(const std::vector<int64>& action_ids) { +void CountingPolicy::DoRemoveActions(const std::vector<int64_t>& action_ids) { if (action_ids.empty()) return; @@ -590,7 +593,7 @@ // If URLs are specified then restrict to only those URLs. for (size_t i = 0; i < restrict_urls.size(); ++i) { - int64 url_id; + int64_t url_id; if (!restrict_urls[i].is_valid() || !url_table_.StringToInt(db, restrict_urls[i].spec(), &url_id)) { continue; @@ -650,7 +653,7 @@ "DELETE FROM %s WHERE extension_id_x=?", kTableName); sql::Statement statement( db->GetCachedStatement(sql::StatementID(SQL_FROM_HERE), sql_str.c_str())); - int64 id; + int64_t id; if (string_table_.StringToInt(db, extension_id, &id)) { statement.BindInt64(0, id); } else { @@ -737,7 +740,7 @@ callback); } -void CountingPolicy::RemoveActions(const std::vector<int64>& action_ids) { +void CountingPolicy::RemoveActions(const std::vector<int64_t>& action_ids) { ScheduleAndForget(this, &CountingPolicy::DoRemoveActions, action_ids); }
diff --git a/chrome/browser/extensions/activity_log/counting_policy.h b/chrome/browser/extensions/activity_log/counting_policy.h index e7b1671..26b090a5 100644 --- a/chrome/browser/extensions/activity_log/counting_policy.h +++ b/chrome/browser/extensions/activity_log/counting_policy.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_COUNTING_POLICY_H_ #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_COUNTING_POLICY_H_ +#include <stdint.h> + #include <string> #include "base/containers/hash_tables.h" @@ -47,7 +49,7 @@ } // Remove actions (rows) which IDs are specified in the action_ids array. - void RemoveActions(const std::vector<int64>& action_ids) override; + void RemoveActions(const std::vector<int64_t>& action_ids) override; // Clean the URL data stored for this policy. void RemoveURLs(const std::vector<GURL>&) override; @@ -97,7 +99,7 @@ // The implementation of RemoveActions; this must only run on the database // thread. - void DoRemoveActions(const std::vector<int64>& action_ids); + void DoRemoveActions(const std::vector<int64_t>& action_ids); // The implementation of RemoveURLs; this must only run on the database // thread.
diff --git a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc index d876c93..69da18e 100644 --- a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc +++ b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/cancelable_callback.h" #include "base/command_line.h" #include "base/location.h" @@ -14,6 +17,7 @@ #include "base/test/simple_test_clock.h" #include "base/test/test_timeouts.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/extensions/activity_log/activity_log.h" #include "chrome/browser/extensions/activity_log/counting_policy.h" #include "chrome/browser/extensions/extension_service.h" @@ -405,9 +409,8 @@ // deletion. void CheckRemoveActions( ActivityLogDatabasePolicy* policy, - const std::vector<int64>& action_ids, + const std::vector<int64_t>& action_ids, const base::Callback<void(scoped_ptr<Action::ActionVector>)>& checker) { - // Use a mock clock to ensure that events are not recorded on the wrong day // when the test is run close to local midnight. base::SimpleTestClock* mock_clock = new base::SimpleTestClock(); @@ -1373,7 +1376,7 @@ ActivityLogDatabasePolicy* policy = new CountingPolicy(profile_.get()); policy->Init(); - std::vector<int64> action_ids; + std::vector<int64_t> action_ids; CheckRemoveActions( policy, action_ids, base::Bind(&CountingPolicyTest::NoActionsDeleted));
diff --git a/chrome/browser/extensions/activity_log/database_string_table.cc b/chrome/browser/extensions/activity_log/database_string_table.cc index 01c52c9..913aa92 100644 --- a/chrome/browser/extensions/activity_log/database_string_table.cc +++ b/chrome/browser/extensions/activity_log/database_string_table.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/activity_log/database_string_table.h" +#include <stddef.h> + #include "base/strings/stringprintf.h" #include "sql/connection.h" #include "sql/statement.h" @@ -36,8 +38,8 @@ bool DatabaseStringTable::StringToInt(sql::Connection* connection, const std::string& value, - int64* id) { - std::map<std::string, int64>::const_iterator lookup = + int64_t* id) { + std::map<std::string, int64_t>::const_iterator lookup = value_to_id_.find(value); if (lookup != value_to_id_.end()) { *id = lookup->second; @@ -81,10 +83,9 @@ } bool DatabaseStringTable::IntToString(sql::Connection* connection, - int64 id, + int64_t id, std::string* value) { - std::map<int64, std::string>::const_iterator lookup = - id_to_value_.find(id); + std::map<int64_t, std::string>::const_iterator lookup = id_to_value_.find(id); if (lookup != id_to_value_.end()) { *value = lookup->second; return true;
diff --git a/chrome/browser/extensions/activity_log/database_string_table.h b/chrome/browser/extensions/activity_log/database_string_table.h index 6c230403..a7373cc5 100644 --- a/chrome/browser/extensions/activity_log/database_string_table.h +++ b/chrome/browser/extensions/activity_log/database_string_table.h
@@ -5,11 +5,13 @@ #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_DATABASE_STRING_TABLE_H_ #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_DATABASE_STRING_TABLE_H_ +#include <stdint.h> + #include <map> #include <string> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" namespace sql { class Connection; @@ -44,13 +46,13 @@ // on success and false on database error. bool StringToInt(sql::Connection* connection, const std::string& value, - int64* id); + int64_t* id); // Looks up an integer value and converts it to a string (which is stored in // *value). Returns true on success. A false return does not necessarily // indicate a database error; it might simply be that the value cannot be // found. - bool IntToString(sql::Connection* connection, int64 id, std::string* value); + bool IntToString(sql::Connection* connection, int64_t id, std::string* value); // Clears the in-memory cache; this should be called if the underlying // database table has been manipulated and the cache may be stale. @@ -61,8 +63,8 @@ void PruneCache(); // In-memory caches of recently accessed values. - std::map<int64, std::string> id_to_value_; - std::map<std::string, int64> value_to_id_; + std::map<int64_t, std::string> id_to_value_; + std::map<std::string, int64_t> value_to_id_; // The name of the database table where the mapping is stored. std::string table_;
diff --git a/chrome/browser/extensions/activity_log/database_string_table_unittest.cc b/chrome/browser/extensions/activity_log/database_string_table_unittest.cc index 90433b9..ce0ced8 100644 --- a/chrome/browser/extensions/activity_log/database_string_table_unittest.cc +++ b/chrome/browser/extensions/activity_log/database_string_table_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/files/scoped_temp_dir.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/activity_log/database_string_table.h" @@ -39,13 +42,13 @@ TEST_F(DatabaseStringTableTest, Insert) { DatabaseStringTable table("test"); table.Initialize(&db_); - int64 id; + int64_t id; ASSERT_TRUE(table.StringToInt(&db_, "abc", &id)); sql::Statement query( db_.GetUniqueStatement("SELECT id FROM test WHERE value = 'abc'")); ASSERT_TRUE(query.Step()); - int64 raw_id = query.ColumnInt64(0); + int64_t raw_id = query.ColumnInt64(0); ASSERT_EQ(id, raw_id); } @@ -55,13 +58,13 @@ DatabaseStringTable table("test"); table.Initialize(&db_); - int64 id1; - int64 id2; + int64_t id1; + int64_t id2; ASSERT_TRUE(table.StringToInt(&db_, "string1", &id1)); ASSERT_TRUE(table.StringToInt(&db_, "string2", &id2)); ASSERT_NE(id1, id2); - int64 id1a; + int64_t id1a; ASSERT_TRUE(table.StringToInt(&db_, "string1", &id1a)); ASSERT_EQ(id1, id1a); } @@ -72,12 +75,12 @@ DatabaseStringTable table("test"); table.Initialize(&db_); - int64 id1; + int64_t id1; ASSERT_TRUE(table.StringToInt(&db_, "string1", &id1)); table.ClearCache(); - int64 id2; + int64_t id2; ASSERT_TRUE(table.StringToInt(&db_, "string1", &id2)); ASSERT_EQ(id1, id2); } @@ -88,19 +91,19 @@ DatabaseStringTable table("test"); table.Initialize(&db_); - int64 id1; + int64_t id1; ASSERT_TRUE(table.StringToInt(&db_, "modified", &id1)); ASSERT_TRUE( db_.Execute("UPDATE test SET id = id + 1 WHERE value = 'modified'")); - int64 id2; + int64_t id2; ASSERT_TRUE(table.StringToInt(&db_, "modified", &id2)); ASSERT_EQ(id1, id2); table.ClearCache(); - int64 id3; + int64_t id3; ASSERT_TRUE(table.StringToInt(&db_, "modified", &id3)); ASSERT_EQ(id1 + 1, id3); } @@ -117,7 +120,7 @@ TEST_F(DatabaseStringTableTest, Lookup) { DatabaseStringTable table("test"); table.Initialize(&db_); - int64 id; + int64_t id; ASSERT_TRUE(table.StringToInt(&db_, "abc", &id)); std::string value; @@ -141,7 +144,7 @@ transaction.Begin(); for (int i = 0; i < 2000; i++) { - int64 id; + int64_t id; ASSERT_TRUE(table.StringToInt(&db_, base::StringPrintf("value-%d", i), &id)); }
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc index 264973fe..2154a27 100644 --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
@@ -4,12 +4,15 @@ #include "chrome/browser/extensions/activity_log/fullstream_ui_policy.h" +#include <stddef.h> + #include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/activity_log/activity_action_constants.h" @@ -178,8 +181,8 @@ if (!arg_url.empty()) query.BindString(++i, arg_url + "%"); if (days_ago >= 0) { - int64 early_bound; - int64 late_bound; + int64_t early_bound; + int64_t late_bound; Util::ComputeDatabaseTimeBounds(Now(), days_ago, &early_bound, &late_bound); query.BindInt64(++i, early_bound); query.BindInt64(++i, late_bound); @@ -220,7 +223,8 @@ return actions.Pass(); } -void FullStreamUIPolicy::DoRemoveActions(const std::vector<int64>& action_ids) { +void FullStreamUIPolicy::DoRemoveActions( + const std::vector<int64_t>& action_ids) { if (action_ids.empty()) return; @@ -410,7 +414,7 @@ callback); } -void FullStreamUIPolicy::RemoveActions(const std::vector<int64>& action_ids) { +void FullStreamUIPolicy::RemoveActions(const std::vector<int64_t>& action_ids) { ScheduleAndForget(this, &FullStreamUIPolicy::DoRemoveActions, action_ids); }
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.h b/chrome/browser/extensions/activity_log/fullstream_ui_policy.h index f468e11..b4fa7bf 100644 --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.h +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_FULLSTREAM_UI_POLICY_H_ #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_FULLSTREAM_UI_POLICY_H_ +#include <stdint.h> + #include <string> #include "chrome/browser/extensions/activity_log/activity_database.h" @@ -41,7 +43,7 @@ void Close() override; // Remove the actions stored for this policy according to the passed IDs. - void RemoveActions(const std::vector<int64>& action_ids) override; + void RemoveActions(const std::vector<int64_t>& action_ids) override; // Clean the URL data stored for this policy. void RemoveURLs(const std::vector<GURL>& restrict_urls) override; @@ -78,7 +80,7 @@ // The implementation of RemoveActions; this must only run on the database // thread. - void DoRemoveActions(const std::vector<int64>& action_ids); + void DoRemoveActions(const std::vector<int64_t>& action_ids); // The implementation of RemoveURLs; this must only run on the database // thread.
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc index cea6b16..123eaea 100644 --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/cancelable_callback.h" #include "base/command_line.h" #include "base/location.h" @@ -13,6 +15,7 @@ #include "base/test/simple_test_clock.h" #include "base/test/test_timeouts.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/extensions/activity_log/activity_log.h" #include "chrome/browser/extensions/activity_log/fullstream_ui_policy.h" #include "chrome/browser/extensions/extension_service.h" @@ -291,9 +294,8 @@ // deletion. void CheckRemoveActions( ActivityLogDatabasePolicy* policy, - const std::vector<int64>& action_ids, + const std::vector<int64_t>& action_ids, const base::Callback<void(scoped_ptr<Action::ActionVector>)>& checker) { - // Use a mock clock to ensure that events are not recorded on the wrong day // when the test is run close to local midnight. base::SimpleTestClock* mock_clock = new base::SimpleTestClock(); @@ -1002,7 +1004,7 @@ ActivityLogDatabasePolicy* policy = new FullStreamUIPolicy(profile_.get()); policy->Init(); - std::vector<int64> action_ids; + std::vector<int64_t> action_ids; CheckRemoveActions(policy, action_ids,
diff --git a/chrome/browser/extensions/alert_apitest.cc b/chrome/browser/extensions/alert_apitest.cc index a4f99f02..718bc18e 100644 --- a/chrome/browser/extensions/alert_apitest.cc +++ b/chrome/browser/extensions/alert_apitest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc index 9874d85..47de71b 100644 --- a/chrome/browser/extensions/all_urls_apitest.cc +++ b/chrome/browser/extensions/all_urls_apitest.cc
@@ -3,6 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc index 2fffefd..fcbe071b 100644 --- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc +++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h" +#include <stddef.h> +#include <stdint.h> + #include "base/lazy_instance.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" @@ -181,8 +184,8 @@ EXTENSION_FUNCTION_VALIDATE(params.get()); // Put the arguments in the right format. - std::vector<int64> action_ids; - int64 value; + std::vector<int64_t> action_ids; + int64_t value; for (size_t i = 0; i < params->activity_ids.size(); i++) { if (base::StringToInt64(params->activity_ids[i], &value)) action_ids.push_back(value);
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h index f09c5c7..f665e9a 100644 --- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h +++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h
@@ -9,6 +9,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_ACTIVITY_LOG_PRIVATE_ACTIVITY_LOG_PRIVATE_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_ACTIVITY_LOG_PRIVATE_ACTIVITY_LOG_PRIVATE_API_H_ +#include "base/macros.h" #include "base/synchronization/lock.h" #include "chrome/browser/extensions/activity_log/activity_actions.h" #include "chrome/browser/extensions/activity_log/activity_log.h"
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc index 63cb765..a1947c2d 100644 --- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc +++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
@@ -4,6 +4,7 @@ #include <string> +#include "build/build_config.h" #include "chrome/browser/extensions/activity_log/activity_log.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/extensions/api/audio_modem/audio_modem_api.cc b/chrome/browser/extensions/api/audio_modem/audio_modem_api.cc index 8a1e4e25..99242ef5 100644 --- a/chrome/browser/extensions/api/audio_modem/audio_modem_api.cc +++ b/chrome/browser/extensions/api/audio_modem/audio_modem_api.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <map> #include <string> #include <vector>
diff --git a/chrome/browser/extensions/api/audio_modem/audio_modem_api.h b/chrome/browser/extensions/api/audio_modem/audio_modem_api.h index 77034b5..e5f0776 100644 --- a/chrome/browser/extensions/api/audio_modem/audio_modem_api.h +++ b/chrome/browser/extensions/api/audio_modem/audio_modem_api.h
@@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/extensions/api/audio_modem.h" #include "components/audio_modem/public/modem.h"
diff --git a/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc b/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc index 79b1735..e1032741 100644 --- a/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc +++ b/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/autofill_private/autofill_private_api.h" +#include <stddef.h> + #include "base/guid.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/autofill_private/autofill_private_apitest.cc b/chrome/browser/extensions/api/autofill_private/autofill_private_apitest.cc index 9c09abea..adb161b6 100644 --- a/chrome/browser/extensions/api/autofill_private/autofill_private_apitest.cc +++ b/chrome/browser/extensions/api/autofill_private/autofill_private_apitest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/extensions/api/autofill_private.h"
diff --git a/chrome/browser/extensions/api/autofill_private/autofill_private_event_router.h b/chrome/browser/extensions/api/autofill_private/autofill_private_event_router.h index 65be920..2c435ae 100644 --- a/chrome/browser/extensions/api/autofill_private/autofill_private_event_router.h +++ b/chrome/browser/extensions/api/autofill_private/autofill_private_event_router.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_AUTOFILL_PRIVATE_AUTOFILL_PRIVATE_EVENT_ROUTER_H_ #define CHROME_BROWSER_EXTENSIONS_API_AUTOFILL_PRIVATE_AUTOFILL_PRIVATE_EVENT_ROUTER_H_ +#include "base/macros.h" #include "components/autofill/core/browser/personal_data_manager_observer.h" #include "components/keyed_service/core/keyed_service.h" #include "extensions/browser/event_router.h"
diff --git a/chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.h b/chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.h index 837b2589..7870d8d 100644 --- a/chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.h +++ b/chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_AUTOFILL_PRIVATE_AUTOFILL_PRIVATE_EVENT_ROUTER_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_API_AUTOFILL_PRIVATE_AUTOFILL_PRIVATE_EVENT_ROUTER_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/api/autofill_private/autofill_util.cc b/chrome/browser/extensions/api/autofill_private/autofill_util.cc index 6492a3a..fcb30e0 100644 --- a/chrome/browser/extensions/api/autofill_private/autofill_util.cc +++ b/chrome/browser/extensions/api/autofill_private/autofill_util.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/autofill_private/autofill_util.h" +#include <stddef.h> + #include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc index d7a163ee..379ec41e 100644 --- a/chrome/browser/extensions/api/automation/automation_apitest.cc +++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
@@ -8,6 +8,7 @@ #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/automation_internal/automation_event_router.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/automation_internal/automation_action_adapter.h b/chrome/browser/extensions/api/automation_internal/automation_action_adapter.h index d3a6f1e..f620698 100644 --- a/chrome/browser/extensions/api/automation_internal/automation_action_adapter.h +++ b/chrome/browser/extensions/api/automation_internal/automation_action_adapter.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_AUTOMATION_INTERNAL_AUTOMATION_ACTION_ADAPTER_H_ #define CHROME_BROWSER_EXTENSIONS_API_AUTOMATION_INTERNAL_AUTOMATION_ACTION_ADAPTER_H_ +#include <stdint.h> + #include "ui/gfx/geometry/point.h" namespace extensions { @@ -13,24 +15,24 @@ class AutomationActionAdapter { public: // Performs a default action (e.g. click, check) on the target node. - virtual void DoDefault(int32 id) = 0; + virtual void DoDefault(int32_t id) = 0; // Performs a focus action on the target node. - virtual void Focus(int32 id) = 0; + virtual void Focus(int32_t id) = 0; // Makes the node visible by scrolling; does not change nodes from hidden to // shown. - virtual void MakeVisible(int32 id) = 0; + virtual void MakeVisible(int32_t id) = 0; // Sets selection for anchor and focus node/offset pairs. Also used to set // selection in text fields. - virtual void SetSelection(int32 anchor_id, - int32 anchor_offset, - int32 focus_id, - int32 focus_offset) = 0; + virtual void SetSelection(int32_t anchor_id, + int32_t anchor_offset, + int32_t focus_id, + int32_t focus_offset) = 0; // Shows the context menu resulting from a right click. - virtual void ShowContextMenu(int32 id) = 0; + virtual void ShowContextMenu(int32_t id) = 0; }; } // namespace extensions
diff --git a/chrome/browser/extensions/api/automation_internal/automation_event_router.cc b/chrome/browser/extensions/api/automation_internal/automation_event_router.cc index d3af41d..b7d3285 100644 --- a/chrome/browser/extensions/api/automation_internal/automation_event_router.cc +++ b/chrome/browser/extensions/api/automation_internal/automation_event_router.cc
@@ -10,6 +10,7 @@ #include "base/stl_util.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/extensions/api/automation_internal.h" #include "chrome/common/extensions/chrome_extension_messages.h"
diff --git a/chrome/browser/extensions/api/automation_internal/automation_event_router.h b/chrome/browser/extensions/api/automation_internal/automation_event_router.h index ff3ac1f3..21968fd 100644 --- a/chrome/browser/extensions/api/automation_internal/automation_event_router.h +++ b/chrome/browser/extensions/api/automation_internal/automation_event_router.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/singleton.h" #include "chrome/common/extensions/api/automation_internal.h" #include "content/public/browser/ax_event_notification_details.h"
diff --git a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc index 402cbcf6..8e997014 100644 --- a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc +++ b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/extensions/api/automation_internal/automation_internal_api.h" +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -161,23 +164,25 @@ virtual ~RenderFrameHostActionAdapter() {} // AutomationActionAdapter implementation. - void DoDefault(int32 id) override { rfh_->AccessibilityDoDefaultAction(id); } + void DoDefault(int32_t id) override { + rfh_->AccessibilityDoDefaultAction(id); + } - void Focus(int32 id) override { rfh_->AccessibilitySetFocus(id); } + void Focus(int32_t id) override { rfh_->AccessibilitySetFocus(id); } - void MakeVisible(int32 id) override { + void MakeVisible(int32_t id) override { rfh_->AccessibilityScrollToMakeVisible(id, gfx::Rect()); } - void SetSelection(int32 anchor_id, - int32 anchor_offset, - int32 focus_id, - int32 focus_offset) override { + void SetSelection(int32_t anchor_id, + int32_t anchor_offset, + int32_t focus_id, + int32_t focus_offset) override { rfh_->AccessibilitySetSelection(anchor_id, anchor_offset, focus_id, focus_offset); } - void ShowContextMenu(int32 id) override { + void ShowContextMenu(int32_t id) override { rfh_->AccessibilityShowContextMenu(id); } @@ -348,7 +353,7 @@ AutomationInternalPerformActionFunction::RouteActionToAdapter( api::automation_internal::PerformAction::Params* params, AutomationActionAdapter* adapter) { - int32 automation_id = params->args.automation_node_id; + int32_t automation_id = params->args.automation_node_id; switch (params->args.action_type) { case api::automation_internal::ACTION_TYPE_DODEFAULT: adapter->DoDefault(automation_id);
diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc index ebf771a..735e981 100644 --- a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc +++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc
@@ -6,6 +6,7 @@ #include "base/lazy_instance.h" #include "base/strings/string_number_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_util.h"
diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_apitest.cc b/chrome/browser/extensions/api/autotest_private/autotest_private_apitest.cc index ba8f3ad..3442d293 100644 --- a/chrome/browser/extensions/api/autotest_private/autotest_private_apitest.cc +++ b/chrome/browser/extensions/api/autotest_private/autotest_private_apitest.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 "chrome/browser/extensions/api/autotest_private/autotest_private_api.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_api_advertisement.h b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_api_advertisement.h index 6e545519..f353e54 100644 --- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_api_advertisement.h +++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_api_advertisement.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h" #include "device/bluetooth/bluetooth_advertisement.h" #include "extensions/browser/api/api_resource.h"
diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc index b448548..0e00931 100644 --- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc +++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
@@ -4,12 +4,15 @@ #include "chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.h" +#include <stdint.h> + #include <algorithm> #include "base/bind.h" #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_api_advertisement.h" #include "chrome/browser/extensions/api/bluetooth_low_energy/utils.h" #include "chrome/common/extensions/api/bluetooth_low_energy.h" @@ -616,7 +619,7 @@ apibtle::WriteCharacteristicValue::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get() != NULL); - std::vector<uint8> value(params->value.begin(), params->value.end()); + std::vector<uint8_t> value(params->value.begin(), params->value.end()); event_router->WriteCharacteristicValue( extension(), params->characteristic_id, @@ -807,7 +810,7 @@ apibtle::WriteDescriptorValue::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get() != NULL); - std::vector<uint8> value(params->value.begin(), params->value.end()); + std::vector<uint8_t> value(params->value.begin(), params->value.end()); event_router->WriteDescriptorValue( extension(), params->descriptor_id,
diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.h b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.h index 3d96f0d..9a00f7cf 100644 --- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.h +++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_BLUETOOTH_LOW_ENERGY_BLUETOOTH_LOW_ENERGY_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_BLUETOOTH_LOW_ENERGY_BLUETOOTH_LOW_ENERGY_API_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h" #include "chrome/browser/extensions/browser_context_keyed_service_factories.h"
diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc index 407922a..228155f2 100644 --- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc +++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.h" #include "chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h" @@ -65,7 +67,8 @@ BluetoothGattCharacteristic::PROPERTY_READ | BluetoothGattCharacteristic::PROPERTY_WRITE_WITHOUT_RESPONSE | BluetoothGattCharacteristic::PROPERTY_INDICATE; -const uint8 kTestCharacteristicDefaultValue0[] = {0x01, 0x02, 0x03, 0x04, 0x05}; +const uint8_t kTestCharacteristicDefaultValue0[] = {0x01, 0x02, 0x03, 0x04, + 0x05}; const char kTestCharacteristicId1[] = "char_id1"; const char kTestCharacteristicUuid1[] = "1212"; @@ -73,7 +76,7 @@ BluetoothGattCharacteristic::PROPERTY_READ | BluetoothGattCharacteristic::PROPERTY_WRITE | BluetoothGattCharacteristic::PROPERTY_NOTIFY; -const uint8 kTestCharacteristicDefaultValue1[] = {0x06, 0x07, 0x08}; +const uint8_t kTestCharacteristicDefaultValue1[] = {0x06, 0x07, 0x08}; const char kTestCharacteristicId2[] = "char_id2"; const char kTestCharacteristicUuid2[] = "1213"; @@ -83,11 +86,11 @@ // Test descriptor constants. const char kTestDescriptorId0[] = "desc_id0"; const char kTestDescriptorUuid0[] = "1221"; -const uint8 kTestDescriptorDefaultValue0[] = {0x01, 0x02, 0x03}; +const uint8_t kTestDescriptorDefaultValue0[] = {0x01, 0x02, 0x03}; const char kTestDescriptorId1[] = "desc_id1"; const char kTestDescriptorUuid1[] = "1222"; -const uint8 kTestDescriptorDefaultValue1[] = {0x04, 0x05}; +const uint8_t kTestDescriptorDefaultValue1[] = {0x04, 0x05}; class BluetoothLowEnergyApiTest : public ExtensionApiTest { public: @@ -146,7 +149,7 @@ // need to reflect what the characteristic is actually capable of, since // the JS API just passes values through from // device::BluetoothGattCharacteristic. - std::vector<uint8> default_value; + std::vector<uint8_t> default_value; chrc0_.reset(new testing::NiceMock<MockBluetoothGattCharacteristic>( service0_.get(), kTestCharacteristicId0, @@ -673,7 +676,7 @@ EXPECT_TRUE(listener.WaitUntilSatisfied()); - std::vector<uint8> value; + std::vector<uint8_t> value; event_router()->GattCharacteristicValueChanged( mock_adapter_, chrc0_.get(), value); event_router()->GattCharacteristicValueChanged( @@ -710,7 +713,7 @@ .Times(3) .WillRepeatedly(Return(chrc0_.get())); - std::vector<uint8> value; + std::vector<uint8_t> value; EXPECT_CALL(*chrc0_, ReadRemoteCharacteristic(_, _)) .Times(2) .WillOnce( @@ -752,7 +755,7 @@ .Times(3) .WillRepeatedly(Return(chrc0_.get())); - std::vector<uint8> write_value; + std::vector<uint8_t> write_value; EXPECT_CALL(*chrc0_, WriteRemoteCharacteristic(_, _, _)) .Times(2) .WillOnce( @@ -933,7 +936,7 @@ "bluetooth_low_energy/descriptor_value_changed"))); // Cause events to be sent to the extension. - std::vector<uint8> value; + std::vector<uint8_t> value; event_router()->GattDescriptorValueChanged( mock_adapter_, desc0_.get(), value); event_router()->GattDescriptorValueChanged( @@ -975,7 +978,7 @@ .Times(9) .WillRepeatedly(Return(desc0_.get())); - std::vector<uint8> value; + std::vector<uint8_t> value; EXPECT_CALL(*desc0_, ReadRemoteDescriptor(_, _)) .Times(8) .WillOnce( @@ -1035,7 +1038,7 @@ .Times(3) .WillRepeatedly(Return(desc0_.get())); - std::vector<uint8> write_value; + std::vector<uint8_t> write_value; EXPECT_CALL(*desc0_, WriteRemoteDescriptor(_, _, _)) .Times(2) .WillOnce( @@ -1115,7 +1118,7 @@ event_router()->GattCharacteristicAdded(mock_adapter_, chrc0_.get()); event_router()->GattDescriptorAdded(mock_adapter_, desc0_.get()); - std::vector<uint8> value; + std::vector<uint8_t> value; event_router()->GattCharacteristicValueChanged( mock_adapter_, chrc0_.get(), value); event_router()->GattDescriptorValueChanged( @@ -1293,7 +1296,7 @@ EXPECT_TRUE(listener.WaitUntilSatisfied()); - std::vector<uint8> value; + std::vector<uint8_t> value; event_router()->GattCharacteristicValueChanged( mock_adapter_, chrc0_.get(), value); event_router()->GattCharacteristicValueChanged(
diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_connection.h b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_connection.h index afdc5e0..0044ae5 100644 --- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_connection.h +++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_connection.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_BLUETOOTH_LOW_ENERGY_BLUETOOTH_LOW_ENERGY_CONNECTION_H_ #define CHROME_BROWSER_EXTENSIONS_API_BLUETOOTH_LOW_ENERGY_BLUETOOTH_LOW_ENERGY_CONNECTION_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "device/bluetooth/bluetooth_gatt_connection.h" #include "extensions/browser/api/api_resource.h"
diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc index eaa0564f..6050e698 100644 --- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc +++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc
@@ -101,7 +101,7 @@ PopulateCharacteristicProperties(characteristic->GetProperties(), &out->properties); - const std::vector<uint8>& value = characteristic->GetValue(); + const std::vector<uint8_t>& value = characteristic->GetValue(); if (value.empty()) return; @@ -118,7 +118,7 @@ PopulateCharacteristic(descriptor->GetCharacteristic(), &out->characteristic); - const std::vector<uint8>& value = descriptor->GetValue(); + const std::vector<uint8_t>& value = descriptor->GetValue(); if (value.empty()) return; @@ -611,7 +611,7 @@ void BluetoothLowEnergyEventRouter::WriteCharacteristicValue( const Extension* extension, const std::string& instance_id, - const std::vector<uint8>& value, + const std::vector<uint8_t>& value, const base::Closure& callback, const ErrorCallback& error_callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -785,7 +785,7 @@ void BluetoothLowEnergyEventRouter::WriteDescriptorValue( const Extension* extension, const std::string& instance_id, - const std::vector<uint8>& value, + const std::vector<uint8_t>& value, const base::Closure& callback, const ErrorCallback& error_callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -997,7 +997,7 @@ void BluetoothLowEnergyEventRouter::GattCharacteristicValueChanged( BluetoothAdapter* adapter, BluetoothGattCharacteristic* characteristic, - const std::vector<uint8>& value) { + const std::vector<uint8_t>& value) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(adapter, adapter_.get()); VLOG(2) << "GATT characteristic value changed: " @@ -1030,7 +1030,7 @@ void BluetoothLowEnergyEventRouter::GattDescriptorValueChanged( BluetoothAdapter* adapter, BluetoothGattDescriptor* descriptor, - const std::vector<uint8>& value) { + const std::vector<uint8_t>& value) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(adapter, adapter_.get()); VLOG(2) << "GATT descriptor value changed: " << descriptor->GetIdentifier(); @@ -1258,7 +1258,7 @@ void BluetoothLowEnergyEventRouter::OnValueSuccess( const base::Closure& callback, - const std::vector<uint8>& value) { + const std::vector<uint8_t>& value) { VLOG(2) << "Remote characteristic/descriptor value read successful."; callback.Run(); }
diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h index 98d7d64..70b7f27 100644 --- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h +++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h
@@ -5,12 +5,15 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_BLUETOOTH_LOW_ENERGY_BLUETOOTH_LOW_ENERGY_EVENT_ROUTER_H_ #define CHROME_BROWSER_EXTENSIONS_API_BLUETOOTH_LOW_ENERGY_BLUETOOTH_LOW_ENERGY_EVENT_ROUTER_H_ +#include <stdint.h> + #include <map> #include <set> #include <string> #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/common/extensions/api/bluetooth_low_energy.h" @@ -194,7 +197,7 @@ // failure. |extension| is the extension that made the call. void WriteCharacteristicValue(const Extension* extension, const std::string& instance_id, - const std::vector<uint8>& value, + const std::vector<uint8_t>& value, const base::Closure& callback, const ErrorCallback& error_callback); @@ -229,7 +232,7 @@ // failure. |extension| is the extension that made the call. void WriteDescriptorValue(const Extension* extension, const std::string& instance_id, - const std::vector<uint8>& value, + const std::vector<uint8_t>& value, const base::Closure& callback, const ErrorCallback& error_callback); @@ -266,10 +269,10 @@ void GattCharacteristicValueChanged( device::BluetoothAdapter* adapter, device::BluetoothGattCharacteristic* characteristic, - const std::vector<uint8>& value) override; + const std::vector<uint8_t>& value) override; void GattDescriptorValueChanged(device::BluetoothAdapter* adapter, device::BluetoothGattDescriptor* descriptor, - const std::vector<uint8>& value) override; + const std::vector<uint8_t>& value) override; device::BluetoothAdapter* adapter() { return adapter_.get(); } @@ -313,7 +316,7 @@ // Called by BluetoothGattCharacteristic and BluetoothGattDescriptor in // response to ReadRemoteCharacteristic and ReadRemoteDescriptor. void OnValueSuccess(const base::Closure& callback, - const std::vector<uint8>& value); + const std::vector<uint8_t>& value); // Called by BluetoothDevice in response to a call to CreateGattConnection. void OnCreateGattConnection(
diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_notify_session.h b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_notify_session.h index 8e2613e..47e2b862 100644 --- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_notify_session.h +++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_notify_session.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "device/bluetooth/bluetooth_gatt_notify_session.h" #include "extensions/browser/api/api_resource.h"
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index 14b2a4e..06ef3db2 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/lazy_instance.h" @@ -75,7 +78,7 @@ // This returns NULL in case of failure. const BookmarkNode* GetNodeFromString(BookmarkModel* model, const std::string& id_string) { - int64 id; + int64_t id; if (!base::StringToInt64(id_string, &id)) return NULL; return bookmarks::GetBookmarkNodeByID(model, id); @@ -799,7 +802,7 @@ BookmarkModel* model = GetBookmarkModel(); bookmarks::ManagedBookmarkService* managed = GetManagedBookmarkService(); bookmarks::ScopedGroupBookmarkActions group_deletes(model); - int64 id; + int64_t id; for (size_t i = 0; i < params->id_list.size(); ++i) { if (!GetBookmarkIdAsInt64(params->id_list[i], &id)) return false;
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h index a5d93d3..5d5ec36 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_BOOKMARK_MANAGER_PRIVATE_BOOKMARK_MANAGER_PRIVATE_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_BOOKMARK_MANAGER_PRIVATE_BOOKMARK_MANAGER_PRIVATE_API_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h"
diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc index e7a68184..17dd03d4 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc
@@ -124,7 +124,7 @@ bool RemoveNode(BookmarkModel* model, bookmarks::ManagedBookmarkService* managed, - int64 id, + int64_t id, bool recursive, std::string* error) { const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(model, id);
diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h index c1910b4..b7d7216 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h +++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h
@@ -5,10 +5,11 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_BOOKMARKS_BOOKMARK_API_HELPERS_H_ #define CHROME_BROWSER_EXTENSIONS_API_BOOKMARKS_BOOKMARK_API_HELPERS_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "chrome/common/extensions/api/bookmarks.h" namespace bookmarks { @@ -52,7 +53,7 @@ // Remove node of |id|. bool RemoveNode(bookmarks::BookmarkModel* model, bookmarks::ManagedBookmarkService* managed, - int64 id, + int64_t id, bool recursive, std::string* error);
diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc index c2e76c3..99fa275b 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h" +#include <stdint.h> + #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -144,7 +146,7 @@ } TEST_F(ExtensionBookmarksTest, RemoveNodeInvalidId) { - int64 invalid_id = model_->next_node_id(); + int64_t invalid_id = model_->next_node_id(); std::string error; EXPECT_FALSE(RemoveNode(model_, managed_, invalid_id, true, &error)); EXPECT_EQ(keys::kNoNodeError, error);
diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc b/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc index 03674f59..969a097 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc
@@ -4,6 +4,7 @@ #include "base/prefs/pref_service.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index 7096759..d03137c 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/file_path.h" #include "base/i18n/file_util_icu.h" @@ -19,6 +21,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_html_writer.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" @@ -116,7 +119,7 @@ } bool BookmarksFunction::GetBookmarkIdAsInt64(const std::string& id_string, - int64* id) { + int64_t* id) { if (base::StringToInt64(id_string, id)) return true; @@ -126,7 +129,7 @@ const BookmarkNode* BookmarksFunction::GetBookmarkNodeFromId( const std::string& id_string) { - int64 id; + int64_t id; if (!GetBookmarkIdAsInt64(id_string, &id)) return NULL; @@ -142,7 +145,7 @@ BookmarkModel* model, const CreateDetails& details, const BookmarkNode::MetaInfoMap* meta_info) { - int64 parentId; + int64_t parentId; if (!details.parent_id.get()) { // Optional, default to "other bookmarks". @@ -569,12 +572,12 @@ // static bool BookmarksRemoveFunction::ExtractIds(const base::ListValue* args, - std::list<int64>* ids, + std::list<int64_t>* ids, bool* invalid_id) { std::string id_string; if (!args->GetString(0, &id_string)) return false; - int64 id; + int64_t id; if (base::StringToInt64(id_string, &id)) ids->push_back(id); else @@ -590,7 +593,7 @@ bookmarks::Remove::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); - int64 id; + int64_t id; if (!GetBookmarkIdAsInt64(params->id, &id)) return false; @@ -628,7 +631,7 @@ // static bool BookmarksMoveFunction::ExtractIds(const base::ListValue* args, - std::list<int64>* ids, + std::list<int64_t>* ids, bool* invalid_id) { // For now, Move accepts ID parameters in the same way as an Update. return BookmarksUpdateFunction::ExtractIds(args, ids, invalid_id); @@ -657,7 +660,7 @@ // Optional, defaults to current parent. parent = node->parent(); } else { - int64 parentId; + int64_t parentId; if (!GetBookmarkIdAsInt64(*params->destination.parent_id, &parentId)) return false; @@ -689,7 +692,7 @@ // static bool BookmarksUpdateFunction::ExtractIds(const base::ListValue* args, - std::list<int64>* ids, + std::list<int64_t>* ids, bool* invalid_id) { // For now, Update accepts ID parameters in the same way as an Remove. return BookmarksRemoveFunction::ExtractIds(args, ids, invalid_id);
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h index f25e7ea..ea12948 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h
@@ -5,11 +5,14 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_BOOKMARKS_BOOKMARKS_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_BOOKMARKS_BOOKMARKS_API_H_ +#include <stdint.h> + #include <list> #include <string> #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "components/bookmarks/browser/base_bookmark_model_observer.h" @@ -138,10 +141,10 @@ // Helper to get the ManagedBookmarkService. bookmarks::ManagedBookmarkService* GetManagedBookmarkService(); - // Helper to get the bookmark id as int64 from the given string id. + // Helper to get the bookmark id as int64_t from the given string id. // Sets error_ to an error string if the given id string can't be parsed - // as an int64. In case of error, doesn't change id and returns false. - bool GetBookmarkIdAsInt64(const std::string& id_string, int64* id); + // as an int64_t. In case of error, doesn't change id and returns false. + bool GetBookmarkIdAsInt64(const std::string& id_string, int64_t* id); // Helper to get the bookmark node from a given string id. // If the given id can't be parsed or doesn't refer to a valid node, sets @@ -246,9 +249,9 @@ DECLARE_EXTENSION_FUNCTION("bookmarks.remove", BOOKMARKS_REMOVE) // Returns true on successful parse and sets invalid_id to true if conversion - // from id string to int64 failed. + // from id string to int64_t failed. static bool ExtractIds(const base::ListValue* args, - std::list<int64>* ids, + std::list<int64_t>* ids, bool* invalid_id); protected: @@ -282,7 +285,7 @@ DECLARE_EXTENSION_FUNCTION("bookmarks.move", BOOKMARKS_MOVE) static bool ExtractIds(const base::ListValue* args, - std::list<int64>* ids, + std::list<int64_t>* ids, bool* invalid_id); protected: @@ -297,7 +300,7 @@ DECLARE_EXTENSION_FUNCTION("bookmarks.update", BOOKMARKS_UPDATE) static bool ExtractIds(const base::ListValue* args, - std::list<int64>* ids, + std::list<int64_t>* ids, bool* invalid_id); protected:
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller.h b/chrome/browser/extensions/api/braille_display_private/braille_controller.h index a405e01..88c9b41 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_controller.h +++ b/chrome/browser/extensions/api/braille_display_private/braille_controller.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/common/extensions/api/braille_display_private.h"
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc index f1d7a846..531b5c34 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc +++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <cerrno> #include <cstring> @@ -11,6 +14,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/time/time.h" #include "chrome/browser/extensions/api/braille_display_private/brlapi_connection.h" #include "chrome/browser/extensions/api/braille_display_private/brlapi_keycode_map.h" @@ -26,10 +30,10 @@ namespace { // Delay between detecting a directory update and trying to connect // to the brlapi. -const int64 kConnectionDelayMs = 500; +const int64_t kConnectionDelayMs = 500; // How long to periodically retry connecting after a brltty restart. // Some displays are slow to connect. -const int64 kConnectRetryTimeout = 20000; +const int64_t kConnectRetryTimeout = 20000; } // namespace BrailleController::BrailleController() {
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h index 1cede70f..63f87ac 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h +++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h
@@ -7,6 +7,7 @@ #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/observer_list.h"
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc index 5a5ef77..69451e2 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc +++ b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h" #include "base/lazy_instance.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/braille_display_private/braille_controller.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc b/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc index dba4fe3f..ef922bf 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc +++ b/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc
@@ -6,6 +6,8 @@ #error This test requires brlapi. #endif +#include <stddef.h> + #include <deque> #include "base/bind.h"
diff --git a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc index 88f4c024..081b571 100644 --- a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc +++ b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc
@@ -6,8 +6,10 @@ #include <errno.h> +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/sys_info.h" +#include "build/build_config.h" namespace extensions { using base::MessageLoopForIO;
diff --git a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.h b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.h index 225ea01..a8efef55 100644 --- a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.h +++ b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.h
@@ -5,8 +5,10 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_BRAILLE_DISPLAY_PRIVATE_BRLAPI_CONNECTION_H_ #define CHROME_BROWSER_EXTENSIONS_API_BRAILLE_DISPLAY_PRIVATE_BRLAPI_CONNECTION_H_ -#include "base/basictypes.h" +#include <stddef.h> + #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "library_loaders/libbrlapi.h"
diff --git a/chrome/browser/extensions/api/braille_display_private/brlapi_keycode_map.cc b/chrome/browser/extensions/api/braille_display_private/brlapi_keycode_map.cc index ae19d8e..cc4469e5 100644 --- a/chrome/browser/extensions/api/braille_display_private/brlapi_keycode_map.cc +++ b/chrome/browser/extensions/api/braille_display_private/brlapi_keycode_map.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/braille_display_private/brlapi_keycode_map.h" +#include <stdint.h> + #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversion_utils.h" @@ -46,7 +48,7 @@ brlapi_keyCode_t key_sym = code & BRLAPI_KEY_CODE_MASK; if (key_sym < kMaxLatin1KeySym || (key_sym & BRLAPI_KEY_SYM_UNICODE) != 0) { - uint32 code_point = key_sym & ~BRLAPI_KEY_SYM_UNICODE; + uint32_t code_point = key_sym & ~BRLAPI_KEY_SYM_UNICODE; if (!base::IsValidCharacter(code_point)) return; event->standard_key_char.reset(new std::string);
diff --git a/chrome/browser/extensions/api/cast_devices_private/cast_devices_private_api.h b/chrome/browser/extensions/api/cast_devices_private/cast_devices_private_api.h index 7621d83..7f4da06 100644 --- a/chrome/browser/extensions/api/cast_devices_private/cast_devices_private_api.h +++ b/chrome/browser/extensions/api/cast_devices_private/cast_devices_private_api.h
@@ -9,6 +9,7 @@ #include "ash/cast_config_delegate.h" #include "base/callback_list.h" +#include "base/macros.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/extension_function.h"
diff --git a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc index 3e45141..4c18cb8 100644 --- a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc +++ b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc
@@ -2,12 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <cmath> #include <vector> #include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" @@ -254,10 +258,10 @@ // Scan from the bottom-right until the first non-black pixel is // encountered. for (int y = height - 1; y >= 0; --y) { - const uint8* const start = + const uint8_t* const start = frame->data(media::VideoFrame::kYPlane) + y * stride; - const uint8* const end = start + width; - for (const uint8* p = end - 1; p >= start; --p) { + const uint8_t* const end = start + width; + for (const uint8_t* p = end - 1; p >= start; --p) { if (*p > kNonBlackIntensityThreshold) { result.set_width(p - start + 1); result.set_height(y + 1); @@ -269,10 +273,10 @@ // Scan from the upper-left until the first non-black pixel is encountered. for (int y = 0; y < result.height(); ++y) { - const uint8* const start = + const uint8_t* const start = frame->data(media::VideoFrame::kYPlane) + y * stride; - const uint8* const end = start + result.width(); - for (const uint8* p = start; p < end; ++p) { + const uint8_t* const end = start + result.width(); + for (const uint8_t* p = start; p < end; ++p) { if (*p > kNonBlackIntensityThreshold) { result.set_x(p - start); result.set_width(result.width() - result.x()); @@ -287,13 +291,13 @@ return result; } - static uint8 ComputeMedianIntensityInRegionInPlane(const gfx::Rect& region, - int stride, - const uint8* data) { + static uint8_t ComputeMedianIntensityInRegionInPlane(const gfx::Rect& region, + int stride, + const uint8_t* data) { if (region.IsEmpty()) return 0; const size_t num_values = region.size().GetArea(); - scoped_ptr<uint8[]> values(new uint8[num_values]); + scoped_ptr<uint8_t[]> values(new uint8_t[num_values]); for (int y = 0; y < region.height(); ++y) { memcpy(values.get() + y * region.width(), data + (region.y() + y) * stride + region.x(),
diff --git a/chrome/browser/extensions/api/cast_streaming/performance_test.cc b/chrome/browser/extensions/api/cast_streaming/performance_test.cc index 1731cf20..fb5ea03 100644 --- a/chrome/browser/extensions/api/cast_streaming/performance_test.cc +++ b/chrome/browser/extensions/api/cast_streaming/performance_test.cc
@@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <map> #include <vector> -#include "base/basictypes.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/test/trace_event_analyzer.h" #include "base/time/default_tick_clock.h" @@ -97,13 +100,11 @@ // We log one of these for each call to OnAudioFrame/OnVideoFrame. struct TimeData { - TimeData(uint16 frame_no_, base::TimeTicks render_time_) : - frame_no(frame_no_), - render_time(render_time_) { - } + TimeData(uint16_t frame_no_, base::TimeTicks render_time_) + : frame_no(frame_no_), render_time(render_time_) {} // The unit here is video frames, for audio data there can be duplicates. // This was decoded from the actual audio/video data. - uint16 frame_no; + uint16_t frame_no; // This is when we should play this data, according to the sender. base::TimeTicks render_time; }; @@ -189,7 +190,7 @@ media::cast::GetDefaultVideoReceiverConfig()) { } - typedef std::map<uint16, base::TimeTicks> TimeMap; + typedef std::map<uint16_t, base::TimeTicks> TimeMap; // Build a map from frame ID (as encoded in the audio and video data) // to the rtp timestamp for that frame. Note that there will be multiple @@ -246,7 +247,7 @@ } // Note: This is the number of the video frame that this audio belongs to. - uint16 frame_no; + uint16_t frame_no; if (media::cast::DecodeTimestamp(audio_frame->channel(0), audio_frame->frames(), &frame_no)) { @@ -266,7 +267,7 @@ TRACE_EVENT_SCOPE_THREAD, "render_time", render_time.ToInternalValue()); - uint16 frame_no; + uint16_t frame_no; if (media::cast::test::DecodeBarcode(video_frame, &frame_no)) { video_events_.push_back(TimeData(frame_no, render_time)); } else {
diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.cc b/chrome/browser/extensions/api/chrome_extensions_api_client.cc index 33b72a8..8ef0522 100644 --- a/chrome/browser/extensions/api/chrome_extensions_api_client.cc +++ b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/files/file_path.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h" #include "chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h" #include "chrome/browser/extensions/api/declarative_content/default_content_predicate_evaluators.h"
diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.h b/chrome/browser/extensions/api/chrome_extensions_api_client.h index 92bb4506..c12603e 100644 --- a/chrome/browser/extensions/api/chrome_extensions_api_client.h +++ b/chrome/browser/extensions/api/chrome_extensions_api_client.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_API_CHROME_EXTENSIONS_API_CLIENT_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "extensions/browser/api/extensions_api_client.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc index 0fdf5f30..47dc897 100644 --- a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc +++ b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc
@@ -4,7 +4,9 @@ #include "chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/extensions/api/commands/command_service.h b/chrome/browser/extensions/api/commands/command_service.h index d3b6c63..f1d5131 100644 --- a/chrome/browser/extensions/api/commands/command_service.h +++ b/chrome/browser/extensions/api/commands/command_service.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/observer_list.h" #include "base/scoped_observer.h" #include "chrome/common/extensions/command.h"
diff --git a/chrome/browser/extensions/api/commands/command_service_browsertest.cc b/chrome/browser/extensions/api/commands/command_service_browsertest.cc index a53a584..4d560697 100644 --- a/chrome/browser/extensions/api/commands/command_service_browsertest.cc +++ b/chrome/browser/extensions/api/commands/command_service_browsertest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/prefs/scoped_user_pref_update.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/commands/command_service.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc index 62f75e2b..8d5558d 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
@@ -7,6 +7,7 @@ #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/content_settings/cookie_settings_factory.h"
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_custom_extension_provider.h b/chrome/browser/extensions/api/content_settings/content_settings_custom_extension_provider.h index f34346e..fca10f7 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_custom_extension_provider.h +++ b/chrome/browser/extensions/api/content_settings/content_settings_custom_extension_provider.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/api/content_settings/content_settings_store.h" #include "components/content_settings/core/browser/content_settings_observable_provider.h"
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc index 362c3d97..915f534 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h" -#include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "components/content_settings/core/browser/website_settings_info.h"
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_service.h b/chrome/browser/extensions/api/content_settings/content_settings_service.h index 2b7b3e3..c8a2b718 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_service.h +++ b/chrome/browser/extensions/api/content_settings/content_settings_service.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_SERVICE_H_ #define CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_SERVICE_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/extension_prefs_observer.h"
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store.h b/chrome/browser/extensions/api/content_settings/content_settings_store.h index c40df85d..0baf96c 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_store.h +++ b/chrome/browser/extensions/api/content_settings/content_settings_store.h
@@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "base/synchronization/lock.h"
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc b/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc index 57b5e1a..b586c4e5 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/content_settings/content_settings_store.h" +#include <stdint.h> + #include "base/memory/scoped_ptr.h" #include "components/content_settings/core/browser/content_settings_rule.h" #include "components/content_settings/core/browser/content_settings_utils.h" @@ -37,7 +39,7 @@ } private: - int64 internal_; + int64_t internal_; }; class MockContentSettingsStoreObserver
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_unittest.cc b/chrome/browser/extensions/api/content_settings/content_settings_unittest.cc index b81f8235..692e75f6 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_unittest.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/macros.h" #include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/extensions/api/context_menus/context_menus_api_helpers.cc b/chrome/browser/extensions/api/context_menus/context_menus_api_helpers.cc index 0a4b4dd..6da2221 100644 --- a/chrome/browser/extensions/api/context_menus/context_menus_api_helpers.cc +++ b/chrome/browser/extensions/api/context_menus/context_menus_api_helpers.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/context_menus/context_menus_api_helpers.h" +#include <stddef.h> + #include "base/strings/string_number_conversions.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/cookies/cookies_api.h b/chrome/browser/extensions/api/cookies/cookies_api.h index 0ee1180..1fe93da 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.h +++ b/chrome/browser/extensions/api/cookies/cookies_api.h
@@ -11,6 +11,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/chrome_extension_function.h"
diff --git a/chrome/browser/extensions/api/cookies/cookies_helpers.cc b/chrome/browser/extensions/api/cookies/cookies_helpers.cc index f22fc7d..67d8356 100644 --- a/chrome/browser/extensions/api/cookies/cookies_helpers.cc +++ b/chrome/browser/extensions/api/cookies/cookies_helpers.cc
@@ -6,6 +6,8 @@ #include "chrome/browser/extensions/api/cookies/cookies_helpers.h" +#include <stddef.h> + #include <vector> #include "base/logging.h"
diff --git a/chrome/browser/extensions/api/cookies/cookies_unittest.cc b/chrome/browser/extensions/api/cookies/cookies_unittest.cc index cbb4cc2..ad3d8e9 100644 --- a/chrome/browser/extensions/api/cookies/cookies_unittest.cc +++ b/chrome/browser/extensions/api/cookies/cookies_unittest.cc
@@ -7,6 +7,9 @@ #include "testing/gtest/include/gtest/gtest.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/extensions/api/cookies/cookies_api_constants.h" #include "chrome/browser/extensions/api/cookies/cookies_helpers.h"
diff --git a/chrome/browser/extensions/api/copresence_private/copresence_private_api.cc b/chrome/browser/extensions/api/copresence_private/copresence_private_api.cc index 96cdc14..63df1d2 100644 --- a/chrome/browser/extensions/api/copresence_private/copresence_private_api.cc +++ b/chrome/browser/extensions/api/copresence_private/copresence_private_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/copresence_private/copresence_private_api.h" +#include <stddef.h> + #include <map> #include <string> #include <vector>
diff --git a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc index d16fdb4a..d3a4ea2e4 100644 --- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc +++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.h" +#include <stddef.h> + #include "extensions/common/error_utils.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
diff --git a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.h b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.h index 845d894a..e7b4b2f 100644 --- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.h +++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/chrome_extension_function_details.h" #include "chrome/common/extensions/api/cryptotoken_private.h"
diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc index bfa4cdc..efeef36 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc
@@ -6,6 +6,8 @@ #include "chrome/browser/extensions/api/debugger/debugger_api.h" +#include <stddef.h> + #include <map> #include <set> @@ -14,6 +16,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/scoped_observer.h"
diff --git a/chrome/browser/extensions/api/debugger/debugger_apitest.cc b/chrome/browser/extensions/api/debugger/debugger_apitest.cc index ff15fa0..f8ea115a 100644 --- a/chrome/browser/extensions/api/debugger/debugger_apitest.cc +++ b/chrome/browser/extensions/api/debugger/debugger_apitest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <string> #include <utility>
diff --git a/chrome/browser/extensions/api/declarative/declarative_apitest.cc b/chrome/browser/extensions/api/declarative/declarative_apitest.cc index 0131758..c64f21b 100644 --- a/chrome/browser/extensions/api/declarative/declarative_apitest.cc +++ b/chrome/browser/extensions/api/declarative/declarative_apitest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h"
diff --git a/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc b/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc index 0f0d942c..63b3c2f 100644 --- a/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc +++ b/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc
@@ -4,6 +4,8 @@ #include "extensions/browser/api/declarative/rules_registry_service.h" +#include <stddef.h> + #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc index cd6b3f9..896a1099 100644 --- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc +++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h" #include "base/bind.h" +#include "base/macros.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/declarative_content/content_constants.h" #include "chrome/browser/extensions/extension_util.h"
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h index d2aa9107..f1c6714 100644 --- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h +++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CHROME_CONTENT_RULES_REGISTRY_H_ #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CHROME_CONTENT_RULES_REGISTRY_H_ +#include <stddef.h> + #include <map> #include <set> #include <string> @@ -12,6 +14,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/declarative_content/content_action.h"
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc index e392baf..4e119ea 100644 --- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc +++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h" #include "base/bind.h" +#include "base/macros.h" #include "base/test/values_test_util.h" #include "chrome/browser/extensions/api/declarative_content/content_predicate.h" #include "chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h"
diff --git a/chrome/browser/extensions/api/declarative_content/content_action.cc b/chrome/browser/extensions/api/declarative_content/content_action.cc index 56cfc26..42f91b6 100644 --- a/chrome/browser/extensions/api/declarative_content/content_action.cc +++ b/chrome/browser/extensions/api/declarative_content/content_action.cc
@@ -7,6 +7,7 @@ #include <map> #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/browser/extensions/api/declarative_content/content_constants.h"
diff --git a/chrome/browser/extensions/api/declarative_content/content_action.h b/chrome/browser/extensions/api/declarative_content/content_action.h index 625a1ca..d26cd301 100644 --- a/chrome/browser/extensions/api/declarative_content/content_action.h +++ b/chrome/browser/extensions/api/declarative_content/content_action.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "extensions/browser/declarative_user_script_master.h" #include "extensions/common/user_script.h"
diff --git a/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc b/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc index ccb1e49..7206ed4e 100644 --- a/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc +++ b/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/declarative_content/content_action.h" +#include <stdint.h> + #include "base/base64.h" #include "base/run_loop.h" #include "base/test/values_test_util.h"
diff --git a/chrome/browser/extensions/api/declarative_content/content_condition.h b/chrome/browser/extensions/api/declarative_content/content_condition.h index baefed6..9d19507 100644 --- a/chrome/browser/extensions/api/declarative_content/content_condition.h +++ b/chrome/browser/extensions/api/declarative_content/content_condition.h
@@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h"
diff --git a/chrome/browser/extensions/api/declarative_content/content_condition_unittest.cc b/chrome/browser/extensions/api/declarative_content/content_condition_unittest.cc index 3f8413f3..defc3af 100644 --- a/chrome/browser/extensions/api/declarative_content/content_condition_unittest.cc +++ b/chrome/browser/extensions/api/declarative_content/content_condition_unittest.cc
@@ -7,6 +7,7 @@ #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/test/values_test_util.h" #include "base/values.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc index 3fde51d..17f89b1 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
@@ -4,8 +4,10 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.h b/chrome/browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.h index 029706a9..7656f3a 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.h +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_condition_tracker_test.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_DECLARATIVE_CONTENT_CONDITION_TRACKER_TEST_H_ #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_DECLARATIVE_CONTENT_CONDITION_TRACKER_TEST_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/browser_context.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.cc index bda1d58..489d02a 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.cc +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h" +#include <stddef.h> + #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h index d7a3ae5..76317ff4 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h
@@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker_unittest.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker_unittest.cc index a2cda6a4..53f163d 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker_unittest.cc +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/values_test_util.h" #include "chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h b/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h index a614364..e020d664 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h
@@ -8,6 +8,7 @@ #include <map> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker_unittest.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker_unittest.cc index 72aaf17..b5a4333 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker_unittest.cc +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker_unittest.cc
@@ -8,6 +8,7 @@ #include <utility> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.h b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.h index 2bf8b31f..10d2060 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.h +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.h
@@ -9,6 +9,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc index 54d043f..ef84150 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc
@@ -7,6 +7,7 @@ #include <set> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/stl_util.h" #include "base/test/values_test_util.h"
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc index 9053ec1..8ba4598 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
@@ -4,8 +4,11 @@ #include "extensions/browser/api/declarative_webrequest/webrequest_action.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc index 8da1830..06cd44532 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
@@ -4,11 +4,13 @@ #include "extensions/browser/api/declarative_webrequest/webrequest_rules_registry.h" +#include <stddef.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc index 1edc60c..d6e026d 100644 --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
@@ -5,9 +5,11 @@ #include <queue> #include "base/command_line.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/media/fake_desktop_media_list.h"
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc index a15e8fb..01a8438f 100644 --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
@@ -7,6 +7,7 @@ #include <tuple> #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/media/desktop_media_list_ash.h" #include "chrome/browser/media/desktop_streams_registry.h"
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h index 92ea6cd..0d08a00b 100644 --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h
@@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/singleton.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/media/desktop_media_list.h"
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index 190170d..a0dd649 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/developer_private/developer_private_api.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/file_util.h" #include "base/lazy_instance.h"
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h index 41fe433..7a72f76a 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.h +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h
@@ -8,6 +8,7 @@ #include <set> #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/scoped_observer.h"
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc b/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc index 407d9733..9dd6402 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc
@@ -5,6 +5,7 @@ #include <utility> #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/developer_private/developer_private_api.h"
diff --git a/chrome/browser/extensions/api/developer_private/entry_picker.h b/chrome/browser/extensions/api/developer_private/entry_picker.h index da4421c..36be5fc 100644 --- a/chrome/browser/extensions/api/developer_private/entry_picker.h +++ b/chrome/browser/extensions/api/developer_private/entry_picker.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_DEVELOPER_PRIVATE_ENTRY_PICKER_H_ #define CHROME_BROWSER_EXTENSIONS_API_DEVELOPER_PRIVATE_ENTRY_PICKER_H_ +#include "base/macros.h" #include "extensions/browser/extension_function.h" #include "ui/shell_dialogs/select_file_dialog.h"
diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.h b/chrome/browser/extensions/api/developer_private/extension_info_generator.h index 51d8c91a..2b82e4b 100644 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.h +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.h
@@ -5,7 +5,10 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_DEVELOPER_PRIVATE_EXTENSION_INFO_GENERATOR_H_ #define CHROME_BROWSER_EXTENSIONS_API_DEVELOPER_PRIVATE_EXTENSION_INFO_GENERATOR_H_ +#include <stddef.h> + #include "base/callback.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/common/extensions/api/developer_private.h"
diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc index fcbb23f..6264141b 100644 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc
@@ -6,8 +6,10 @@ #include "base/json/json_file_value_serializer.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/developer_private/extension_info_generator.h" #include "chrome/browser/extensions/api/developer_private/inspectable_views_finder.h" #include "chrome/browser/extensions/error_console/error_console.h"
diff --git a/chrome/browser/extensions/api/developer_private/show_permissions_dialog_helper.h b/chrome/browser/extensions/api/developer_private/show_permissions_dialog_helper.h index 474eb37..40bc916f 100644 --- a/chrome/browser/extensions/api/developer_private/show_permissions_dialog_helper.h +++ b/chrome/browser/extensions/api/developer_private/show_permissions_dialog_helper.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_API_DEVELOPER_PRIVATE_SHOW_PERMISSIONS_DIALOG_HELPER_H_ #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_install_prompt.h"
diff --git a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc index 468aa5c4..92e10f68 100644 --- a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc +++ b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
@@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/values_test_util.h" +#include "build/build_config.h" #include "chrome/browser/extensions/test_extension_environment.h" #include "chrome/test/base/testing_profile.h" #include "device/core/mock_device_client.h" @@ -60,17 +63,19 @@ device3_ = new MockUsbDevice(0, 0, "Test Manufacturer", "Test Product", ""); device4_ = new HidDeviceInfo(kTestDeviceIds[0], 0, 0, "Test HID Device", "abcde", - device::kHIDBusTypeUSB, std::vector<uint8>()); + device::kHIDBusTypeUSB, std::vector<uint8_t>()); device_client_.hid_service()->AddDevice(device4_); - device5_ = new HidDeviceInfo(kTestDeviceIds[1], 0, 0, "Test HID Device", "", - device::kHIDBusTypeUSB, std::vector<uint8>()); + device5_ = + new HidDeviceInfo(kTestDeviceIds[1], 0, 0, "Test HID Device", "", + device::kHIDBusTypeUSB, std::vector<uint8_t>()); device_client_.hid_service()->AddDevice(device5_); device6_ = new HidDeviceInfo(kTestDeviceIds[2], 0, 0, "Test HID Device", "67890", - device::kHIDBusTypeUSB, std::vector<uint8>()); + device::kHIDBusTypeUSB, std::vector<uint8_t>()); device_client_.hid_service()->AddDevice(device6_); - device7_ = new HidDeviceInfo(kTestDeviceIds[3], 0, 0, "Test HID Device", "", - device::kHIDBusTypeUSB, std::vector<uint8>()); + device7_ = + new HidDeviceInfo(kTestDeviceIds[3], 0, 0, "Test HID Device", "", + device::kHIDBusTypeUSB, std::vector<uint8_t>()); device_client_.hid_service()->AddDevice(device7_); device_client_.hid_service()->FirstEnumerationComplete(); }
diff --git a/chrome/browser/extensions/api/dial/dial_api.cc b/chrome/browser/extensions/api/dial/dial_api.cc index cc9f1c61..daae99f 100644 --- a/chrome/browser/extensions/api/dial/dial_api.cc +++ b/chrome/browser/extensions/api/dial/dial_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/dial/dial_api.h" +#include <stddef.h> + #include <vector> #include "base/time/time.h"
diff --git a/chrome/browser/extensions/api/dial/dial_api.h b/chrome/browser/extensions/api/dial/dial_api.h index 51f0f55..66351f6 100644 --- a/chrome/browser/extensions/api/dial/dial_api.h +++ b/chrome/browser/extensions/api/dial/dial_api.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_API_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/dial/dial_device_data.h" #include "chrome/browser/extensions/api/dial/dial_registry.h"
diff --git a/chrome/browser/extensions/api/dial/dial_api_factory.h b/chrome/browser/extensions/api/dial/dial_api_factory.h index f965126..1a51f25 100644 --- a/chrome/browser/extensions/api/dial/dial_api_factory.h +++ b/chrome/browser/extensions/api/dial/dial_api_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_API_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_API_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/api/dial/dial_apitest.cc b/chrome/browser/extensions/api/dial/dial_apitest.cc index c4f20f1b..73ef7ab 100644 --- a/chrome/browser/extensions/api/dial/dial_apitest.cc +++ b/chrome/browser/extensions/api/dial/dial_apitest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/dial/dial_api.h" #include "chrome/browser/extensions/api/dial/dial_api_factory.h" #include "chrome/browser/extensions/api/dial/dial_registry.h"
diff --git a/chrome/browser/extensions/api/dial/dial_registry.h b/chrome/browser/extensions/api/dial/dial_registry.h index 613fcd4..f5040228 100644 --- a/chrome/browser/extensions/api/dial/dial_registry.h +++ b/chrome/browser/extensions/api/dial/dial_registry.h
@@ -5,13 +5,15 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_REGISTRY_H_ #define CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_REGISTRY_H_ +#include <stddef.h> + #include <map> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h"
diff --git a/chrome/browser/extensions/api/dial/dial_registry_unittest.cc b/chrome/browser/extensions/api/dial/dial_registry_unittest.cc index 69dd839..e6fd99a 100644 --- a/chrome/browser/extensions/api/dial/dial_registry_unittest.cc +++ b/chrome/browser/extensions/api/dial/dial_registry_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/compiler_specific.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/extensions/api/dial/dial_device_data.h"
diff --git a/chrome/browser/extensions/api/dial/dial_service.cc b/chrome/browser/extensions/api/dial/dial_service.cc index f05ba53..e6d25bd 100644 --- a/chrome/browser/extensions/api/dial/dial_service.cc +++ b/chrome/browser/extensions/api/dial/dial_service.cc
@@ -4,11 +4,12 @@ #include "chrome/browser/extensions/api/dial/dial_service.h" +#include <stdint.h> + #include <algorithm> #include <set> #include <utility> -#include "base/basictypes.h" #include "base/callback.h" #include "base/location.h" #include "base/logging.h" @@ -18,6 +19,7 @@ #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/dial/dial_device_data.h" #include "components/version_info/version_info.h" #include "content/public/browser/browser_thread.h" @@ -68,7 +70,7 @@ const char kDialRequestAddress[] = "239.255.255.250"; // The UDP port number for discovery. -const uint16 kDialRequestPort = 1900; +const uint16_t kDialRequestPort = 1900; // The DIAL service type as part of the search request. const char kDialSearchType[] = "urn:dial-multiscreen-org:service:dial:1"; @@ -461,7 +463,7 @@ void DialServiceImpl::SendNetworkList(const NetworkInterfaceList& networks) { DCHECK(thread_checker_.CalledOnValidThread()); - typedef std::pair<uint32, net::AddressFamily> InterfaceIndexAddressFamily; + typedef std::pair<uint32_t, net::AddressFamily> InterfaceIndexAddressFamily; std::set<InterfaceIndexAddressFamily> interface_index_addr_family_seen; std::vector<IPAddressNumber> ip_addresses;
diff --git a/chrome/browser/extensions/api/dial/dial_service.h b/chrome/browser/extensions/api/dial/dial_service.h index 9b69260..90df700 100644 --- a/chrome/browser/extensions/api/dial/dial_service.h +++ b/chrome/browser/extensions/api/dial/dial_service.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/extensions/api/dial/dial_service_unittest.cc b/chrome/browser/extensions/api/dial/dial_service_unittest.cc index f00edbb..654a3c7 100644 --- a/chrome/browser/extensions/api/dial/dial_service_unittest.cc +++ b/chrome/browser/extensions/api/dial/dial_service_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index 47177579..8f7e2b94 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -4,10 +4,12 @@ #include "chrome/browser/extensions/api/downloads/downloads_api.h" +#include <stddef.h> +#include <stdint.h> + #include <set> #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" @@ -17,6 +19,7 @@ #include "base/lazy_instance.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram.h" #include "base/single_thread_task_runner.h" @@ -28,6 +31,7 @@ #include "base/task/cancelable_task_tracker.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_danger_prompt.h" #include "chrome/browser/download/download_file_icon_extractor.h" @@ -1093,7 +1097,7 @@ for (DownloadManager::DownloadVector::const_iterator it = results.begin(); it != results.end(); ++it) { DownloadItem* download_item = *it; - uint32 download_id = download_item->GetId(); + uint32_t download_id = download_item->GetId(); bool off_record = ((incognito_manager != NULL) && (incognito_manager->GetDownload(download_id) != NULL)); scoped_ptr<base::DictionaryValue> json_item(
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/browser/extensions/api/downloads/downloads_api.h index 6d514a7..ae69cffa 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.h +++ b/chrome/browser/extensions/api/downloads/downloads_api.h
@@ -9,6 +9,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "base/time/time.h" #include "chrome/browser/download/all_download_item_notifier.h"
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc index 6f78404..fa2e4332 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
@@ -5,16 +5,21 @@ // Disable everything on windows only. http://crbug.com/306144 #ifndef OS_WIN +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" +#include "build/build_config.h" #include "chrome/browser/download/download_file_icon_extractor.h" #include "chrome/browser/download/download_service.h" #include "chrome/browser/download/download_service_factory.h" @@ -1114,7 +1119,7 @@ ASSERT_TRUE(result_list->GetDictionary(0, &item_value)); int item_id = -1; ASSERT_TRUE(item_value->GetInteger("id", &item_id)); - ASSERT_EQ(all_downloads[0]->GetId(), static_cast<uint32>(item_id)); + ASSERT_EQ(all_downloads[0]->GetId(), static_cast<uint32_t>(item_id)); } // Test the |id| parameter for search(). @@ -1142,7 +1147,7 @@ ASSERT_TRUE(result_list->GetDictionary(0, &item_value)); int item_id = -1; ASSERT_TRUE(item_value->GetInteger("id", &item_id)); - ASSERT_EQ(items[0]->GetId(), static_cast<uint32>(item_id)); + ASSERT_EQ(items[0]->GetId(), static_cast<uint32_t>(item_id)); } // Test specifying both the |id| and |filename| parameters for search(). @@ -1233,7 +1238,7 @@ items[1]->GetTargetFilePath().value()); // The order of results when orderBy is empty is unspecified. When there are // no sorters, DownloadQuery does not call sort(), so the order of the results - // depends on the order of the items in base::hash_map<uint32,...> + // depends on the order of the items in base::hash_map<uint32_t,...> // DownloadManagerImpl::downloads_, which is unspecified and differs between // libc++ and libstdc++. http://crbug.com/365334 }
diff --git a/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.h b/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.h index 5dc2448..f7da2b58 100644 --- a/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.h +++ b/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_DOWNLOADS_INTERNAL_DOWNLOADS_INTERNAL_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_DOWNLOADS_INTERNAL_DOWNLOADS_INTERNAL_API_H_ +#include "base/macros.h" #include "chrome/browser/extensions/chrome_extension_function.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc index 08d0005..02fe41d1 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
@@ -18,6 +18,7 @@ #include "base/time/time.h" #include "base/timer/timer.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection_manager.h" #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h index 347c6606..23c964a 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h
@@ -5,9 +5,11 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_EASY_UNLOCK_PRIVATE_EASY_UNLOCK_PRIVATE_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_EASY_UNLOCK_PRIVATE_EASY_UNLOCK_PRIVATE_API_H_ +#include <stddef.h> + #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "device/bluetooth/bluetooth_device.h" #include "extensions/browser/api/bluetooth/bluetooth_extension_function.h"
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc index fc1c8c8..9713bf8 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h"
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection.h b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection.h index 5c4b431..42269c41 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection.h +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_EASY_UNLOCK_PRIVATE_EASY_UNLOCK_PRIVATE_CONNECTION_H_ #define CHROME_BROWSER_EXTENSIONS_API_EASY_UNLOCK_PRIVATE_EASY_UNLOCK_PRIVATE_CONNECTION_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "extensions/browser/api/api_resource.h" #include "extensions/browser/api/api_resource_manager.h"
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection_manager.h b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection_manager.h index a0ca893a..f7a0aa7b 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection_manager.h +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection_manager.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection.h" #include "chrome/common/extensions/api/easy_unlock_private.h"
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc index c7f63ae..62df6c8 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate.h" +#include "base/macros.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/easy_unlock_client.h" #include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.cc index 4269511..879c503 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.cc +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.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 "base/macros.h" #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc index acbdb81..130288da 100644 --- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc +++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include <cryptohi.h> +#include <stddef.h> #include "base/macros.h" #include "base/memory/scoped_ptr.h"
diff --git a/chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h b/chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h index df2f3fc..398b0c4 100644 --- a/chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h +++ b/chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_EXPERIENCE_SAMPLING_PRIVATE_EXPERIENCE_SAMPLING_H_ #define CHROME_BROWSER_EXTENSIONS_API_EXPERIENCE_SAMPLING_PRIVATE_EXPERIENCE_SAMPLING_H_ +#include "base/macros.h" #include "chrome/common/extensions/api/experience_sampling_private.h" namespace content {
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc index 5a174ce..4426fa7b 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "base/macros.h" #include "build/build_config.h" #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" #include "chrome/browser/extensions/browser_action_test_util.h"
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc index 66cfc28..5387534be 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.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 "chrome/browser/extensions/browser_action_test_util.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h"
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc index 213c6d5..eb0660779 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc +++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" +#include <stddef.h> + #include "base/lazy_instance.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/thread_task_runner_handle.h"
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.h b/chrome/browser/extensions/api/extension_action/extension_action_api.h index 079b890..97f5a71 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_api.h +++ b/chrome/browser/extensions/api/extension_action/extension_action_api.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/observer_list.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/extensions/extension_action.h"
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc b/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc index 6925b98e..d307196 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc +++ b/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc
@@ -5,6 +5,7 @@ #include <string> #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc index 4a6f81e..b0ce1d99 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
@@ -5,12 +5,14 @@ #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/statistics_recorder.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/feedback_private/feedback_service.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_apitest.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_apitest.cc index f6089814d..2ab4183 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_private_apitest.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_private_apitest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service.cc b/chrome/browser/extensions/api/feedback_private/feedback_service.cc index f4c09b6..33efea8a 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_service.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_service.cc
@@ -70,7 +70,7 @@ } void FeedbackService::AttachedFileCallback(scoped_ptr<std::string> data, - int64 /* total_blob_length */) { + int64_t /* total_blob_length */) { feedback_data_->set_attached_file_uuid(std::string()); if (data) feedback_data_->AttachAndCompressFileData(data.Pass()); @@ -79,7 +79,7 @@ } void FeedbackService::ScreenshotCallback(scoped_ptr<std::string> data, - int64 /* total_blob_length */) { + int64_t /* total_blob_length */) { feedback_data_->set_screenshot_uuid(std::string()); if (data) feedback_data_->set_image(data.Pass());
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service.h b/chrome/browser/extensions/api/feedback_private/feedback_service.h index d22633a..9588c534 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_service.h +++ b/chrome/browser/extensions/api/feedback_private/feedback_service.h
@@ -5,9 +5,11 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_FEEDBACK_PRIVATE_FEEDBACK_SERVICE_H_ #define CHROME_BROWSER_EXTENSIONS_API_FEEDBACK_PRIVATE_FEEDBACK_SERVICE_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/blob_reader.h" @@ -47,9 +49,9 @@ private: // Callbacks to receive blob data. void AttachedFileCallback(scoped_ptr<std::string> data, - int64 total_blob_length); + int64_t total_blob_length); void ScreenshotCallback(scoped_ptr<std::string> data, - int64 total_blob_length); + int64_t total_blob_length); // Checks if we have read all the blobs we need to; signals the feedback // data object once all the requisite data has been populated.
diff --git a/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc b/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc index 0721411..9132be8 100644 --- a/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc +++ b/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc
@@ -7,6 +7,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "build/build_config.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" #include "extensions/browser/extension_prefs.h"
diff --git a/chrome/browser/extensions/api/file_handlers/mime_util.cc b/chrome/browser/extensions/api/file_handlers/mime_util.cc index 76c0534..862eaba 100644 --- a/chrome/browser/extensions/api/file_handlers/mime_util.cc +++ b/chrome/browser/extensions/api/file_handlers/mime_util.cc
@@ -7,6 +7,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" #include "net/base/filename_util.h"
diff --git a/chrome/browser/extensions/api/file_handlers/mime_util.h b/chrome/browser/extensions/api/file_handlers/mime_util.h index e1bc248..2f1e7c69 100644 --- a/chrome/browser/extensions/api/file_handlers/mime_util.h +++ b/chrome/browser/extensions/api/file_handlers/mime_util.h
@@ -7,10 +7,13 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_FILE_HANDLERS_MIME_UTIL_H_ #define CHROME_BROWSER_EXTENSIONS_API_FILE_HANDLERS_MIME_UTIL_H_ +#include <stddef.h> + #include <string> #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc index 3449e07..2193382 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/file_system/file_system_api.h" +#include <stddef.h> + #include <set> #include <vector> @@ -12,6 +14,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/path_service.h" #include "base/strings/string_util.h" @@ -20,6 +23,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/value_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_util.h"
diff --git a/chrome/browser/extensions/api/file_system/file_system_api.h b/chrome/browser/extensions/api/file_system/file_system_api.h index 84702bc..fad2b1b 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.h +++ b/chrome/browser/extensions/api/file_system/file_system_api.h
@@ -10,8 +10,10 @@ #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/extensions/chrome_extension_function_details.h" #include "chrome/common/extensions/api/file_system.h"
diff --git a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc b/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc index 69c0855f2..1b59599f 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc
@@ -4,13 +4,17 @@ #include "chrome/browser/extensions/api/file_system/file_system_api.h" +#include <stddef.h> + #include <vector> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/shell_dialogs/select_file_dialog.h"
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest.cc b/chrome/browser/extensions/api/file_system/file_system_apitest.cc index 519093f..00f0825 100644 --- a/chrome/browser/extensions/api/file_system/file_system_apitest.cc +++ b/chrome/browser/extensions/api/file_system/file_system_apitest.cc
@@ -4,6 +4,7 @@ #include "apps/saved_files_service.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/scoped_observer.h" #include "build/build_config.h"
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc index 17f4dff..d56001d 100644 --- a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc +++ b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
@@ -8,6 +8,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/location.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/apps/app_browsertest_util.h"
diff --git a/chrome/browser/extensions/api/file_system/request_file_system_dialog_view.cc b/chrome/browser/extensions/api/file_system/request_file_system_dialog_view.cc index 69df25b..28c787b3 100644 --- a/chrome/browser/extensions/api/file_system/request_file_system_dialog_view.cc +++ b/chrome/browser/extensions/api/file_system/request_file_system_dialog_view.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/file_system/request_file_system_dialog_view.h" +#include <stddef.h> + #include <cstdlib> #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/file_system/request_file_system_dialog_view.h b/chrome/browser/extensions/api/file_system/request_file_system_dialog_view.h index f662a03..46c60e7a 100644 --- a/chrome/browser/extensions/api/file_system/request_file_system_dialog_view.h +++ b/chrome/browser/extensions/api/file_system/request_file_system_dialog_view.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_API_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_VIEW_H_ #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/chromeos/file_manager/volume_manager.h"
diff --git a/chrome/browser/extensions/api/file_system/request_file_system_notification.h b/chrome/browser/extensions/api/file_system/request_file_system_notification.h index b538805..ab707f8 100644 --- a/chrome/browser/extensions/api/file_system/request_file_system_notification.h +++ b/chrome/browser/extensions/api/file_system/request_file_system_notification.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/app_icon_loader.h"
diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.cc b/chrome/browser/extensions/api/font_settings/font_settings_api.cc index 4f0d7c9..cc6c6e81 100644 --- a/chrome/browser/extensions/api/font_settings/font_settings_api.cc +++ b/chrome/browser/extensions/api/font_settings/font_settings_api.cc
@@ -6,6 +6,8 @@ #include "chrome/browser/extensions/api/font_settings/font_settings_api.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/json/json_writer.h" @@ -16,6 +18,7 @@ #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/preference/preference_api.h" #include "chrome/browser/extensions/api/preference/preference_helpers.h"
diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.h b/chrome/browser/extensions/api/font_settings/font_settings_api.h index 77f3f38..b1a35c8 100644 --- a/chrome/browser/extensions/api/font_settings/font_settings_api.h +++ b/chrome/browser/extensions/api/font_settings/font_settings_api.h
@@ -10,6 +10,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc b/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc index e26d38e..554c118 100644 --- a/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc +++ b/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/api/gcd_private/gcd_private_api.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.h"
diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc b/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc index 5a6f83b..f8a7a20 100644 --- a/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc +++ b/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/command_line.h" #include "chrome/browser/extensions/api/gcd_private/gcd_private_api.h" #include "chrome/browser/extensions/extension_apitest.h" @@ -24,7 +26,7 @@ " \"crypto\":[\"p224_spake2\"]" "}}"; -const uint8 kAnnouncePacket[] = { +const uint8_t kAnnouncePacket[] = { // Header 0x00, 0x00, // ID is zeroed out 0x80, 0x00, // Standard query response, no error @@ -123,7 +125,7 @@ } protected: - void SimulateReceiveWithDelay(const uint8* packet, int size) { + void SimulateReceiveWithDelay(const uint8_t* packet, int size) { if (ExtensionSubtestsAreSkipped()) return; base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
diff --git a/chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.cc b/chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.cc index 7650679..b413462 100644 --- a/chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.cc +++ b/chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.h" #include "base/command_line.h" +#include "base/macros.h" #include "chrome/common/chrome_content_client.h" #include "net/base/net_errors.h" #include "net/cert/cert_verifier.h"
diff --git a/chrome/browser/extensions/api/gcd_private/privet_v3_context_getter_unittest.cc b/chrome/browser/extensions/api/gcd_private/privet_v3_context_getter_unittest.cc index b461d42..0294c4e 100644 --- a/chrome/browser/extensions/api/gcd_private/privet_v3_context_getter_unittest.cc +++ b/chrome/browser/extensions/api/gcd_private/privet_v3_context_getter_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/gcd_private/privet_v3_context_getter.h" +#include <stddef.h> + #include "base/path_service.h" #include "base/run_loop.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/api/gcd_private/privet_v3_session.cc b/chrome/browser/extensions/api/gcd_private/privet_v3_session.cc index 273e312..e7f8fd1 100644 --- a/chrome/browser/extensions/api/gcd_private/privet_v3_session.cc +++ b/chrome/browser/extensions/api/gcd_private/privet_v3_session.cc
@@ -9,6 +9,7 @@ #include "base/json/json_writer.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/thread_task_runner_handle.h"
diff --git a/chrome/browser/extensions/api/gcd_private/privet_v3_session.h b/chrome/browser/extensions/api/gcd_private/privet_v3_session.h index d2352d9..45445854 100644 --- a/chrome/browser/extensions/api/gcd_private/privet_v3_session.h +++ b/chrome/browser/extensions/api/gcd_private/privet_v3_session.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_GCD_PRIVATE_PRIVET_V3_SESSION_H_ #define CHROME_BROWSER_EXTENSIONS_API_GCD_PRIVATE_PRIVET_V3_SESSION_H_ +#include <stdint.h> + #include <string> #include "base/callback.h"
diff --git a/chrome/browser/extensions/api/gcm/gcm_api.cc b/chrome/browser/extensions/api/gcm/gcm_api.cc index 09275a3..b658e77 100644 --- a/chrome/browser/extensions/api/gcm/gcm_api.cc +++ b/chrome/browser/extensions/api/gcm/gcm_api.cc
@@ -4,10 +4,13 @@ #include "chrome/browser/extensions/api/gcm/gcm_api.h" +#include <stddef.h> + #include <algorithm> #include <map> #include <vector> +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/extensions/api/history/history_api.h b/chrome/browser/extensions/api/history/history_api.h index 2335dbd0..55c48fa 100644 --- a/chrome/browser/extensions/api/history/history_api.h +++ b/chrome/browser/extensions/api/history/history_api.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "base/task/cancelable_task_tracker.h" #include "chrome/browser/extensions/chrome_extension_function.h"
diff --git a/chrome/browser/extensions/api/history/history_apitest.cc b/chrome/browser/extensions/api/history/history_apitest.cc index ed42c8bd..710a201 100644 --- a/chrome/browser/extensions/api/history/history_apitest.cc +++ b/chrome/browser/extensions/api/history/history_apitest.cc
@@ -5,6 +5,7 @@ #include "base/base_switches.h" #include "base/command_line.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc b/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc index e268204c..db251fa6 100644 --- a/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc +++ b/chrome/browser/extensions/api/hotword_private/hotword_private_api.cc
@@ -9,6 +9,7 @@ #include "base/lazy_instance.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/hotword_audio_history_handler.h"
diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc index a6c63bf..5249df1 100644 --- a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc +++ b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h"
diff --git a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h index 58e18f9a..e9685b5 100644 --- a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h +++ b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_IDENTITY_GAIA_WEB_AUTH_FLOW_H_ #define CHROME_BROWSER_EXTENSIONS_API_IDENTITY_GAIA_WEB_AUTH_FLOW_H_ +#include "base/macros.h" #include "chrome/browser/extensions/api/identity/extension_token_key.h" #include "chrome/browser/extensions/api/identity/web_auth_flow.h" #include "chrome/browser/ui/host_desktop.h"
diff --git a/chrome/browser/extensions/api/identity/identity_api.cc b/chrome/browser/extensions/api/identity/identity_api.cc index 58391bf9..937a231 100644 --- a/chrome/browser/extensions/api/identity/identity_api.cc +++ b/chrome/browser/extensions/api/identity/identity_api.cc
@@ -4,16 +4,20 @@ #include "chrome/browser/extensions/api/identity/identity_api.h" +#include <stddef.h> + #include <set> #include <string> #include <utility> #include <vector> #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/extensions/api/identity/identity_api.h b/chrome/browser/extensions/api/identity/identity_api.h index 067dac3..c109754 100644 --- a/chrome/browser/extensions/api/identity/identity_api.h +++ b/chrome/browser/extensions/api/identity/identity_api.h
@@ -15,6 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/identity/extension_token_key.h" #include "chrome/browser/extensions/api/identity/gaia_web_auth_flow.h" #include "chrome/browser/extensions/api/identity/identity_mint_queue.h"
diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc index c19c0f37..be4a4d4 100644 --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
@@ -11,6 +11,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
diff --git a/chrome/browser/extensions/api/identity/identity_signin_flow.cc b/chrome/browser/extensions/api/identity/identity_signin_flow.cc index 6224083..1a0ed0e3 100644 --- a/chrome/browser/extensions/api/identity/identity_signin_flow.cc +++ b/chrome/browser/extensions/api/identity/identity_signin_flow.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/api/identity/identity_signin_flow.h" +#include "build/build_config.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h"
diff --git a/chrome/browser/extensions/api/identity/identity_signin_flow.h b/chrome/browser/extensions/api/identity/identity_signin_flow.h index 5f443f51..d744e8e 100644 --- a/chrome/browser/extensions/api/identity/identity_signin_flow.h +++ b/chrome/browser/extensions/api/identity/identity_signin_flow.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "google_apis/gaia/oauth2_token_service.h"
diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.h b/chrome/browser/extensions/api/identity/web_auth_flow.h index dc688c0..a5d49653 100644 --- a/chrome/browser/extensions/api/identity/web_auth_flow.h +++ b/chrome/browser/extensions/api/identity/web_auth_flow.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/extensions/api/idltest/idltest_api.cc b/chrome/browser/extensions/api/idltest/idltest_api.cc index 71af4ac..51f749d 100644 --- a/chrome/browser/extensions/api/idltest/idltest_api.cc +++ b/chrome/browser/extensions/api/idltest/idltest_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/idltest/idltest_api.h" +#include <stddef.h> + #include "base/values.h" using base::BinaryValue;
diff --git a/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc index 9363a1ad..64e8a5db 100644 --- a/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/run_loop.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.h" #include "chrome/browser/extensions/api/image_writer_private/error_messages.h" #include "chrome/browser/extensions/api/image_writer_private/test_utils.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc b/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc index a8c49da69..83a82d3 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" #include "chrome/browser/extensions/api/image_writer_private/operation.h" #include "chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc index c27385d8..d60993f8 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc
@@ -5,6 +5,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h" #include "chrome/common/extensions/chrome_utility_extensions_messages.h" @@ -83,7 +84,7 @@ // Clear handlers to not hold any reference to the caller. success_callback_ = base::Closure(); - progress_callback_ = base::Callback<void(int64)>(); + progress_callback_ = base::Callback<void(int64_t)>(); error_callback_ = base::Callback<void(const std::string&)>(); cancel_callback_ = base::Closure(); } @@ -154,7 +155,7 @@ } } -void ImageWriterUtilityClient::OnWriteImageProgress(int64 progress) { +void ImageWriterUtilityClient::OnWriteImageProgress(int64_t progress) { if (!progress_callback_.is_null()) { task_runner_->PostTask(FROM_HERE, base::Bind(progress_callback_, progress)); }
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h index 7af98d0..796faee 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h
@@ -5,7 +5,10 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_IMAGE_WRITER_UTILITY_CLIENT_H_ #define CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_IMAGE_WRITER_UTILITY_CLIENT_H_ +#include <stdint.h> + #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" #include "base/threading/sequenced_worker_pool.h" @@ -17,7 +20,7 @@ public: typedef base::Callback<void()> CancelCallback; typedef base::Callback<void()> SuccessCallback; - typedef base::Callback<void(int64)> ProgressCallback; + typedef base::Callback<void(int64_t)> ProgressCallback; typedef base::Callback<void(const std::string&)> ErrorCallback; ImageWriterUtilityClient(); @@ -71,7 +74,7 @@ void OnWriteImageSucceeded(); void OnWriteImageCancelled(); void OnWriteImageFailed(const std::string& message); - void OnWriteImageProgress(int64 progress); + void OnWriteImageProgress(int64_t progress); CancelCallback cancel_callback_; ProgressCallback progress_callback_;
diff --git a/chrome/browser/extensions/api/image_writer_private/operation.cc b/chrome/browser/extensions/api/image_writer_private/operation.cc index 5c4ce7c5..124fb4ea 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation.cc
@@ -8,6 +8,7 @@ #include "base/files/file_util.h" #include "base/lazy_instance.h" #include "base/threading/worker_pool.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/image_writer_private/error_messages.h" #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h" #include "content/public/browser/browser_thread.h" @@ -269,7 +270,7 @@ base::Bind(&ImageWriterUtilityClient::Shutdown, image_writer_client_)); } -void Operation::WriteImageProgress(int64 total_bytes, int64 curr_bytes) { +void Operation::WriteImageProgress(int64_t total_bytes, int64_t curr_bytes) { DCHECK_CURRENTLY_ON(BrowserThread::FILE); if (IsCancelled()) { return; @@ -285,7 +286,7 @@ void Operation::GetMD5SumOfFile( const base::FilePath& file_path, - int64 file_size, + int64_t file_size, int progress_offset, int progress_scale, const base::Callback<void(const std::string&)>& callback) { @@ -323,8 +324,8 @@ void Operation::MD5Chunk( base::File file, - int64 bytes_processed, - int64 bytes_total, + int64_t bytes_processed, + int64_t bytes_total, int progress_offset, int progress_scale, const base::Callback<void(const std::string&)>& callback) { @@ -335,7 +336,7 @@ scoped_ptr<char[]> buffer(new char[kMD5BufferSize]); int read_size = std::min(bytes_total - bytes_processed, - static_cast<int64>(kMD5BufferSize)); + static_cast<int64_t>(kMD5BufferSize)); if (read_size == 0) { // Nothing to read, we are done. @@ -377,7 +378,7 @@ Error(error::kUnzipGenericError); } -void Operation::OnUnzipProgress(int64 total_bytes, int64 progress_bytes) { +void Operation::OnUnzipProgress(int64_t total_bytes, int64_t progress_bytes) { DCHECK_CURRENTLY_ON(BrowserThread::FILE); int progress_percent = kProgressComplete * progress_bytes / total_bytes;
diff --git a/chrome/browser/extensions/api/image_writer_private/operation.h b/chrome/browser/extensions/api/image_writer_private/operation.h index bb0afbc2..bf629529 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation.h +++ b/chrome/browser/extensions/api/image_writer_private/operation.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_OPERATION_H_ #define CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_OPERATION_H_ +#include <stdint.h> + #include "base/callback.h" #include "base/files/file.h" #include "base/files/scoped_temp_dir.h" @@ -12,6 +14,7 @@ #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" #include "base/task/cancelable_task_tracker.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h" #include "chrome/common/extensions/api/image_writer_private.h" @@ -135,7 +138,7 @@ // of the MD5 sum before updating |progress_| but after scaling. void GetMD5SumOfFile( const base::FilePath& file, - int64 file_size, + int64_t file_size, int progress_offset, int progress_scale, const base::Callback<void(const std::string&)>& callback); @@ -163,7 +166,7 @@ void StopUtilityClient(); // Reports progress from the client, transforming from bytes to percentage. - virtual void WriteImageProgress(int64 total_bytes, int64 curr_bytes); + virtual void WriteImageProgress(int64_t total_bytes, int64_t curr_bytes); scoped_refptr<ImageWriterUtilityClient> image_writer_client_; #endif @@ -182,22 +185,22 @@ bool success, const std::string& error); void OnBurnProgress(const std::string& target_path, - int64 num_bytes_burnt, - int64 total_size); + int64_t num_bytes_burnt, + int64_t total_size); void OnBurnError(); #endif // Incrementally calculates the MD5 sum of a file. void MD5Chunk(base::File file, - int64 bytes_processed, - int64 bytes_total, + int64_t bytes_processed, + int64_t bytes_total, int progress_offset, int progress_scale, const base::Callback<void(const std::string&)>& callback); // Callbacks for zip::ZipReader. void OnUnzipFailure(); - void OnUnzipProgress(int64 total_bytes, int64 progress_bytes); + void OnUnzipProgress(int64_t total_bytes, int64_t progress_bytes); // Runs all cleanup functions. void CleanUp();
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_chromeos.cc b/chrome/browser/extensions/api/image_writer_private/operation_chromeos.cc index e5a846f..9e0cd935 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_chromeos.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_chromeos.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "chrome/browser/extensions/api/image_writer_private/error_messages.h" #include "chrome/browser/extensions/api/image_writer_private/operation.h" #include "chromeos/dbus/dbus_thread_manager.h" @@ -115,8 +117,8 @@ } void Operation::OnBurnProgress(const std::string& target_path, - int64 num_bytes_burnt, - int64 total_size) { + int64_t num_bytes_burnt, + int64_t total_size) { int progress = kProgressComplete * num_bytes_burnt / total_size; SetProgress(progress); }
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager.cc b/chrome/browser/extensions/api/image_writer_private/operation_manager.cc index 3d888b84..0ff7b5c 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/lazy_instance.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.h" #include "chrome/browser/extensions/api/image_writer_private/error_messages.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager.h b/chrome/browser/extensions/api/image_writer_private/operation_manager.h index 2af7cd0..42243af 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager.h +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.h
@@ -9,6 +9,7 @@ #include <string> #include "base/bind.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" #include "base/stl_util.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc index da5fa7423..bc64c8b 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc
@@ -4,6 +4,7 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/image_writer_private/error_messages.h" #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h" #include "chrome/browser/extensions/api/image_writer_private/test_utils.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_nonchromeos.cc b/chrome/browser/extensions/api/image_writer_private/operation_nonchromeos.cc index 1aab868..b19330f 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_nonchromeos.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_nonchromeos.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/threading/worker_pool.h" @@ -24,7 +26,7 @@ SetStage(image_writer_api::STAGE_WRITE); StartUtilityClient(); - int64 file_size; + int64_t file_size; if (!base::GetFileSize(image_path_, &file_size)) { Error(error::kImageReadError); return; @@ -53,7 +55,7 @@ SetStage(image_writer_api::STAGE_VERIFYWRITE); StartUtilityClient(); - int64 file_size; + int64_t file_size; if (!base::GetFileSize(image_path_, &file_size)) { Error(error::kImageReadError); return;
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc index e038d30..f0e4b86e 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc
@@ -6,6 +6,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/image_writer_private/error_messages.h" #include "chrome/browser/extensions/api/image_writer_private/operation.h" #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc index f6605a6..aca6020 100644 --- a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" #include "base/run_loop.h" #include "chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h" @@ -23,7 +25,7 @@ const char kDeviceName[] = "Test Device Name"; const char kVendorName[] = "Test Vendor"; const char kProductName[] = "Test Product"; -const uint64 kDeviceSize = 1024 * 1024 * 1024; +const uint64_t kDeviceSize = 1024 * 1024 * 1024; const bool kOnRemovableDevice = true; const char kUnknownSDDiskModel[] = "SD Card"; @@ -100,7 +102,7 @@ const std::string& device_path, const std::string& vendor, const std::string& model, - uint64 capacity) { + uint64_t capacity) { RemovableStorageDevice* device = FindDevice(devices_.get(), device_path); ASSERT_TRUE(device != NULL);
diff --git a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc index 3cc3ff9..0a72555 100644 --- a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc +++ b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/files/file_util.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h" @@ -13,8 +15,8 @@ // https://code.google.com/p/chromium/issues/detail?id=284898 // Returns the integer contained in |attr|. Returns 0 on error. -static uint64 get_int_attr(const char* attr) { - uint64 result = 0; +static uint64_t get_int_attr(const char* attr) { + uint64_t result = 0; // In error cases, StringToInt will set result to 0 base::StringToUint64(attr, &result); return result;
diff --git a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_mac.cc b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_mac.cc index f37b3a9..c2670fb6 100644 --- a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_mac.cc +++ b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_mac.cc
@@ -5,11 +5,12 @@ #include "chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h" #include <CoreFoundation/CoreFoundation.h> -#include <IOKit/storage/IOBlockStorageDevice.h> #include <IOKit/IOBSD.h> #include <IOKit/IOKitLib.h> +#include <IOKit/storage/IOBlockStorageDevice.h> #include <IOKit/storage/IOMedia.h> #include <IOKit/storage/IOStorageProtocolCharacteristics.h> +#include <stdint.h> #include "base/mac/foundation_util.h" #include "base/mac/scoped_cftyperef.h" @@ -55,7 +56,7 @@ CFNumberRef size_number = base::mac::GetValueFromDictionary<CFNumberRef>( dict, CFSTR(kIOMediaSizeKey)); - uint64 size_in_bytes = 0; + uint64_t size_in_bytes = 0; if (size_number) CFNumberGetValue(size_number, kCFNumberLongLongType, &size_in_bytes);
diff --git a/chrome/browser/extensions/api/image_writer_private/test_utils.cc b/chrome/browser/extensions/api/image_writer_private/test_utils.cc index eea5d7a..3e56e2b 100644 --- a/chrome/browser/extensions/api/image_writer_private/test_utils.cc +++ b/chrome/browser/extensions/api/image_writer_private/test_utils.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/image_writer_private/test_utils.h" +#include "build/build_config.h" + #if defined(OS_CHROMEOS) #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/fake_image_burner_client.h" @@ -119,7 +121,7 @@ verify_callback_ = verify_callback; } -void FakeImageWriterClient::Progress(int64 progress) { +void FakeImageWriterClient::Progress(int64_t progress) { if (!progress_callback_.is_null()) progress_callback_.Run(progress); }
diff --git a/chrome/browser/extensions/api/image_writer_private/test_utils.h b/chrome/browser/extensions/api/image_writer_private/test_utils.h index 202f8df..2ccac3d7 100644 --- a/chrome/browser/extensions/api/image_writer_private/test_utils.h +++ b/chrome/browser/extensions/api/image_writer_private/test_utils.h
@@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_TEST_UTILS_H_ #define CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_TEST_UTILS_H_ +#include <stdint.h> + #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h" #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h" #include "content/public/test/test_browser_thread_bundle.h" @@ -97,7 +100,7 @@ void SetVerifyCallback(const base::Closure& verify_callback); // Triggers the progress callback. - void Progress(int64 progress); + void Progress(int64_t progress); // Triggers the success callback. void Success(); // Triggers the error callback.
diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc index 33464897..2dfa5db0 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.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 "chrome/browser/extensions/api/image_writer_private/error_messages.h" #include "chrome/browser/extensions/api/image_writer_private/test_utils.h" #include "chrome/browser/extensions/api/image_writer_private/write_from_file_operation.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.cc b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.cc index b220af0..8c6f945 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.cc +++ b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.cc
@@ -101,15 +101,15 @@ void WriteFromUrlOperation::OnURLFetchUploadProgress( const net::URLFetcher* source, - int64 current, - int64 total) { + int64_t current, + int64_t total) { // No-op } void WriteFromUrlOperation::OnURLFetchDownloadProgress( const net::URLFetcher* source, - int64 current, - int64 total) { + int64_t current, + int64_t total) { DCHECK_CURRENTLY_ON(BrowserThread::FILE); if (IsCancelled()) {
diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h index 259af14f..1ccd75a6 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h +++ b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_WRITE_FROM_URL_OPERATION_H_ #define CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_WRITE_FROM_URL_OPERATION_H_ +#include <stdint.h> + #include "chrome/browser/extensions/api/image_writer_private/operation.h" #include "net/url_request/url_fetcher_delegate.h" #include "url/gurl.h" @@ -53,11 +55,11 @@ // URLFetcherDelegate implementation. void OnURLFetchComplete(const net::URLFetcher* source) override; void OnURLFetchDownloadProgress(const net::URLFetcher* source, - int64 current, - int64 total) override; + int64_t current, + int64_t total) override; void OnURLFetchUploadProgress(const net::URLFetcher* source, - int64 current, - int64 total) override; + int64_t current, + int64_t total) override; void VerifyDownloadCompare(const base::Closure& continuation, const std::string& download_hash);
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.h b/chrome/browser/extensions/api/input_ime/input_ime_api.h index d071c17..8b34769 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api.h +++ b/chrome/browser/extensions/api/input_ime/input_ime_api.h
@@ -13,6 +13,7 @@ #include "base/memory/singleton.h" #include "base/scoped_observer.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "components/keyed_service/core/keyed_service.h" #include "extensions/browser/browser_context_keyed_api_factory.h"
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc index 1d6284ad..bd863808 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc +++ b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" +#include <stddef.h> + +#include "base/macros.h" #include "chrome/browser/chromeos/input_method/input_method_engine.h" #include "chrome/browser/chromeos/login/lock/screen_locker.h" #include "chrome/browser/chromeos/login/session/user_session_manager.h"
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc index 50329fa3..ed82a02 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc +++ b/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc
@@ -11,6 +11,7 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #include "base/command_line.h" +#include "base/macros.h" #include "chrome/common/chrome_switches.h" namespace {
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc index 35ea82f8..af200ce 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc +++ b/chrome/browser/extensions/api/input_ime/input_ime_apitest_chromeos.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 "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_switches.h" #include "extensions/browser/api/test/test_api.h"
diff --git a/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc b/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc index 1929671..cfadf6f 100644 --- a/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc +++ b/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/base_switches.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "chrome/browser/extensions/api/instance_id/instance_id_api.h"
diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc index 705911c..512b108 100644 --- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc +++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc
@@ -16,6 +16,7 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.h" #include "chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h"
diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.h b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.h index 9a15ffc..305c5e8 100644 --- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.h +++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_LANGUAGE_SETTINGS_PRIVATE_LANGUAGE_SETTINGS_PRIVATE_DELEGATE_H_ #define CHROME_BROWSER_EXTENSIONS_API_LANGUAGE_SETTINGS_PRIVATE_LANGUAGE_SETTINGS_PRIVATE_DELEGATE_H_ +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h index e8ee67f4..c88541a7 100644 --- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h +++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_LANGUAGE_SETTINGS_PRIVATE_LANGUAGE_SETTINGS_PRIVATE_DELEGATE_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_API_LANGUAGE_SETTINGS_PRIVATE_LANGUAGE_SETTINGS_PRIVATE_DELEGATE_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/api/launcher_page/launcher_page_api.h b/chrome/browser/extensions/api/launcher_page/launcher_page_api.h index bd39314..1f5a0dc 100644 --- a/chrome/browser/extensions/api/launcher_page/launcher_page_api.h +++ b/chrome/browser/extensions/api/launcher_page/launcher_page_api.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_LAUNCHER_PAGE_LAUNCHER_PAGE_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_LAUNCHER_PAGE_LAUNCHER_PAGE_API_H_ +#include "base/macros.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "extensions/browser/browser_context_keyed_api_factory.h"
diff --git a/chrome/browser/extensions/api/location/location_manager.cc b/chrome/browser/extensions/api/location/location_manager.cc index e3015a7..7b65616 100644 --- a/chrome/browser/extensions/api/location/location_manager.cc +++ b/chrome/browser/extensions/api/location/location_manager.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/time/time.h" #include "chrome/common/extensions/api/location.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/api/location/location_manager.h b/chrome/browser/extensions/api/location/location_manager.h index f56c5c6..085f797 100644 --- a/chrome/browser/extensions/api/location/location_manager.h +++ b/chrome/browser/extensions/api/location/location_manager.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/scoped_observer.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/extension_registry_observer.h"
diff --git a/chrome/browser/extensions/api/log_private/filter_handler.h b/chrome/browser/extensions/api/log_private/filter_handler.h index 77fe060c..73629a3 100644 --- a/chrome/browser/extensions/api/log_private/filter_handler.h +++ b/chrome/browser/extensions/api/log_private/filter_handler.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "chrome/common/extensions/api/log_private.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/log_private/log_parser.cc b/chrome/browser/extensions/api/log_private/log_parser.cc index ef6c59e..55db7b5 100644 --- a/chrome/browser/extensions/api/log_private/log_parser.cc +++ b/chrome/browser/extensions/api/log_private/log_parser.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/log_private/log_parser.h" +#include <stddef.h> + #include <string> #include <vector>
diff --git a/chrome/browser/extensions/api/log_private/log_parser.h b/chrome/browser/extensions/api/log_private/log_parser.h index c73e54f..4225afa9 100644 --- a/chrome/browser/extensions/api/log_private/log_parser.h +++ b/chrome/browser/extensions/api/log_private/log_parser.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "chrome/browser/extensions/api/log_private/filter_handler.h" #include "chrome/common/extensions/api/log_private.h"
diff --git a/chrome/browser/extensions/api/log_private/log_private_api.h b/chrome/browser/extensions/api/log_private/log_private_api.h index d55146b..d54ef61 100644 --- a/chrome/browser/extensions/api/log_private/log_private_api.h +++ b/chrome/browser/extensions/api/log_private/log_private_api.h
@@ -9,6 +9,7 @@ #include <string> #include "base/files/scoped_file.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "chrome/browser/extensions/api/log_private/filter_handler.h" #include "chrome/browser/extensions/api/log_private/log_parser.h"
diff --git a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc index 2a2b9d17..50cbf75 100644 --- a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc +++ b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc
@@ -14,6 +14,7 @@ #include "base/logging.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h"
diff --git a/chrome/browser/extensions/api/log_private/syslog_parser.h b/chrome/browser/extensions/api/log_private/syslog_parser.h index 691aa0f..a805b23 100644 --- a/chrome/browser/extensions/api/log_private/syslog_parser.h +++ b/chrome/browser/extensions/api/log_private/syslog_parser.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "chrome/browser/extensions/api/log_private/log_parser.h" #include "chrome/common/extensions/api/log_private.h"
diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc index 4f88b6b79..2ee92b5b 100644 --- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/api/management/chrome_management_api_delegate.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/bookmark_app_helper.h" #include "chrome/browser/extensions/chrome_extension_function_details.h"
diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc index fe6ef8b..f55175e 100644 --- a/chrome/browser/extensions/api/management/management_api_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc
@@ -7,6 +7,7 @@ #include "base/strings/pattern.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/api/management/management_api_unittest.cc b/chrome/browser/extensions/api/management/management_api_unittest.cc index c4f73c8..30f8f33 100644 --- a/chrome/browser/extensions/api/management/management_api_unittest.cc +++ b/chrome/browser/extensions/api/management/management_api_unittest.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 "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/api/management/management_apitest.cc b/chrome/browser/extensions/api/management/management_apitest.cc index 174dbc5..89af274 100644 --- a/chrome/browser/extensions/api/management/management_apitest.cc +++ b/chrome/browser/extensions/api/management/management_apitest.cc
@@ -4,6 +4,7 @@ #include <map> +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc index 159c740..fcac075 100644 --- a/chrome/browser/extensions/api/management/management_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_browsertest.cc
@@ -2,13 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_management.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/api/mdns/dns_sd_device_lister.h b/chrome/browser/extensions/api/mdns/dns_sd_device_lister.h index 2a98082..23fba1a 100644 --- a/chrome/browser/extensions/api/mdns/dns_sd_device_lister.h +++ b/chrome/browser/extensions/api/mdns/dns_sd_device_lister.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chrome/browser/extensions/api/mdns/dns_sd_delegate.h" #include "chrome/browser/local_discovery/service_discovery_device_lister.h"
diff --git a/chrome/browser/extensions/api/mdns/dns_sd_registry.h b/chrome/browser/extensions/api/mdns/dns_sd_registry.h index 84ab680..3c32408 100644 --- a/chrome/browser/extensions/api/mdns/dns_sd_registry.h +++ b/chrome/browser/extensions/api/mdns/dns_sd_registry.h
@@ -10,6 +10,7 @@ #include <utility> #include <vector> +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/extensions/api/mdns/mdns_api.h b/chrome/browser/extensions/api/mdns/mdns_api.h index edcef4d..13d847a 100644 --- a/chrome/browser/extensions/api/mdns/mdns_api.h +++ b/chrome/browser/extensions/api/mdns/mdns_api.h
@@ -10,6 +10,7 @@ #include <string> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" #include "chrome/browser/extensions/api/mdns/dns_sd_registry.h"
diff --git a/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc b/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc index 8522ec3..db3b9790 100644 --- a/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc +++ b/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <vector> #include "base/memory/linked_ptr.h"
diff --git a/chrome/browser/extensions/api/mdns/mdns_apitest.cc b/chrome/browser/extensions/api/mdns/mdns_apitest.cc index 3f5ce28d..ddb9c0f 100644 --- a/chrome/browser/extensions/api/mdns/mdns_apitest.cc +++ b/chrome/browser/extensions/api/mdns/mdns_apitest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/mdns/mdns_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc index 0d52b8c..94a5d84 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
@@ -6,12 +6,15 @@ #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h" +#include <stddef.h> + #include <set> #include <string> #include <vector> #include "base/callback.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/numerics/safe_conversions.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" @@ -933,8 +936,10 @@ } void MediaGalleriesGetMetadataFunction::GetMetadata( - MediaGalleries::GetMetadataType metadata_type, const std::string& blob_uuid, - scoped_ptr<std::string> blob_header, int64 total_blob_length) { + MediaGalleries::GetMetadataType metadata_type, + const std::string& blob_uuid, + scoped_ptr<std::string> blob_header, + int64_t total_blob_length) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); std::string mime_type;
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.h b/chrome/browser/extensions/api/media_galleries/media_galleries_api.h index f1c142b7..2307232 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.h +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.h
@@ -8,10 +8,13 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_MEDIA_GALLERIES_MEDIA_GALLERIES_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_MEDIA_GALLERIES_MEDIA_GALLERIES_API_H_ +#include <stdint.h> + #include <string> #include <vector> #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/chrome_extension_function.h" @@ -286,7 +289,7 @@ void GetMetadata(MediaGalleries::GetMetadataType metadata_type, const std::string& blob_uuid, scoped_ptr<std::string> blob_header, - int64 total_blob_length); + int64_t total_blob_length); void OnSafeMediaMetadataParserDone( bool parse_success, scoped_ptr<base::DictionaryValue> result_dictionary,
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc index ed6757f58..270d2129 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/auto_reset.h" #include "base/callback.h" #include "base/files/file_util.h" @@ -12,6 +14,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h" @@ -121,7 +124,7 @@ PlatformAppBrowserTest::SetUpOnMainThread(); ensure_media_directories_exists_.reset(new EnsureMediaDirectoriesExists); - int64 file_size; + int64_t file_size; ASSERT_TRUE(base::GetFileSize(GetCommonDataDir().AppendASCII("test.jpg"), &file_size)); test_jpg_size_ = base::checked_cast<int>(file_size);
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc index 617247f1..f80da1da 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc
@@ -7,6 +7,7 @@ #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/extensions/api/messaging/message_property_provider.cc b/chrome/browser/extensions/api/messaging/message_property_provider.cc index 1b3872f..993b3f5c 100644 --- a/chrome/browser/extensions/api/messaging/message_property_provider.cc +++ b/chrome/browser/extensions/api/messaging/message_property_provider.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/messaging/message_property_provider.h" +#include <stdint.h> + #include "base/json/json_writer.h" #include "base/logging.h" #include "base/strings/string_piece.h" @@ -85,7 +87,7 @@ original_task_runner->PostTask(FROM_HERE, no_tls_channel_id_closure); return; } - std::vector<uint8> spki_vector; + std::vector<uint8_t> spki_vector; if (!output->channel_id_key->ExportPublicKey(&spki_vector)) { original_task_runner->PostTask(FROM_HERE, no_tls_channel_id_closure); return;
diff --git a/chrome/browser/extensions/api/messaging/message_property_provider.h b/chrome/browser/extensions/api/messaging/message_property_provider.h index b680cb0f..06a91b1 100644 --- a/chrome/browser/extensions/api/messaging/message_property_provider.h +++ b/chrome/browser/extensions/api/messaging/message_property_provider.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" class GURL; class Profile;
diff --git a/chrome/browser/extensions/api/messaging/message_service.cc b/chrome/browser/extensions/api/messaging/message_service.cc index 6cde9dc..0e4ec90 100644 --- a/chrome/browser/extensions/api/messaging/message_service.cc +++ b/chrome/browser/extensions/api/messaging/message_service.cc
@@ -13,9 +13,11 @@ #include "base/callback.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/messaging/extension_message_port.h" #include "chrome/browser/extensions/api/messaging/incognito_connectability.h"
diff --git a/chrome/browser/extensions/api/messaging/message_service.h b/chrome/browser/extensions/api/messaging/message_service.h index 92ec7cb..d170b97c 100644 --- a/chrome/browser/extensions/api/messaging/message_service.h +++ b/chrome/browser/extensions/api/messaging/message_service.h
@@ -11,6 +11,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host.cc b/chrome/browser/extensions/api/messaging/native_message_process_host.cc index 4d7f48ab..46e113a 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host.cc
@@ -4,11 +4,15 @@ #include "chrome/browser/extensions/api/messaging/native_message_process_host.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/files/file_path.h" #include "base/logging.h" #include "base/process/kill.h" #include "base/threading/sequenced_worker_pool.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/messaging/native_messaging_host_manifest.h" #include "chrome/browser/extensions/api/messaging/native_process_launcher.h" #include "content/public/browser/browser_thread.h" @@ -165,9 +169,9 @@ new net::IOBufferWithSize(json.size() + kMessageHeaderSize); // Copy size and content of the message to the buffer. - static_assert(sizeof(uint32) == kMessageHeaderSize, + static_assert(sizeof(uint32_t) == kMessageHeaderSize, "kMessageHeaderSize is incorrect"); - *reinterpret_cast<uint32*>(buffer->data()) = json.size(); + *reinterpret_cast<uint32_t*>(buffer->data()) = json.size(); memcpy(buffer->data() + kMessageHeaderSize, json.data(), json.size()); // Push new message to the write queue. @@ -284,7 +288,7 @@ return; size_t message_size = - *reinterpret_cast<const uint32*>(incoming_data_.data()); + *reinterpret_cast<const uint32_t*>(incoming_data_.data()); if (message_size > kMaximumMessageSize) { LOG(ERROR) << "Native Messaging host tried sending a message that is "
diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host.h b/chrome/browser/extensions/api/messaging/native_message_process_host.h index d3dbf17d..e667cbd 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host.h +++ b/chrome/browser/extensions/api/messaging/native_message_process_host.h
@@ -9,9 +9,11 @@ #include <string> #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/process/process.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/messaging/native_process_launcher.h" #include "extensions/browser/api/messaging/native_message_host.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc index ac7a34c..4bf62d8 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/api/messaging/native_message_process_host.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" @@ -20,6 +23,7 @@ #include "base/threading/platform_thread.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/messaging/native_messaging_test_util.h" #include "chrome/browser/extensions/api/messaging/native_process_launcher.h" #include "chrome/common/extensions/features/feature_channel.h"
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.cc b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.cc index 6b458b1..32c73310 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.cc +++ b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/messaging/native_messaging_host_manifest.h" +#include <stddef.h> + #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.h b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.h index 5931e19..a3d3d2d 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.h +++ b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "extensions/common/url_pattern_set.h"
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc index 41551fa..bb49845 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc
@@ -8,6 +8,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/json/string_escape.h" +#include "build/build_config.h" #include "extensions/common/url_pattern_set.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h"
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h b/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h index 220c7c45..b2b601b 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h +++ b/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_MESSAGING_NATIVE_MESSAGING_POLICY_HANDLER_H_ #define CHROME_BROWSER_EXTENSIONS_API_MESSAGING_NATIVE_MESSAGING_POLICY_HANDLER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "components/policy/core/browser/configuration_policy_handler.h"
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_test_util.cc b/chrome/browser/extensions/api/messaging/native_messaging_test_util.cc index f3658e1..9e70389 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_test_util.cc +++ b/chrome/browser/extensions/api/messaging/native_messaging_test_util.cc
@@ -11,6 +11,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/common/chrome_paths.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_test_util.h b/chrome/browser/extensions/api/messaging/native_messaging_test_util.h index f1eba276..fb3798f 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_test_util.h +++ b/chrome/browser/extensions/api/messaging/native_messaging_test_util.h
@@ -6,7 +6,9 @@ #define CHROME_BROWSER_EXTENSIONS_API_MESSAGING_NATIVE_MESSAGING_TEST_UTIL_H_ #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #if defined(OS_WIN) #include "base/test/test_reg_util_win.h"
diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher.cc b/chrome/browser/extensions/api/messaging/native_process_launcher.cc index a6bf208..74650e9 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher.cc +++ b/chrome/browser/extensions/api/messaging/native_process_launcher.cc
@@ -4,16 +4,17 @@ #include "chrome/browser/extensions/api/messaging/native_process_launcher.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/threading/sequenced_worker_pool.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/messaging/native_messaging_host_manifest.h" #include "chrome/common/chrome_paths.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher.h b/chrome/browser/extensions/api/messaging/native_process_launcher.h index 7558fa33..6f6e653 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher.h +++ b/chrome/browser/extensions/api/messaging/native_process_launcher.h
@@ -7,6 +7,7 @@ #include "base/callback_forward.h" #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/process/process.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc b/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc index fa01111..2192b27 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc +++ b/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/api/messaging/native_process_launcher.h" #include <windows.h> +#include <stdint.h> #include "base/command_line.h" #include "base/logging.h" @@ -104,7 +105,7 @@ return false; } - uint64 pipe_name_token; + uint64_t pipe_name_token; crypto::RandBytes(&pipe_name_token, sizeof(pipe_name_token)); base::string16 out_pipe_name = base::StringPrintf( L"\\\\.\\pipe\\chrome.nativeMessaging.out.%llx", pipe_name_token);
diff --git a/chrome/browser/extensions/api/metrics_private/metrics_apitest.cc b/chrome/browser/extensions/api/metrics_private/metrics_apitest.cc index f11d2dc..3160400 100644 --- a/chrome/browser/extensions/api/metrics_private/metrics_apitest.cc +++ b/chrome/browser/extensions/api/metrics_private/metrics_apitest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <map> +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h"
diff --git a/chrome/browser/extensions/api/metrics_private/metrics_private_api.h b/chrome/browser/extensions/api/metrics_private/metrics_private_api.h index 631132ec..e16ca4f 100644 --- a/chrome/browser/extensions/api/metrics_private/metrics_private_api.h +++ b/chrome/browser/extensions/api/metrics_private/metrics_private_api.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_METRICS_PRIVATE_METRICS_PRIVATE_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_METRICS_PRIVATE_METRICS_PRIVATE_API_H_ +#include <stddef.h> + #include <string> #include "base/metrics/histogram.h"
diff --git a/chrome/browser/extensions/api/music_manager_private/device_id.cc b/chrome/browser/extensions/api/music_manager_private/device_id.cc index b0391ba..08de538 100644 --- a/chrome/browser/extensions/api/music_manager_private/device_id.cc +++ b/chrome/browser/extensions/api/music_manager_private/device_id.cc
@@ -4,7 +4,10 @@ #include "chrome/browser/extensions/api/music_manager_private/device_id.h" +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "content/public/browser/browser_thread.h" @@ -20,7 +23,7 @@ std::string* signature_return) { crypto::HMAC hmac(crypto::HMAC::SHA256); const size_t digest_length = hmac.DigestLength(); - std::vector<uint8> digest(digest_length); + std::vector<uint8_t> digest(digest_length); bool result = hmac.Init(key) && hmac.Sign(text, &digest[0], digest.size()); if (result) {
diff --git a/chrome/browser/extensions/api/music_manager_private/device_id.h b/chrome/browser/extensions/api/music_manager_private/device_id.h index a9d6461..21f56fd 100644 --- a/chrome/browser/extensions/api/music_manager_private/device_id.h +++ b/chrome/browser/extensions/api/music_manager_private/device_id.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_MUSIC_MANAGER_PRIVATE_DEVICE_ID_H_ #define CHROME_BROWSER_EXTENSIONS_API_MUSIC_MANAGER_PRIVATE_DEVICE_ID_H_ +#include <stddef.h> + #include <string> #include "base/bind.h"
diff --git a/chrome/browser/extensions/api/music_manager_private/device_id_linux.cc b/chrome/browser/extensions/api/music_manager_private/device_id_linux.cc index e334706..116fd2a8 100644 --- a/chrome/browser/extensions/api/music_manager_private/device_id_linux.cc +++ b/chrome/browser/extensions/api/music_manager_private/device_id_linux.cc
@@ -4,10 +4,11 @@ #include "chrome/browser/extensions/api/music_manager_private/device_id.h" -#include <sys/socket.h> // Must be included before ifaddrs.h. #include <ifaddrs.h> #include <net/if.h> +#include <stddef.h> #include <sys/ioctl.h> +#include <sys/socket.h> // Must be included before ifaddrs.h. #include <map> @@ -15,6 +16,7 @@ #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/extensions/api/music_manager_private/device_id_mac.cc b/chrome/browser/extensions/api/music_manager_private/device_id_mac.cc index 06a3ba7..f350f26e 100644 --- a/chrome/browser/extensions/api/music_manager_private/device_id_mac.cc +++ b/chrome/browser/extensions/api/music_manager_private/device_id_mac.cc
@@ -5,12 +5,13 @@ #include "chrome/browser/extensions/api/music_manager_private/device_id.h" #include <CoreFoundation/CoreFoundation.h> -#include <DiskArbitration/DASession.h> #include <DiskArbitration/DADisk.h> +#include <DiskArbitration/DASession.h> #include <IOKit/IOKitLib.h> #include <IOKit/network/IOEthernetController.h> #include <IOKit/network/IOEthernetInterface.h> #include <IOKit/network/IONetworkInterface.h> +#include <stddef.h> #include <sys/mount.h> #include "base/bind.h"
diff --git a/chrome/browser/extensions/api/music_manager_private/device_id_win.cc b/chrome/browser/extensions/api/music_manager_private/device_id_win.cc index c418624..594ec85 100644 --- a/chrome/browser/extensions/api/music_manager_private/device_id_win.cc +++ b/chrome/browser/extensions/api/music_manager_private/device_id_win.cc
@@ -7,6 +7,7 @@ // Note: The order of header includes is important, as we want both pre-Vista // and post-Vista data structures to be defined, specifically // PIP_ADAPTER_ADDRESSES and PMIB_IF_ROW2. +#include <stddef.h> #include <winsock2.h> #include <ws2def.h> #include <ws2ipdef.h>
diff --git a/chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc b/chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc index 01944907..27e7bc9 100644 --- a/chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc +++ b/chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.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 "chrome/browser/apps/app_browsertest_util.h" #include "extensions/test/extension_test_message_listener.h"
diff --git a/chrome/browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc b/chrome/browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc index af119115..57d6e14 100644 --- a/chrome/browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc +++ b/chrome/browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc
@@ -4,6 +4,7 @@ #include <string> +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/values.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/extensions/api/networking_private/crypto_verify_impl.cc b/chrome/browser/extensions/api/networking_private/crypto_verify_impl.cc index 2385a3e..812f7769 100644 --- a/chrome/browser/extensions/api/networking_private/crypto_verify_impl.cc +++ b/chrome/browser/extensions/api/networking_private/crypto_verify_impl.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/networking_private/crypto_verify_impl.h" +#include <stdint.h> + #include "base/base64.h" #include "base/bind.h" #include "base/bind_helpers.h"
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc index c0805cad..a74c977 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
@@ -2,12 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <map> #include <vector> #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "components/keyed_service/core/keyed_service.h" #include "components/onc/onc_constants.h"
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter.h b/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter.h index f52c16be..23590926 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter.h +++ b/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_chromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_chromeos.cc index a47b2e94..cf2b101 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_chromeos.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_chromeos.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 "base/macros.h" #include "chrome/browser/extensions/api/networking_private/networking_private_credentials_getter.h" const char kErrorNotImplemented[] = "Error.NotImplemented";
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_mac.cc b/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_mac.cc index 10a2ec5f..a473703 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_mac.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_mac.cc
@@ -5,9 +5,11 @@ #include "chrome/browser/extensions/api/networking_private/networking_private_credentials_getter.h" #include <Security/Security.h> +#include <stdint.h> #include "base/base64.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/extensions/api/networking_private/networking_private_crypto.h" #include "components/wifi/wifi_service.h" @@ -55,8 +57,8 @@ return; } - std::vector<uint8> public_key_data(public_key.begin(), public_key.end()); - std::vector<uint8> ciphertext; + std::vector<uint8_t> public_key_data(public_key.begin(), public_key.end()); + std::vector<uint8_t> ciphertext; if (!networking_private_crypto::EncryptByteString( public_key_data, key_data, &ciphertext)) { callback.Run("", kErrorEncryption);
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_win.cc b/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_win.cc index bf54695..932c58d 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_win.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_credentials_getter_win.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/extensions/api/networking_private/networking_private_credentials_getter.h" +#include <stdint.h> + #include "base/base64.h" #include "base/bind.h" +#include "base/macros.h" #include "base/thread_task_runner_handle.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/common/extensions/api/networking_private/networking_private_crypto.h" @@ -44,7 +47,7 @@ ~CredentialsGetterHostClient() override; // Public key used to encrypt results - std::vector<uint8> public_key_; + std::vector<uint8_t> public_key_; // Callback for reporting the result. NetworkingPrivateCredentialsGetter::CredentialsCallback callback_; @@ -78,7 +81,7 @@ void CredentialsGetterHostClient::OnGotCredentials(const std::string& key_data, bool success) { if (success) { - std::vector<uint8> ciphertext; + std::vector<uint8_t> ciphertext; if (!networking_private_crypto::EncryptByteString( public_key_, key_data, &ciphertext)) { callback_.Run("", "Encrypt Credentials Failed");
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_chromeos.h b/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_chromeos.h index 84084231..43732c0a 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_chromeos.h +++ b/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_chromeos.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_UI_DELEGATE_CHROMEOS_H_ #define CHROME_BROWSER_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_UI_DELEGATE_CHROMEOS_H_ +#include "base/macros.h" #include "extensions/browser/api/networking_private/networking_private_delegate.h" namespace chromeos {
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.cc b/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.cc index 6fd699b..803ef91 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h" +#include "build/build_config.h" + #if defined(OS_CHROMEOS) #include "chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_chromeos.h" #endif
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h b/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h index 2716128..de0a25de 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h +++ b/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_UI_DELEGATE_FACTORY_IMPL_H_ #define CHROME_BROWSER_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_UI_DELEGATE_FACTORY_IMPL_H_ +#include "base/macros.h" #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_verify_delegate_factory_impl.cc b/chrome/browser/extensions/api/networking_private/networking_private_verify_delegate_factory_impl.cc index 44226d5..9112f8c 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_verify_delegate_factory_impl.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_verify_delegate_factory_impl.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/api/networking_private/networking_private_verify_delegate_factory_impl.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/networking_private/crypto_verify_impl.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_verify_delegate_factory_impl.h b/chrome/browser/extensions/api/networking_private/networking_private_verify_delegate_factory_impl.h index 714d10e..ca930f8 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_verify_delegate_factory_impl.h +++ b/chrome/browser/extensions/api/networking_private/networking_private_verify_delegate_factory_impl.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_VERIFY_DELEGATE_FACTORY_IMPL_H_ #define CHROME_BROWSER_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_VERIFY_DELEGATE_FACTORY_IMPL_H_ +#include "base/macros.h" #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/notification_provider/notification_provider_api.h b/chrome/browser/extensions/api/notification_provider/notification_provider_api.h index 012e068..40582577 100644 --- a/chrome/browser/extensions/api/notification_provider/notification_provider_api.h +++ b/chrome/browser/extensions/api/notification_provider/notification_provider_api.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc index 3617e30..5bf1a11a 100644 --- a/chrome/browser/extensions/api/notifications/notifications_api.cc +++ b/chrome/browser/extensions/api/notifications/notifications_api.cc
@@ -4,15 +4,19 @@ #include "chrome/browser/extensions/api/notifications/notifications_api.h" +#include <stddef.h> + #include <utility> #include "base/callback.h" #include "base/guid.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_conversion_helper.h"
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc index d232f63f..c44382e 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" +#include <stddef.h> + #include "base/lazy_instance.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h"
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.h b/chrome/browser/extensions/api/omnibox/omnibox_api.h index 24bfe62..9c36a7c1 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.h +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_observer.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h b/chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h index 0af18f9..0013aa0 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h +++ b/chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_OMNIBOX_OMNIBOX_API_TESTBASE_H_ #define CHROME_BROWSER_EXTENSIONS_API_OMNIBOX_OMNIBOX_API_TESTBASE_H_ +#include <stddef.h> + #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_unittest.cc b/chrome/browser/extensions/api/omnibox/omnibox_unittest.cc index 2a826d2..c6e9f9a 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_unittest.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <utility> #include "base/values.h"
diff --git a/chrome/browser/extensions/api/page_capture/page_capture_api.cc b/chrome/browser/extensions/api/page_capture/page_capture_api.cc index 672c295..ba0fd50 100644 --- a/chrome/browser/extensions/api/page_capture/page_capture_api.cc +++ b/chrome/browser/extensions/api/page_capture/page_capture_api.cc
@@ -136,8 +136,7 @@ base::Bind(&PageCaptureSaveAsMHTMLFunction::MHTMLGenerated, this)); } -void PageCaptureSaveAsMHTMLFunction::MHTMLGenerated( - int64 mhtml_file_size) { +void PageCaptureSaveAsMHTMLFunction::MHTMLGenerated(int64_t mhtml_file_size) { if (mhtml_file_size <= 0) { ReturnFailure(kMHTMLGenerationFailedError); return; @@ -161,7 +160,7 @@ Release(); // Balanced in Run() } -void PageCaptureSaveAsMHTMLFunction::ReturnSuccess(int64 file_size) { +void PageCaptureSaveAsMHTMLFunction::ReturnSuccess(int64_t file_size) { DCHECK_CURRENTLY_ON(BrowserThread::UI); WebContents* web_contents = GetWebContents();
diff --git a/chrome/browser/extensions/api/page_capture/page_capture_api.h b/chrome/browser/extensions/api/page_capture/page_capture_api.h index ad467bbd..0b84584 100644 --- a/chrome/browser/extensions/api/page_capture/page_capture_api.h +++ b/chrome/browser/extensions/api/page_capture/page_capture_api.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_PAGE_CAPTURE_PAGE_CAPTURE_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_PAGE_CAPTURE_PAGE_CAPTURE_API_H_ +#include <stdint.h> + #include <string> #include "base/memory/ref_counted.h" @@ -46,10 +48,10 @@ // Called on the UI thread. void TemporaryFileCreated(bool success); void ReturnFailure(const std::string& error); - void ReturnSuccess(int64 file_size); + void ReturnSuccess(int64_t file_size); // Callback called once the MHTML generation is done. - void MHTMLGenerated(int64 mhtml_file_size); + void MHTMLGenerated(int64_t mhtml_file_size); // Returns the WebContents we are associated with, NULL if it's been closed. content::WebContents* GetWebContents();
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc index 1787d8e..125a099 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
@@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <sstream> #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/observer_list_threadsafe.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.h b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.h index fd8dffa..a56f726 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.h +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_PASSWORDS_PRIVATE_PASSWORDS_PRIVATE_DELEGATE_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_API_PASSWORDS_PRIVATE_PASSWORDS_PRIVATE_DELEGATE_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc index 3f15d3b..5d0fe00 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -6,6 +6,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.h b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.h index a3aa82b..5d4c220 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.h +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_PASSWORDS_PRIVATE_PASSWORDS_PRIVATE_DELEGATE_IMPL_H_ #define CHROME_BROWSER_EXTENSIONS_API_PASSWORDS_PRIVATE_PASSWORDS_PRIVATE_DELEGATE_IMPL_H_ +#include <stddef.h> + #include <map> #include <string> #include <vector> @@ -13,6 +15,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list_threadsafe.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/passwords_private/passwords_private_delegate.h" #include "chrome/browser/ui/passwords/password_manager_presenter.h" #include "chrome/browser/ui/passwords/password_ui_view.h"
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_event_router.h b/chrome/browser/extensions/api/passwords_private/passwords_private_event_router.h index 188f1d1..56ff2d83 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_event_router.h +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_event_router.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_PASSWORDS_PRIVATE_PASSWORDS_PRIVATE_EVENT_ROUTER_H_ #define CHROME_BROWSER_EXTENSIONS_API_PASSWORDS_PRIVATE_PASSWORDS_PRIVATE_EVENT_ROUTER_H_ +#include "base/macros.h" #include "chrome/browser/extensions/api/passwords_private/passwords_private_delegate.h" #include "components/keyed_service/core/keyed_service.h" #include "extensions/browser/event_router.h"
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.h b/chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.h index f412b35..42ede59 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.h +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_PASSWORDS_PRIVATE_PASSWORDS_PRIVATE_EVENT_ROUTER_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_API_PASSWORDS_PRIVATE_PASSWORDS_PRIVATE_EVENT_ROUTER_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc index b4cb705e..39673f7 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h" +#include <stddef.h> + #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc index 88ba016..17d9f03f 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
diff --git a/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc b/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc index 4374ea3..e683c056 100644 --- a/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc +++ b/chrome/browser/extensions/api/platform_keys/platform_keys_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/platform_keys/platform_keys_api.h" +#include <stddef.h> + #include <vector> #include "base/bind.h"
diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting.h b/chrome/browser/extensions/api/preference/chrome_direct_setting.h index f1ae691..f373e22 100644 --- a/chrome/browser/extensions/api/preference/chrome_direct_setting.h +++ b/chrome/browser/extensions/api/preference/chrome_direct_setting.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_API_PREFERENCE_CHROME_DIRECT_SETTING_H__ #include "base/lazy_instance.h" +#include "base/macros.h" #include "chrome/browser/extensions/chrome_extension_function.h" class PrefService;
diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc index 20030ae6..4bf9a44 100644 --- a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc +++ b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/containers/hash_tables.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h index 5fe1486..1255f27 100644 --- a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h +++ b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_PREFERENCE_CHROME_DIRECT_SETTING_API_H__ #define CHROME_BROWSER_EXTENSIONS_API_PREFERENCE_CHROME_DIRECT_SETTING_API_H__ +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/event_router.h"
diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc index b43a833..0d1f72b 100644 --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc
@@ -4,15 +4,19 @@ #include "chrome/browser/extensions/api/preference/preference_api.h" +#include <stddef.h> + #include <map> #include <utility> #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/content_settings/content_settings_service.h" #include "chrome/browser/extensions/api/preference/preference_api_constants.h"
diff --git a/chrome/browser/extensions/api/preference/preference_api.h b/chrome/browser/extensions/api/preference/preference_api.h index 0f95a9b..5129c4fd 100644 --- a/chrome/browser/extensions/api/preference/preference_api.h +++ b/chrome/browser/extensions/api/preference/preference_api.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_change_registrar.h" #include "chrome/browser/extensions/api/content_settings/content_settings_store.h"
diff --git a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc index c5c949a..b3e355f2 100644 --- a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc +++ b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/mock_pref_change_callback.h"
diff --git a/chrome/browser/extensions/api/preference/preference_apitest.cc b/chrome/browser/extensions/api/preference/preference_apitest.cc index 8fef0e45d..b6a70e52 100644 --- a/chrome/browser/extensions/api/preference/preference_apitest.cc +++ b/chrome/browser/extensions/api/preference/preference_apitest.cc
@@ -7,6 +7,7 @@ #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/preferences_private/preferences_private_api.h b/chrome/browser/extensions/api/preferences_private/preferences_private_api.h index 5e8a37b..a9c4665 100644 --- a/chrome/browser/extensions/api/preferences_private/preferences_private_api.h +++ b/chrome/browser/extensions/api/preferences_private/preferences_private_api.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_PREFERENCES_PRIVATE_PREFERENCES_PRIVATE_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_PREFERENCES_PRIVATE_PREFERENCES_PRIVATE_API_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "components/sync_driver/sync_service_observer.h" #include "extensions/browser/extension_function.h"
diff --git a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc index ceadc84..08f1d2e 100644 --- a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc +++ b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc
@@ -2,18 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/preferences_private/preferences_private_api.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/principals_private/principals_private_api.h b/chrome/browser/extensions/api/principals_private/principals_private_api.h index 5f5d96e..f818549 100644 --- a/chrome/browser/extensions/api/principals_private/principals_private_api.h +++ b/chrome/browser/extensions/api/principals_private/principals_private_api.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_PRINCIPALS_PRIVATE_PRINCIPALS_PRIVATE_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_PRINCIPALS_PRIVATE_PRINCIPALS_PRIVATE_API_H_ +#include "base/macros.h" #include "chrome/browser/extensions/chrome_extension_function.h" // WARNING: chrome.principalsPrivate is a set of experimental APIs for the new
diff --git a/chrome/browser/extensions/api/processes/processes_api.cc b/chrome/browser/extensions/api/processes/processes_api.cc index b7d2b81..3ca88b56 100644 --- a/chrome/browser/extensions/api/processes/processes_api.cc +++ b/chrome/browser/extensions/api/processes/processes_api.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/api/processes/processes_api.h" +#include <stddef.h> +#include <stdint.h> + #include "base/callback.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" @@ -185,7 +188,7 @@ // Network is reported by the TaskManager per resource (tab), not per // process, therefore we need to iterate through the group of resources // and aggregate the data. - int64 net = 0; + int64_t net = 0; int length = model->GetGroupRangeForResource(index).second; for (int i = 0; i < length; ++i) net += model->GetNetworkUsage(index + i); @@ -201,8 +204,8 @@ TaskManagerModel* model, int index) { size_t mem; - int64 pr_mem = model->GetPrivateMemory(index, &mem) ? - static_cast<int64>(mem) : -1; + int64_t pr_mem = + model->GetPrivateMemory(index, &mem) ? static_cast<int64_t>(mem) : -1; result->SetDouble(keys::kPrivateMemoryKey, static_cast<double>(pr_mem)); }
diff --git a/chrome/browser/extensions/api/processes/processes_api.h b/chrome/browser/extensions/api/processes/processes_api.h index 289f1616..41b0cc7 100644 --- a/chrome/browser/extensions/api/processes/processes_api.h +++ b/chrome/browser/extensions/api/processes/processes_api.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/task_manager/task_manager.h"
diff --git a/chrome/browser/extensions/api/proxy/proxy_api.h b/chrome/browser/extensions/api/proxy/proxy_api.h index da76d92..f3c3fb5 100644 --- a/chrome/browser/extensions/api/proxy/proxy_api.h +++ b/chrome/browser/extensions/api/proxy/proxy_api.h
@@ -10,6 +10,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/strings/string16.h" #include "chrome/browser/extensions/api/preference/preference_api.h"
diff --git a/chrome/browser/extensions/api/proxy/proxy_api_constants.cc b/chrome/browser/extensions/api/proxy/proxy_api_constants.cc index 0c1ee3aa..88a43df 100644 --- a/chrome/browser/extensions/api/proxy/proxy_api_constants.cc +++ b/chrome/browser/extensions/api/proxy/proxy_api_constants.cc
@@ -4,9 +4,9 @@ // Constants for the Chrome Extensions Proxy Settings API. +#include "base/macros.h" #include "chrome/browser/extensions/api/proxy/proxy_api_constants.h" -#include "base/basictypes.h" namespace extensions { namespace proxy_api_constants {
diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc index 69198770..34c3117 100644 --- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc +++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
@@ -13,8 +13,9 @@ #include "chrome/browser/extensions/api/proxy/proxy_api_helpers.h" +#include <stddef.h> + #include "base/base64.h" -#include "base/basictypes.h" #include "base/strings/string_tokenizer.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/proxy/proxy_apitest.cc b/chrome/browser/extensions/api/proxy/proxy_apitest.cc index 740efa54..fd9eb3e 100644 --- a/chrome/browser/extensions/api/proxy/proxy_apitest.cc +++ b/chrome/browser/extensions/api/proxy/proxy_apitest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/resources_private/resources_private_api.h b/chrome/browser/extensions/api/resources_private/resources_private_api.h index 5cd94e8..5609686 100644 --- a/chrome/browser/extensions/api/resources_private/resources_private_api.h +++ b/chrome/browser/extensions/api/resources_private/resources_private_api.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_RESOURCES_PRIVATE_RESOURCES_PRIVATE_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_RESOURCES_PRIVATE_RESOURCES_PRIVATE_API_H_ +#include "base/macros.h" #include "extensions/browser/extension_function.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/resources_private/resources_private_apitest.cc b/chrome/browser/extensions/api/resources_private/resources_private_apitest.cc index 9647f7e..9b8b16c1 100644 --- a/chrome/browser/extensions/api/resources_private/resources_private_apitest.cc +++ b/chrome/browser/extensions/api/resources_private/resources_private_apitest.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 "base/macros.h" #include "chrome/browser/extensions/extension_apitest.h" class ResourcesPrivateApiTest : public ExtensionApiTest {
diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc index 5e752f4..0bab646 100644 --- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc +++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
@@ -12,6 +12,7 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/updater/extension_updater.h"
diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h index 04bbda9..ee2ff051 100644 --- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h +++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "components/proximity_auth/screenlock_bridge.h" #include "extensions/browser/browser_context_keyed_api_factory.h"
diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc b/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc index 87464cb..3ff5039 100644 --- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc +++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc
@@ -2,8 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc b/chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc index c5c8286e..b6f352b2 100644 --- a/chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc +++ b/chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/search_engines_private/search_engines_private_api.h" +#include <stddef.h> + #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/search_engines_private/search_engines_private_apitest.cc b/chrome/browser/extensions/api/search_engines_private/search_engines_private_apitest.cc index ba51ab5..a3c60556 100644 --- a/chrome/browser/extensions/api/search_engines_private/search_engines_private_apitest.cc +++ b/chrome/browser/extensions/api/search_engines_private/search_engines_private_apitest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/extensions/api/search_engines_private.h"
diff --git a/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router.h b/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router.h index bacd971..088c97f 100644 --- a/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router.h +++ b/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_SEARCH_ENGINES_PRIVATE_SEARCH_ENGINES_PRIVATE_EVENT_ROUTER_H_ #define CHROME_BROWSER_EXTENSIONS_API_SEARCH_ENGINES_PRIVATE_SEARCH_ENGINES_PRIVATE_EVENT_ROUTER_H_ +#include "base/macros.h" #include "components/keyed_service/core/keyed_service.h" #include "components/search_engines/template_url_service.h" #include "components/search_engines/template_url_service_observer.h"
diff --git a/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router_factory.h b/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router_factory.h index dad28f66..d083a65 100644 --- a/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router_factory.h +++ b/chrome/browser/extensions/api/search_engines_private/search_engines_private_event_router_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_SEARCH_ENGINES_PRIVATE_SEARCH_ENGINES_PRIVATE_EVENT_ROUTER_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_API_SEARCH_ENGINES_PRIVATE_SEARCH_ENGINES_PRIVATE_EVENT_ROUTER_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/api/sessions/session_id.cc b/chrome/browser/extensions/api/sessions/session_id.cc index e1f2afe..37201a0 100644 --- a/chrome/browser/extensions/api/sessions/session_id.cc +++ b/chrome/browser/extensions/api/sessions/session_id.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/sessions/session_id.h" +#include <stddef.h> + #include "base/strings/string_number_conversions.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/sessions/session_id.h b/chrome/browser/extensions/api/sessions/session_id.h index 6cdcb5fc..c973f9f 100644 --- a/chrome/browser/extensions/api/sessions/session_id.h +++ b/chrome/browser/extensions/api/sessions/session_id.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/sessions/sessions_api.cc b/chrome/browser/extensions/api/sessions/sessions_api.cc index 2fb9c3b..e4146f85 100644 --- a/chrome/browser/extensions/api/sessions/sessions_api.cc +++ b/chrome/browser/extensions/api/sessions/sessions_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/sessions/sessions_api.h" +#include <stddef.h> + #include <vector> #include "base/i18n/rtl.h"
diff --git a/chrome/browser/extensions/api/sessions/sessions_api.h b/chrome/browser/extensions/api/sessions/sessions_api.h index 876faae..de6e9e7d 100644 --- a/chrome/browser/extensions/api/sessions/sessions_api.h +++ b/chrome/browser/extensions/api/sessions/sessions_api.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/common/extensions/api/sessions.h" #include "chrome/common/extensions/api/tabs.h"
diff --git a/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/chrome/browser/extensions/api/sessions/sessions_apitest.cc index 900535d..221a5f1d 100644 --- a/chrome/browser/extensions/api/sessions/sessions_apitest.cc +++ b/chrome/browser/extensions/api/sessions/sessions_apitest.cc
@@ -4,10 +4,14 @@ #include "chrome/browser/extensions/api/sessions/sessions_api.h" +#include <stddef.h> + #include "base/command_line.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/pattern.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/tabs/tabs_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_function_test_utils.h"
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc index c1cec39..51e3e95c 100644 --- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc +++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h" +#include <stddef.h> + #include "base/lazy_instance.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/preference/preference_api.h"
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h index e0dad1ca..b100db0 100644 --- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h +++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/scoped_observer.h" #include "components/search_engines/template_url_service.h" #include "extensions/browser/browser_context_keyed_api_factory.h"
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc index d1ffe87..c34e06f 100644 --- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc +++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc
@@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc index ccb66be..8e7abe0 100644 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/api/settings_private/prefs_util.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.h b/chrome/browser/extensions/api/settings_private/prefs_util.h index fae5ba5..1d7954e1 100644 --- a/chrome/browser/extensions/api/settings_private/prefs_util.h +++ b/chrome/browser/extensions/api/settings_private/prefs_util.h
@@ -10,6 +10,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/common/extensions/api/settings_private.h" class PrefService;
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_apitest.cc b/chrome/browser/extensions/api/settings_private/settings_private_apitest.cc index 4941a237..0b37347 100644 --- a/chrome/browser/extensions/api/settings_private/settings_private_apitest.cc +++ b/chrome/browser/extensions/api/settings_private/settings_private_apitest.cc
@@ -3,9 +3,11 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/settings_private/settings_private_delegate.h" #include "chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.h b/chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.h index 199711a..3564810 100644 --- a/chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.h +++ b/chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_SETTINGS_PRIVATE_DELEGATE_FACTORY_H__ #define CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_SETTINGS_PRIVATE_DELEGATE_FACTORY_H__ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc b/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc index 6a9582e..b49af6d7 100644 --- a/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc +++ b/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/settings_private.h"
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_event_router.h b/chrome/browser/extensions/api/settings_private/settings_private_event_router.h index 5b07a600..f61e13f 100644 --- a/chrome/browser/extensions/api/settings_private/settings_private_event_router.h +++ b/chrome/browser/extensions/api/settings_private/settings_private_event_router.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_SETTINGS_PRIVATE_EVENT_ROUTER_H_ #define CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_SETTINGS_PRIVATE_EVENT_ROUTER_H_ +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/extensions/api/settings_private/prefs_util.h"
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_event_router_factory.h b/chrome/browser/extensions/api/settings_private/settings_private_event_router_factory.h index b92cf0f2..8ef02d8e 100644 --- a/chrome/browser/extensions/api/settings_private/settings_private_event_router_factory.h +++ b/chrome/browser/extensions/api/settings_private/settings_private_event_router_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_SETTINGS_PRIVATE_EVENT_ROUTER_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_SETTINGS_PRIVATE_EVENT_ROUTER_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h index b94f8f3b..bc5cacb 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h
@@ -8,6 +8,7 @@ #include <string> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/scoped_observer.h" #include "components/sync_driver/device_info_tracker.h"
diff --git a/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc b/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc index e372f00e..4fd8525 100644 --- a/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc +++ b/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc
@@ -4,6 +4,7 @@ #include "extensions/browser/api/socket/tcp_socket.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h"
diff --git a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc index 801c03d0..5d33fcd 100644 --- a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc +++ b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc
@@ -4,11 +4,13 @@ #include "extensions/browser/api/socket/tls_socket.h" +#include <stddef.h> #include <stdint.h> #include <deque> #include <utility> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_piece.h" #include "net/base/address_list.h" @@ -43,8 +45,8 @@ int(net::IOBuffer* buf, int buf_len, const net::CompletionCallback& callback)); - MOCK_METHOD1(SetReceiveBufferSize, int(int32)); - MOCK_METHOD1(SetSendBufferSize, int(int32)); + MOCK_METHOD1(SetReceiveBufferSize, int(int32_t)); + MOCK_METHOD1(SetSendBufferSize, int(int32_t)); MOCK_METHOD1(Connect, int(const CompletionCallback&)); MOCK_CONST_METHOD0(IsConnectedAndIdle, bool()); MOCK_CONST_METHOD1(GetPeerAddress, int(net::IPEndPoint*));
diff --git a/chrome/browser/extensions/api/socket/udp_socket_unittest.cc b/chrome/browser/extensions/api/socket/udp_socket_unittest.cc index cc3ebad..c9139e5 100644 --- a/chrome/browser/extensions/api/socket/udp_socket_unittest.cc +++ b/chrome/browser/extensions/api/socket/udp_socket_unittest.cc
@@ -4,9 +4,13 @@ #include "extensions/browser/api/socket/udp_socket.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" #include "base/test/test_timeouts.h" @@ -29,7 +33,7 @@ static void OnCompleted(int bytes_read, scoped_refptr<net::IOBuffer> io_buffer, const std::string& address, - uint16 port) { + uint16_t port) { // Do nothing; don't care. }
diff --git a/chrome/browser/extensions/api/spellcheck/spellcheck_api.h b/chrome/browser/extensions/api/spellcheck/spellcheck_api.h index 9c976af0..5acb376 100644 --- a/chrome/browser/extensions/api/spellcheck/spellcheck_api.h +++ b/chrome/browser/extensions/api/spellcheck/spellcheck_api.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_SPELLCHECK_SPELLCHECK_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_SPELLCHECK_SPELLCHECK_API_H_ +#include "base/macros.h" #include "base/scoped_observer.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/extension_registry_observer.h"
diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc index 55179585..d4d6f6f3 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
@@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" #include "chrome/browser/extensions/api/storage/policy_value_store.h"
diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.h b/chrome/browser/extensions/api/storage/managed_value_store_cache.h index a4202be..aab9968 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.h +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.h
@@ -8,9 +8,9 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h"
diff --git a/chrome/browser/extensions/api/storage/policy_value_store.h b/chrome/browser/extensions/api/storage/policy_value_store.h index 788212d..0ffc702 100644 --- a/chrome/browser/extensions/api/storage/policy_value_store.h +++ b/chrome/browser/extensions/api/storage/policy_value_store.h
@@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_POLICY_VALUE_STORE_H_ #define CHROME_BROWSER_EXTENSIONS_API_STORAGE_POLICY_VALUE_STORE_H_ +#include <stddef.h> + #include <string> #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "extensions/browser/api/storage/settings_observer.h"
diff --git a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc index 3969637..5ea5af6 100644 --- a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc +++ b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
@@ -7,6 +7,7 @@ #include "base/callback.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 "base/message_loop/message_loop.h"
diff --git a/chrome/browser/extensions/api/storage/settings_sync_processor.h b/chrome/browser/extensions/api/storage/settings_sync_processor.h index 214fbe9..1900794 100644 --- a/chrome/browser/extensions/api/storage/settings_sync_processor.h +++ b/chrome/browser/extensions/api/storage/settings_sync_processor.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "extensions/browser/value_store/value_store_change.h" #include "sync/api/sync_error.h"
diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc index 6e7af343..3a184b11 100644 --- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc +++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" @@ -10,6 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_number_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/storage/settings_sync_util.h" #include "chrome/browser/extensions/api/storage/sync_value_store_cache.h" #include "chrome/browser/extensions/api/storage/syncable_settings_storage.h"
diff --git a/chrome/browser/extensions/api/storage/sync_storage_backend.h b/chrome/browser/extensions/api/storage/sync_storage_backend.h index d5ca7f5..584a354e 100644 --- a/chrome/browser/extensions/api/storage/sync_storage_backend.h +++ b/chrome/browser/extensions/api/storage/sync_storage_backend.h
@@ -11,6 +11,7 @@ #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h"
diff --git a/chrome/browser/extensions/api/storage/sync_value_store_cache.cc b/chrome/browser/extensions/api/storage/sync_value_store_cache.cc index 25dc33a..738c496 100644 --- a/chrome/browser/extensions/api/storage/sync_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/sync_value_store_cache.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/storage/sync_value_store_cache.h" +#include <stddef.h> + #include "base/bind.h" #include "base/callback.h" #include "base/files/file_path.h"
diff --git a/chrome/browser/extensions/api/storage/sync_value_store_cache.h b/chrome/browser/extensions/api/storage/sync_value_store_cache.h index 5f1a1f5d..d44a6fd2 100644 --- a/chrome/browser/extensions/api/storage/sync_value_store_cache.h +++ b/chrome/browser/extensions/api/storage/sync_value_store_cache.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_SYNC_VALUE_STORE_CACHE_H_ #define CHROME_BROWSER_EXTENSIONS_API_STORAGE_SYNC_VALUE_STORE_CACHE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "extensions/browser/api/storage/settings_observer.h"
diff --git a/chrome/browser/extensions/api/storage/syncable_settings_storage.h b/chrome/browser/extensions/api/storage/syncable_settings_storage.h index 5645c7ad..3e16094 100644 --- a/chrome/browser/extensions/api/storage/syncable_settings_storage.h +++ b/chrome/browser/extensions/api/storage/syncable_settings_storage.h
@@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_SYNCABLE_SETTINGS_STORAGE_H_ #define CHROME_BROWSER_EXTENSIONS_API_STORAGE_SYNCABLE_SETTINGS_STORAGE_H_ +#include <stddef.h> + #include <string> #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list_threadsafe.h"
diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.cc b/chrome/browser/extensions/api/streams_private/streams_private_api.cc index 9b23daa..b85d2fb8 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_api.cc +++ b/chrome/browser/extensions/api/streams_private/streams_private_api.cc
@@ -65,7 +65,7 @@ content::WebContents* web_contents, scoped_ptr<content::StreamInfo> stream, const std::string& view_id, - int64 expected_content_size, + int64_t expected_content_size, bool embedded, int render_process_id, int render_frame_id) {
diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.h b/chrome/browser/extensions/api/streams_private/streams_private_api.h index 42081a64..825ad43 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_api.h +++ b/chrome/browser/extensions/api/streams_private/streams_private_api.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_STREAMS_PRIVATE_STREAMS_PRIVATE_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_STREAMS_PRIVATE_STREAMS_PRIVATE_API_H_ +#include <stdint.h> + #include <map> #include <string> @@ -41,7 +43,7 @@ content::WebContents* web_contents, scoped_ptr<content::StreamInfo> stream, const std::string& view_id, - int64 expected_content_size, + int64_t expected_content_size, bool embedded, int render_process_id, int render_frame_id);
diff --git a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc index 9266ff7..60db11a 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc +++ b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
@@ -5,6 +5,7 @@ #include "base/command_line.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h index 7d2847a..1bfa1cf 100644 --- a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h +++ b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_SYNC_FILE_SYSTEM_EXTENSION_SYNC_EVENT_OBSERVER_H_ #define CHROME_BROWSER_EXTENSIONS_API_SYNC_FILE_SYSTEM_EXTENSION_SYNC_EVENT_OBSERVER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/sync_file_system/sync_event_observer.h"
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc index 0b9aafc54..7c533c6 100644 --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
@@ -325,8 +325,8 @@ void SyncFileSystemGetUsageAndQuotaFunction::DidGetUsageAndQuota( storage::QuotaStatusCode status, - int64 usage, - int64 quota) { + int64_t usage, + int64_t quota) { // Repost to switch from IO thread to UI thread for SendResponse(). if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) { DCHECK_CURRENTLY_ON(BrowserThread::IO);
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h index 2d6ffd0..38dc817 100644 --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_API_H_ +#include <stdint.h> + #include <map> #include "chrome/browser/extensions/chrome_extension_function.h" @@ -92,8 +94,8 @@ private: void DidGetUsageAndQuota(storage::QuotaStatusCode status, - int64 usage, - int64 quota); + int64_t usage, + int64_t quota); }; class SyncFileSystemRequestFileSystemFunction
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc index 4177d52..60b4385 100644 --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/run_loop.h" @@ -77,8 +79,8 @@ private: ::testing::NiceMock<MockRemoteFileSyncService>* mock_remote_service_; - int64 real_minimum_preserved_space_; - int64 real_default_quota_; + int64_t real_minimum_preserved_space_; + int64_t real_default_quota_; }; ACTION_P(NotifyOkStateAndCallback, mock_remote_service) {
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc index 99122d5..90c15e9 100644 --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc
@@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" @@ -159,7 +162,7 @@ LocalFileSyncService* local_service_; drive_backend::SyncEngine* remote_service_; - int64 real_minimum_preserved_space_; + int64_t real_minimum_preserved_space_; DISALLOW_COPY_AND_ASSIGN(SyncFileSystemTest); };
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h index 1486604..58b0e6b7 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h
@@ -9,6 +9,7 @@ #include <string> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/scoped_observer.h" #include "base/threading/thread_checker.h"
diff --git a/chrome/browser/extensions/api/system_private/system_private_api.cc b/chrome/browser/extensions/api/system_private/system_private_api.cc index d98ab2e..81c3b031 100644 --- a/chrome/browser/extensions/api/system_private/system_private_api.cc +++ b/chrome/browser/extensions/api/system_private/system_private_api.cc
@@ -4,8 +4,10 @@ #include "chrome/browser/extensions/api/system_private/system_private_api.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/event_router_forwarder.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/system_private/system_private_apitest.cc b/chrome/browser/extensions/api/system_private/system_private_apitest.cc index c60091d..073a5e1c 100644 --- a/chrome/browser/extensions/api/system_private/system_private_apitest.cc +++ b/chrome/browser/extensions/api/system_private/system_private_apitest.cc
@@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/extensions/api/tab_capture/offscreen_tab.cc b/chrome/browser/extensions/api/tab_capture/offscreen_tab.cc index ea9a049f..006968a 100644 --- a/chrome/browser/extensions/api/tab_capture/offscreen_tab.cc +++ b/chrome/browser/extensions/api/tab_capture/offscreen_tab.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include "base/bind.h" +#include "base/macros.h" #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/web_contents_sizer.h"
diff --git a/chrome/browser/extensions/api/tab_capture/offscreen_tab.h b/chrome/browser/extensions/api/tab_capture/offscreen_tab.h index cbb534a..afc252c7 100644 --- a/chrome/browser/extensions/api/tab_capture/offscreen_tab.h +++ b/chrome/browser/extensions/api/tab_capture/offscreen_tab.h
@@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_TAB_CAPTURE_OFFSCREEN_TAB_H_ #define CHROME_BROWSER_EXTENSIONS_API_TAB_CAPTURE_OFFSCREEN_TAB_H_ +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc index 61592a4..b905e5f 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc
@@ -12,6 +12,7 @@ #include <vector> #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/browser/extensions/api/tab_capture/offscreen_tab.h"
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc index 7bcba9bb..ec86fba 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/command_line.h" #include "base/location.h" #include "base/single_thread_task_runner.h" #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/tab_capture/tab_capture_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/tab_helper.h"
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc index 8462f04..759aa11 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/command_line.h" #include "base/strings/stringprintf.h" #include "base/test/trace_event_analyzer.h"
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc index d67a1be..a300dfb 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "components/keyed_service/content/browser_context_dependency_manager.h"
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h index b953f25..5698fed0e 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
@@ -9,6 +9,7 @@ #include <utility> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/scoped_observer.h" #include "chrome/browser/media/media_capture_devices_dispatcher.h"
diff --git a/chrome/browser/extensions/api/tabs/app_base_window.h b/chrome/browser/extensions/api/tabs/app_base_window.h index 8227e24..f606100 100644 --- a/chrome/browser/extensions/api/tabs/app_base_window.h +++ b/chrome/browser/extensions/api/tabs/app_base_window.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/base/base_window.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/tabs/app_window_controller.h b/chrome/browser/extensions/api/tabs/app_window_controller.h index 92979b8..eb9267f 100644 --- a/chrome/browser/extensions/api/tabs/app_window_controller.h +++ b/chrome/browser/extensions/api/tabs/app_window_controller.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "chrome/browser/extensions/window_controller.h" class Profile;
diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc index ac891e4..cefc769 100644 --- a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc +++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc
@@ -54,7 +54,7 @@ new LauncherFaviconLoader(this, web_contents_.get())); } -void AshPanelContents::LoadContents(int32 creator_process_id) { +void AshPanelContents::LoadContents(int32_t creator_process_id) { web_contents_->GetController().LoadURL( url_, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.h b/chrome/browser/extensions/api/tabs/ash_panel_contents.h index 4155a56..e137962 100644 --- a/chrome/browser/extensions/api/tabs/ash_panel_contents.h +++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.h
@@ -5,9 +5,11 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_ #define CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h" #include "extensions/browser/app_window/app_window.h" @@ -36,7 +38,7 @@ // extensions::AppWindowContents void Initialize(content::BrowserContext* context, const GURL& url) override; - void LoadContents(int32 creator_process_id) override; + void LoadContents(int32_t creator_process_id) override; void NativeWindowChanged( extensions::NativeAppWindow* native_app_window) override; void NativeWindowClosed() override;
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index 623b7c6d6..d91aa56 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/tabs/tabs_api.h" +#include <stddef.h> + #include <algorithm> #include <limits> #include <vector>
diff --git a/chrome/browser/extensions/api/tabs/tabs_event_router.cc b/chrome/browser/extensions/api/tabs/tabs_event_router.cc index dfa812b..25802f6 100644 --- a/chrome/browser/extensions/api/tabs/tabs_event_router.cc +++ b/chrome/browser/extensions/api/tabs/tabs_event_router.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/tabs/tabs_event_router.h" +#include <stddef.h> + #include "base/values.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
diff --git a/chrome/browser/extensions/api/tabs/tabs_interactive_test.cc b/chrome/browser/extensions/api/tabs/tabs_interactive_test.cc index 77e8ace4..320e218 100644 --- a/chrome/browser/extensions/api/tabs/tabs_interactive_test.cc +++ b/chrome/browser/extensions/api/tabs/tabs_interactive_test.cc
@@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/tabs/tabs_api.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/tabs/tabs_test.cc b/chrome/browser/extensions/api/tabs/tabs_test.cc index 4ee22430..81f7d59 100644 --- a/chrome/browser/extensions/api/tabs/tabs_test.cc +++ b/chrome/browser/extensions/api/tabs/tabs_test.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> #include <string> @@ -13,6 +15,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/devtools/devtools_window_testing.h" #include "chrome/browser/extensions/api/tabs/tabs_api.h"
diff --git a/chrome/browser/extensions/api/tabs/windows_event_router.cc b/chrome/browser/extensions/api/tabs/windows_event_router.cc index 0ccab14..c57463f 100644 --- a/chrome/browser/extensions/api/tabs/windows_event_router.cc +++ b/chrome/browser/extensions/api/tabs/windows_event_router.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/api/tabs/windows_event_router.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/tabs/app_base_window.h" #include "chrome/browser/extensions/api/tabs/app_window_controller.h"
diff --git a/chrome/browser/extensions/api/tabs/windows_event_router.h b/chrome/browser/extensions/api/tabs/windows_event_router.h index 28f42351..8ead6e1 100644 --- a/chrome/browser/extensions/api/tabs/windows_event_router.h +++ b/chrome/browser/extensions/api/tabs/windows_event_router.h
@@ -8,9 +8,10 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_observer.h" +#include "build/build_config.h" #include "chrome/browser/extensions/window_controller_list_observer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/extensions/api/terminal/terminal_extension_helper.cc b/chrome/browser/extensions/api/terminal/terminal_extension_helper.cc index ef3a201..56d9b5d4 100644 --- a/chrome/browser/extensions/api/terminal/terminal_extension_helper.cc +++ b/chrome/browser/extensions/api/terminal/terminal_extension_helper.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" +#include <stddef.h> + +#include "base/macros.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension_constants.h" #include "extensions/browser/extension_registry.h"
diff --git a/chrome/browser/extensions/api/top_sites/top_sites_api.cc b/chrome/browser/extensions/api/top_sites/top_sites_api.cc index 6f76cb2..c229cbb8 100644 --- a/chrome/browser/extensions/api/top_sites/top_sites_api.cc +++ b/chrome/browser/extensions/api/top_sites/top_sites_api.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/api/top_sites/top_sites_api.h" +#include <stddef.h> + #include "base/bind.h" #include "base/values.h" #include "chrome/browser/history/top_sites_factory.h"
diff --git a/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc b/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc index 17bd016..7561fad 100644 --- a/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc +++ b/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/extensions/api/top_sites/top_sites_api.h"
diff --git a/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.h b/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.h index 70dcc4d..f52f458 100644 --- a/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.h +++ b/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_API_VIRTUAL_KEYBOARD_PRIVATE_CHROME_VIRTUAL_KEYBOARD_DELEGATE_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "extensions/browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc b/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc index af94b975..01e9c51c 100644 --- a/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc +++ b/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc
@@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc index 635653748..f24a8bcb 100644 --- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc +++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/api/web_navigation/frame_navigation_state.h" #include "base/logging.h" +#include "base/macros.h" #include "chrome/common/url_constants.h" #include "content/public/browser/render_frame_host.h" #include "extensions/common/constants.h"
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h index 3751870..4363960 100644 --- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h +++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.h
@@ -9,6 +9,7 @@ #include <set> #include "base/compiler_specific.h" +#include "base/macros.h" #include "url/gurl.h" namespace content {
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h index c2b62825..671a0aa0 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h
@@ -12,6 +12,7 @@ #include <set> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/extensions/api/web_navigation/frame_navigation_state.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h index 882cf33..2250b80 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h
@@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "extensions/browser/extension_event_histogram_value.h" #include "ui/base/page_transition_types.h"
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index 3934405..e2c2379 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
@@ -6,11 +6,13 @@ #include <set> #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_browser_main.h"
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index 21aeda0..8414d1f1 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
@@ -2,16 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <map> #include <queue> -#include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" #include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_member.h" @@ -91,7 +94,7 @@ const std::string& extension_id, const std::string& event_name, const std::string& sub_event_name, - uint64 request_id, + uint64_t request_id, ExtensionWebRequestEventRouter::EventResponse* response) { ExtensionWebRequestEventRouter::GetInstance()->OnEventHandled( profile, extension_id, event_name, sub_event_name, request_id,
diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc index 7ad8576..c0d8a82 100644 --- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
@@ -3,6 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc index fbeef1f..aef7acf 100644 --- a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
@@ -4,6 +4,9 @@ #include "extensions/browser/api/web_request/web_request_permissions.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "chrome/common/extensions/extension_test_util.h"
diff --git a/chrome/browser/extensions/api/web_view/chrome_web_view_internal_api.h b/chrome/browser/extensions/api/web_view/chrome_web_view_internal_api.h index 8b2ad3c..d2c440f 100644 --- a/chrome/browser/extensions/api/web_view/chrome_web_view_internal_api.h +++ b/chrome/browser/extensions/api/web_view/chrome_web_view_internal_api.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_WEB_VIEW_CHROME_WEB_VIEW_INTERNAL_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_WEB_VIEW_CHROME_WEB_VIEW_INTERNAL_API_H_ +#include "base/macros.h" #include "extensions/browser/api/guest_view/web_view/web_view_internal_api.h" #include "extensions/browser/extension_function.h" #include "extensions/browser/guest_view/web_view/web_view_guest.h"
diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h index 7eb492f..43945652 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_WEBRTC_AUDIO_PRIVATE_WEBRTC_AUDIO_PRIVATE_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_WEBRTC_AUDIO_PRIVATE_WEBRTC_AUDIO_PRIVATE_API_H_ +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/system_monitor/system_monitor.h" #include "chrome/browser/extensions/chrome_extension_function.h"
diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc index 89cb2b763..4dba5b4e 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/json/json_writer.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" @@ -10,6 +12,7 @@ #include "base/threading/platform_thread.h" #include "base/time/time.h" #include "base/win/windows_version.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h" #include "chrome/browser/extensions/component_loader.h"
diff --git a/chrome/browser/extensions/api/webrtc_from_web_accessible_resource_browsertest.cc b/chrome/browser/extensions/api/webrtc_from_web_accessible_resource_browsertest.cc index a560407..32306a74 100644 --- a/chrome/browser/extensions/api/webrtc_from_web_accessible_resource_browsertest.cc +++ b/chrome/browser/extensions/api/webrtc_from_web_accessible_resource_browsertest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc index b47e8c12..56f87c2 100644 --- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc +++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/json/json_writer.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/api/webstore/webstore_api.h b/chrome/browser/extensions/api/webstore/webstore_api.h index 8581026..95ebdb6 100644 --- a/chrome/browser/extensions/api/webstore/webstore_api.h +++ b/chrome/browser/extensions/api/webstore/webstore_api.h
@@ -8,6 +8,7 @@ #include <list> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_observer.h" #include "chrome/browser/extensions/install_observer.h"
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 926766da..e49f4f2 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h" +#include <stddef.h> + #include "base/bind.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc index 28f99f3..cfc37a16 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
@@ -6,8 +6,10 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h" #include "chrome/browser/extensions/bundle_installer.h"
diff --git a/chrome/browser/extensions/api/webstore_widget_private/app_installer.cc b/chrome/browser/extensions/api/webstore_widget_private/app_installer.cc index be0f9d9..d96397c0 100644 --- a/chrome/browser/extensions/api/webstore_widget_private/app_installer.cc +++ b/chrome/browser/extensions/api/webstore_widget_private/app_installer.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/api/webstore_widget_private/app_installer.h" +#include "base/macros.h" #include "chrome/common/extensions/webstore_install_result.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/extensions/api/webstore_widget_private/app_installer.h b/chrome/browser/extensions/api/webstore_widget_private/app_installer.h index 854b95b9..8df3bf8e 100644 --- a/chrome/browser/extensions/api/webstore_widget_private/app_installer.h +++ b/chrome/browser/extensions/api/webstore_widget_private/app_installer.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/webstore_standalone_installer.h"
diff --git a/chrome/browser/extensions/api/webstore_widget_private/webstore_widget_private_api.h b/chrome/browser/extensions/api/webstore_widget_private/webstore_widget_private_api.h index c970c0d6..a9f03fee 100644 --- a/chrome/browser/extensions/api/webstore_widget_private/webstore_widget_private_api.h +++ b/chrome/browser/extensions/api/webstore_widget_private/webstore_widget_private_api.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chrome/common/extensions/webstore_install_result.h" #include "extensions/browser/extension_function.h"
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc index 3e51aa0..b79b4d4 100644 --- a/chrome/browser/extensions/app_background_page_apitest.cc +++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -8,6 +8,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/background/background_contents_service.h" #include "chrome/browser/background/background_contents_service_factory.h" #include "chrome/browser/background/background_mode_manager.h"
diff --git a/chrome/browser/extensions/app_data_migrator_unittest.cc b/chrome/browser/extensions/app_data_migrator_unittest.cc index c6713c7e..e814476 100644 --- a/chrome/browser/extensions/app_data_migrator_unittest.cc +++ b/chrome/browser/extensions/app_data_migrator_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include <utility> @@ -109,7 +111,7 @@ void MigrationCallback() { } -void DidWrite(base::File::Error status, int64 bytes, bool complete) { +void DidWrite(base::File::Error status, int64_t bytes, bool complete) { base::MessageLoop::current()->QuitWhenIdle(); }
diff --git a/chrome/browser/extensions/app_icon_loader.h b/chrome/browser/extensions/app_icon_loader.h index 05e19e5..950f0e6 100644 --- a/chrome/browser/extensions/app_icon_loader.h +++ b/chrome/browser/extensions/app_icon_loader.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" namespace gfx { class ImageSkia;
diff --git a/chrome/browser/extensions/app_icon_loader_impl.h b/chrome/browser/extensions/app_icon_loader_impl.h index 4ed1635..555c480 100644 --- a/chrome/browser/extensions/app_icon_loader_impl.h +++ b/chrome/browser/extensions/app_icon_loader_impl.h
@@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "chrome/browser/extensions/app_icon_loader.h" #include "extensions/browser/extension_icon_image.h"
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index e0a17bd..ba22a73 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/background_app_browsertest.cc b/chrome/browser/extensions/background_app_browsertest.cc index b73b8e3..2b66f2c 100644 --- a/chrome/browser/extensions/background_app_browsertest.cc +++ b/chrome/browser/extensions/background_app_browsertest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "chrome/browser/background/background_mode_manager.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_browsertest.h"
diff --git a/chrome/browser/extensions/blacklist.cc b/chrome/browser/extensions/blacklist.cc index 39ba3bf2..634e9cb5e 100644 --- a/chrome/browser/extensions/blacklist.cc +++ b/chrome/browser/extensions/blacklist.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h"
diff --git a/chrome/browser/extensions/blacklist.h b/chrome/browser/extensions/blacklist.h index 064501b..fc5f4bb 100644 --- a/chrome/browser/extensions/blacklist.h +++ b/chrome/browser/extensions/blacklist.h
@@ -12,6 +12,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/extensions/blacklist_factory.h b/chrome/browser/extensions/blacklist_factory.h index 127fce9..ab5cb28 100644 --- a/chrome/browser/extensions/blacklist_factory.h +++ b/chrome/browser/extensions/blacklist_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_BLACKLIST_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_BLACKLIST_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/blacklist_state_fetcher.h b/chrome/browser/extensions/blacklist_state_fetcher.h index f1f412a..6c69c86 100644 --- a/chrome/browser/extensions/blacklist_state_fetcher.h +++ b/chrome/browser/extensions/blacklist_state_fetcher.h
@@ -9,6 +9,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/safe_browsing/protocol_manager_helper.h"
diff --git a/chrome/browser/extensions/blob_reader.h b/chrome/browser/extensions/blob_reader.h index 0e0c2d2..1cf464b8 100644 --- a/chrome/browser/extensions/blob_reader.h +++ b/chrome/browser/extensions/blob_reader.h
@@ -10,6 +10,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "net/base/io_buffer.h" #include "net/url_request/url_fetcher_delegate.h"
diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc index 419b8d2..cc3a4b7 100644 --- a/chrome/browser/extensions/bookmark_app_helper.cc +++ b/chrome/browser/extensions/bookmark_app_helper.cc
@@ -4,11 +4,15 @@ #include "chrome/browser/extensions/bookmark_app_helper.h" +#include <stddef.h> + #include <cctype> #include <string> +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/extensions/bookmark_app_helper_unittest.cc b/chrome/browser/extensions/bookmark_app_helper_unittest.cc index cb15a2a..fe0cb02 100644 --- a/chrome/browser/extensions/bookmark_app_helper_unittest.cc +++ b/chrome/browser/extensions/bookmark_app_helper_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/bookmark_app_helper.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service_test_base.h"
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc index 2387b96f..fcf84caa 100644 --- a/chrome/browser/extensions/browser_action_apitest.cc +++ b/chrome/browser/extensions/browser_action_apitest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "extensions/browser/extension_registry.h"
diff --git a/chrome/browser/extensions/browser_action_test_util.h b/chrome/browser/extensions/browser_action_test_util.h index b9b2b787..a95bef6 100644 --- a/chrome/browser/extensions/browser_action_test_util.h +++ b/chrome/browser/extensions/browser_action_test_util.h
@@ -5,8 +5,11 @@ #ifndef CHROME_BROWSER_EXTENSIONS_BROWSER_ACTION_TEST_UTIL_H_ #define CHROME_BROWSER_EXTENSIONS_BROWSER_ACTION_TEST_UTIL_H_ +#include <stddef.h> + #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/extensions/browser_context_keyed_service_factories.cc b/chrome/browser/extensions/browser_context_keyed_service_factories.cc index b2f003e..19f04056 100644 --- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc +++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/browser_context_keyed_service_factories.h" +#include "build/build_config.h" #include "chrome/browser/extensions/activity_log/activity_log.h" #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h" #include "chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.h"
diff --git a/chrome/browser/extensions/browser_extension_window_controller.h b/chrome/browser/extensions/browser_extension_window_controller.h index 24384caf5..4b6753b 100644 --- a/chrome/browser/extensions/browser_extension_window_controller.h +++ b/chrome/browser/extensions/browser_extension_window_controller.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_BROWSER_EXTENSION_WINDOW_CONTROLLER_H_ #define CHROME_BROWSER_EXTENSIONS_BROWSER_EXTENSION_WINDOW_CONTROLLER_H_ +#include "base/macros.h" #include "chrome/browser/extensions/window_controller.h" class Browser;
diff --git a/chrome/browser/extensions/browser_permissions_policy_delegate.h b/chrome/browser/extensions/browser_permissions_policy_delegate.h index 73d5b12..a856082 100644 --- a/chrome/browser/extensions/browser_permissions_policy_delegate.h +++ b/chrome/browser/extensions/browser_permissions_policy_delegate.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_BROWSER_PERMISSIONS_POLICY_DELEGATE_H_ #define CHROME_BROWSER_EXTENSIONS_BROWSER_PERMISSIONS_POLICY_DELEGATE_H_ +#include "base/macros.h" #include "extensions/common/permissions/permissions_data.h" namespace extensions {
diff --git a/chrome/browser/extensions/bundle_installer.h b/chrome/browser/extensions/bundle_installer.h index 61bf273..8945f82 100644 --- a/chrome/browser/extensions/bundle_installer.h +++ b/chrome/browser/extensions/bundle_installer.h
@@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_EXTENSIONS_BUNDLE_INSTALLER_H_ #define CHROME_BROWSER_EXTENSIONS_BUNDLE_INSTALLER_H_ +#include <stddef.h> + #include <string> #include <vector> #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/extensions/chrome_app_sorting.cc b/chrome/browser/extensions/chrome_app_sorting.cc index a84cfdcc..8410eae 100644 --- a/chrome/browser/extensions/chrome_app_sorting.cc +++ b/chrome/browser/extensions/chrome_app_sorting.cc
@@ -7,6 +7,8 @@ #include <algorithm> #include <vector> +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_sync_service.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/chrome_app_sorting.h b/chrome/browser/extensions/chrome_app_sorting.h index c2923991..d33078f 100644 --- a/chrome/browser/extensions/chrome_app_sorting.h +++ b/chrome/browser/extensions/chrome_app_sorting.h
@@ -5,11 +5,13 @@ #ifndef CHROME_BROWSER_EXTENSIONS_CHROME_APP_SORTING_H_ #define CHROME_BROWSER_EXTENSIONS_CHROME_APP_SORTING_H_ +#include <stddef.h> + #include <map> #include <set> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "extensions/browser/app_sorting.h" #include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h"
diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc index 58bcf1ed..cb1b9625 100644 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
@@ -5,7 +5,9 @@ #include "chrome/browser/extensions/chrome_component_extension_resource_manager.h" #include "base/logging.h" +#include "base/macros.h" #include "base/path_service.h" +#include "build/build_config.h" #include "chrome/common/chrome_paths.h" #include "grit/chrome_unscaled_resources.h" #include "grit/component_extension_resources_map.h"
diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.h b/chrome/browser/extensions/chrome_component_extension_resource_manager.h index e3609490..c9c9050b 100644 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.h +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.h
@@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_EXTENSIONS_CHROME_COMPONENT_EXTENSION_RESOURCE_MANAGER_H_ #define CHROME_BROWSER_EXTENSIONS_CHROME_COMPONENT_EXTENSION_RESOURCE_MANAGER_H_ +#include <stddef.h> + #include <map> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "extensions/browser/component_extension_resource_manager.h" struct GritResourceMap;
diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager_unittest.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager_unittest.cc index 729b1ecd3..d4948f9 100644 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager_unittest.cc +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager_unittest.cc
@@ -4,6 +4,7 @@ #include "base/files/file_path.h" #include "base/path_service.h" +#include "build/build_config.h" #include "chrome/common/chrome_paths.h" #include "extensions/browser/component_extension_resource_manager.h" #include "extensions/browser/extensions_browser_client.h"
diff --git a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc index fe82d20..89fd695 100644 --- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc +++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h" +#include <stddef.h> + #include <set> #include "base/command_line.h"
diff --git a/chrome/browser/extensions/chrome_content_verifier_delegate.cc b/chrome/browser/extensions/chrome_content_verifier_delegate.cc index 0a31a54..7d8b74e 100644 --- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc +++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
@@ -10,6 +10,7 @@ #include "base/metrics/histogram.h" #include "base/strings/string_util.h" #include "base/version.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h"
diff --git a/chrome/browser/extensions/chrome_content_verifier_delegate.h b/chrome/browser/extensions/chrome_content_verifier_delegate.h index 4104f56..6c815bb1 100644 --- a/chrome/browser/extensions/chrome_content_verifier_delegate.h +++ b/chrome/browser/extensions/chrome_content_verifier_delegate.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_CHROME_CONTENT_VERIFIER_DELEGATE_H_ #define CHROME_BROWSER_EXTENSIONS_CHROME_CONTENT_VERIFIER_DELEGATE_H_ +#include "base/macros.h" #include "extensions/browser/content_verifier_delegate.h" namespace content {
diff --git a/chrome/browser/extensions/chrome_extension_web_contents_observer.cc b/chrome/browser/extensions/chrome_extension_web_contents_observer.cc index b119070..9f58eef 100644 --- a/chrome/browser/extensions/chrome_extension_web_contents_observer.cc +++ b/chrome/browser/extensions/chrome_extension_web_contents_observer.cc
@@ -109,7 +109,7 @@ const base::string16& message, const base::string16& source, const StackTrace& stack_trace, - int32 severity_level) { + int32_t severity_level) { if (!IsSourceFromAnExtension(source)) return;
diff --git a/chrome/browser/extensions/chrome_extension_web_contents_observer.h b/chrome/browser/extensions/chrome_extension_web_contents_observer.h index 49d064a..f827b3a 100644 --- a/chrome/browser/extensions/chrome_extension_web_contents_observer.h +++ b/chrome/browser/extensions/chrome_extension_web_contents_observer.h
@@ -5,7 +5,10 @@ #ifndef CHROME_BROWSER_EXTENSIONS_CHROME_EXTENSION_WEB_CONTENTS_OBSERVER_H_ #define CHROME_BROWSER_EXTENSIONS_CHROME_EXTENSION_WEB_CONTENTS_OBSERVER_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "content/public/browser/web_contents_user_data.h" #include "extensions/browser/extension_web_contents_observer.h" @@ -51,7 +54,7 @@ const base::string16& message, const base::string16& source, const StackTrace& stack_trace, - int32 severity_level); + int32_t severity_level); // Reloads an extension if it is on the terminated list. void ReloadIfTerminated(content::RenderViewHost* render_view_host);
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc index 14999a8..a658980 100644 --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/version.h" +#include "build/build_config.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/activity_log/activity_log.h"
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.h b/chrome/browser/extensions/chrome_extensions_browser_client.h index 4633436..286a97f 100644 --- a/chrome/browser/extensions/chrome_extensions_browser_client.h +++ b/chrome/browser/extensions/chrome_extensions_browser_client.h
@@ -8,11 +8,12 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/extensions/chrome_notification_observer.h" #include "extensions/browser/extensions_browser_client.h"
diff --git a/chrome/browser/extensions/chrome_notification_observer.h b/chrome/browser/extensions/chrome_notification_observer.h index 7980dff1..5b116bb 100644 --- a/chrome/browser/extensions/chrome_notification_observer.h +++ b/chrome/browser/extensions/chrome_notification_observer.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_CHROME_NOTIFICATION_OBSERVER_H_ #define CHROME_BROWSER_EXTENSIONS_CHROME_NOTIFICATION_OBSERVER_H_ -#include "base/basictypes.h" #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/chrome/browser/extensions/chrome_process_manager_delegate.cc b/chrome/browser/extensions/chrome_process_manager_delegate.cc index d141058e..86d3404 100644 --- a/chrome/browser/extensions/chrome_process_manager_delegate.cc +++ b/chrome/browser/extensions/chrome_process_manager_delegate.cc
@@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/logging.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/chrome_requirements_checker.cc b/chrome/browser/extensions/chrome_requirements_checker.cc index 811bfdd..5fcb2d08 100644 --- a/chrome/browser/extensions/chrome_requirements_checker.cc +++ b/chrome/browser/extensions/chrome_requirements_checker.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/chrome_requirements_checker.h" #include "base/bind.h" +#include "build/build_config.h" #include "chrome/browser/gpu/gpu_feature_checker.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/chrome_requirements_checker.h b/chrome/browser/extensions/chrome_requirements_checker.h index b892377..3e5121a 100644 --- a/chrome/browser/extensions/chrome_requirements_checker.h +++ b/chrome/browser/extensions/chrome_requirements_checker.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "extensions/browser/requirements_checker.h"
diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc index d0ec192..1e48e1f 100644 --- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc +++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/extensions/component_extensions_whitelist/whitelist.h" +#include <stddef.h> + #include "base/logging.h" #include "base/macros.h" +#include "build/build_config.h" #include "chrome/common/extensions/extension_constants.h" #include "extensions/common/constants.h" #include "grit/browser_resources.h"
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc index 56a5178e..c8731117 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc
@@ -15,6 +15,7 @@ #include "base/profiler/scoped_profile.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "chrome/browser/extensions/component_extensions_whitelist/whitelist.h" #include "chrome/browser/extensions/data_deleter.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h index 0f225935..e62f39c6 100644 --- a/chrome/browser/extensions/component_loader.h +++ b/chrome/browser/extensions/component_loader.h
@@ -5,14 +5,18 @@ #ifndef CHROME_BROWSER_EXTENSIONS_COMPONENT_LOADER_H_ #define CHROME_BROWSER_EXTENSIONS_COMPONENT_LOADER_H_ +#include <stddef.h> + #include <string> #include <vector> #include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/values.h" +#include "build/build_config.h" class ExtensionServiceInterface; class PrefService;
diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc index 58d13b957..4450de8 100644 --- a/chrome/browser/extensions/component_loader_unittest.cc +++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -4,12 +4,15 @@ #include "chrome/browser/extensions/component_loader.h" +#include <stddef.h> + #include <string> #include "base/command_line.h" #include "base/files/file_util.h" #include "base/path_service.h" #include "base/prefs/pref_registry_simple.h" +#include "build/build_config.h" #include "chrome/browser/extensions/test_extension_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc index a561187..6abe51fd 100644 --- a/chrome/browser/extensions/content_script_apitest.cc +++ b/chrome/browser/extensions/content_script_apitest.cc
@@ -2,10 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/callback.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/permissions/permissions_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/content_verifier_browsertest.cc b/chrome/browser/extensions/content_verifier_browsertest.cc index 04f0144..c0f2c8bf 100644 --- a/chrome/browser/extensions/content_verifier_browsertest.cc +++ b/chrome/browser/extensions/content_verifier_browsertest.cc
@@ -6,6 +6,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/scoped_observer.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/extensions/context_menu_matcher.h b/chrome/browser/extensions/context_menu_matcher.h index 8b7996a..ccbf7c0f 100644 --- a/chrome/browser/extensions/context_menu_matcher.h +++ b/chrome/browser/extensions/context_menu_matcher.h
@@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_EXTENSIONS_CONTEXT_MENU_MATCHER_H_ #define CHROME_BROWSER_EXTENSIONS_CONTEXT_MENU_MATCHER_H_ +#include <stddef.h> + #include <map> #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/menu_manager.h" #include "ui/base/models/simple_menu_model.h"
diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index f7dfe673..bbd787b 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/convert_user_script.h" +#include <stddef.h> + #include <string> #include <vector>
diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc index 2e971c4..f12ab4c0 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/convert_web_app.h" +#include <stddef.h> +#include <stdint.h> + #include <cmath> #include <limits> #include <string> @@ -71,16 +74,14 @@ (create_time_exploded.minute * Time::kMicrosecondsPerMinute) + (create_time_exploded.hour * Time::kMicrosecondsPerHour)); double day_fraction = micros / Time::kMicrosecondsPerDay; - double stamp = day_fraction * std::numeric_limits<uint16>::max(); + double stamp = day_fraction * std::numeric_limits<uint16_t>::max(); // Ghetto-round, since VC++ doesn't have round(). stamp = stamp >= (floor(stamp) + 0.5) ? (stamp + 1) : stamp; - return base::StringPrintf("%i.%i.%i.%i", - create_time_exploded.year, - create_time_exploded.month, - create_time_exploded.day_of_month, - static_cast<uint16>(stamp)); + return base::StringPrintf( + "%i.%i.%i.%i", create_time_exploded.year, create_time_exploded.month, + create_time_exploded.day_of_month, static_cast<uint16_t>(stamp)); } scoped_refptr<Extension> ConvertWebAppToExtension(
diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc index bdc5e5f..f61dfc7 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc
@@ -4,12 +4,15 @@ #include "chrome/browser/extensions/convert_web_app.h" +#include <stddef.h> + #include <string> #include <vector> #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index 83d6620..92bf9c5 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc
@@ -11,6 +11,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/sequenced_task_runner.h" #include "base/strings/string_util.h" @@ -20,6 +21,7 @@ #include "base/threading/thread_restrictions.h" #include "base/time/time.h" #include "base/version.h" +#include "build/build_config.h" #include "chrome/browser/extensions/convert_user_script.h" #include "chrome/browser/extensions/convert_web_app.h" #include "chrome/browser/extensions/extension_assets_manager.h"
diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h index 598858f8..963bdb5 100644 --- a/chrome/browser/extensions/crx_installer.h +++ b/chrome/browser/extensions/crx_installer.h
@@ -10,6 +10,7 @@ #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/version.h"
diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc index 4ff7ce8..50054337 100644 --- a/chrome/browser/extensions/crx_installer_browsertest.cc +++ b/chrome/browser/extensions/crx_installer_browsertest.cc
@@ -4,10 +4,14 @@ #include "chrome/browser/extensions/crx_installer.h" +#include <stddef.h> + #include "base/at_exit.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/download/download_crx_util.h" #include "chrome/browser/extensions/browser_action_test_util.h" #include "chrome/browser/extensions/extension_browsertest.h"
diff --git a/chrome/browser/extensions/data_deleter.h b/chrome/browser/extensions/data_deleter.h index 459b8502..df00c54 100644 --- a/chrome/browser/extensions/data_deleter.h +++ b/chrome/browser/extensions/data_deleter.h
@@ -6,8 +6,8 @@ #define CHROME_BROWSER_EXTENSIONS_DATA_DELETER_H_ #include <string> -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" class Profile;
diff --git a/chrome/browser/extensions/default_apps.cc b/chrome/browser/extensions/default_apps.cc index 63d3f86..37eb85e8 100644 --- a/chrome/browser/extensions/default_apps.cc +++ b/chrome/browser/extensions/default_apps.cc
@@ -4,10 +4,13 @@ #include "chrome/browser/extensions/default_apps.h" +#include <stddef.h> + #include <set> #include <string> #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/extensions/default_apps.h b/chrome/browser/extensions/default_apps.h index 01efa0d..cd0a62f 100644 --- a/chrome/browser/extensions/default_apps.h +++ b/chrome/browser/extensions/default_apps.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_DEFAULT_APPS_H_ #define CHROME_BROWSER_EXTENSIONS_DEFAULT_APPS_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/extensions/external_provider_impl.h" #include "extensions/common/manifest.h"
diff --git a/chrome/browser/extensions/default_apps_unittest.cc b/chrome/browser/extensions/default_apps_unittest.cc index 25db9107..74aa5967 100644 --- a/chrome/browser/extensions/default_apps_unittest.cc +++ b/chrome/browser/extensions/default_apps_unittest.cc
@@ -5,6 +5,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/extensions/default_apps.h" #include "chrome/browser/extensions/external_pref_loader.h" #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/extensions/dev_mode_bubble_delegate.h b/chrome/browser/extensions/dev_mode_bubble_delegate.h index 7412aa7a..ced7e640 100644 --- a/chrome/browser/extensions/dev_mode_bubble_delegate.h +++ b/chrome/browser/extensions/dev_mode_bubble_delegate.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_DEV_MODE_BUBBLE_DELEGATE_H_ #define CHROME_BROWSER_EXTENSIONS_DEV_MODE_BUBBLE_DELEGATE_H_ +#include <stddef.h> + #include <string> #include "base/macros.h"
diff --git a/chrome/browser/extensions/display_info_provider_aura.h b/chrome/browser/extensions/display_info_provider_aura.h index ad44dd6..a87af491b 100644 --- a/chrome/browser/extensions/display_info_provider_aura.h +++ b/chrome/browser/extensions/display_info_provider_aura.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_AURA_H_ #define CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_AURA_H_ +#include "base/macros.h" #include "extensions/browser/api/system_display/display_info_provider.h" namespace extensions {
diff --git a/chrome/browser/extensions/display_info_provider_chromeos.cc b/chrome/browser/extensions/display_info_provider_chromeos.cc index ea4bb23f..b68a7d8 100644 --- a/chrome/browser/extensions/display_info_provider_chromeos.cc +++ b/chrome/browser/extensions/display_info_provider_chromeos.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/display_info_provider_chromeos.h" +#include <stdint.h> + #include "ash/display/display_manager.h" #include "ash/display/window_tree_host_manager.h" #include "ash/shell.h" @@ -62,8 +64,8 @@ // two is 0. // So, (x, y) is over (a, b) if x * b + y * (-a) >= 0, which is equivalent to // x * b >= y * a. - return static_cast<int64>(point.x()) * static_cast<int64>(vector.y()) >= - static_cast<int64>(point.y()) * static_cast<int64>(vector.x()); + return static_cast<int64_t>(point.x()) * static_cast<int64_t>(vector.y()) >= + static_cast<int64_t>(point.y()) * static_cast<int64_t>(vector.x()); } // Created ash::DisplayLayout value for |rectangle| compared to the |reference| @@ -175,7 +177,7 @@ bool ValidateParamsForDisplay(const DisplayProperties& info, const gfx::Display& display, DisplayManager* display_manager, - int64 primary_display_id, + int64_t primary_display_id, std::string* error) { bool is_primary = display.id() == primary_display_id || (info.is_primary && *info.is_primary); @@ -183,7 +185,7 @@ // If mirroring source id is set, a display with the given id should exist, // and if should not be the same as the target display's id. if (info.mirroring_source_id && !info.mirroring_source_id->empty()) { - int64 mirroring_id; + int64_t mirroring_id; if (!base::StringToInt64(*info.mirroring_source_id, &mirroring_id) || display_manager->GetDisplayForId(mirroring_id).id() == gfx::Display::kInvalidDisplayID) { @@ -268,7 +270,7 @@ // Gets the display with the provided string id. gfx::Display GetTargetDisplay(const std::string& display_id_str, DisplayManager* manager) { - int64 display_id; + int64_t display_id; if (!base::StringToInt64(display_id_str, &display_id)) { // This should return invalid display. return gfx::Display(); @@ -301,7 +303,7 @@ return false; } - int64 display_id = target.id(); + int64_t display_id = target.id(); // TODO(scottmg): Native is wrong http://crbug.com/133312 const gfx::Display& primary = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay(); @@ -402,7 +404,7 @@ CHECK_GT(displays.size(), 0u); // Use first display as primary. - int64 primary_id = displays[0].id(); + int64_t primary_id = displays[0].id(); DisplayInfo all_displays; for (const gfx::Display& display : displays) { linked_ptr<api::system_display::DisplayUnitInfo> unit(
diff --git a/chrome/browser/extensions/display_info_provider_chromeos.h b/chrome/browser/extensions/display_info_provider_chromeos.h index 9680f4a..81a776d3 100644 --- a/chrome/browser/extensions/display_info_provider_chromeos.h +++ b/chrome/browser/extensions/display_info_provider_chromeos.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_CHROMEOS_H_ #define CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_CHROMEOS_H_ +#include "base/macros.h" #include "extensions/browser/api/system_display/display_info_provider.h" namespace extensions {
diff --git a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc index 1af395d..4cdb1ec9 100644 --- a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc +++ b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
@@ -4,6 +4,8 @@ #include "extensions/browser/api/system_display/display_info_provider.h" +#include <stdint.h> + #include "ash/ash_switches.h" #include "ash/display/display_manager.h" #include "ash/display/screen_orientation_controller_chromeos.h" @@ -14,6 +16,7 @@ #include "ash/test/display_manager_test_api.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "extensions/common/api/system_display.h" @@ -46,7 +49,7 @@ *success = DisplayInfoProvider::Get()->SetInfo(display_id, info, error); } - bool DisplayExists(int64 display_id) const { + bool DisplayExists(int64_t display_id) const { const gfx::Display& display = GetDisplayManager()->GetDisplayForId(display_id); return display.id() != gfx::Display::kInvalidDisplayID; @@ -84,7 +87,7 @@ ASSERT_EQ(2u, result.size()); - int64 display_id; + int64_t display_id; ASSERT_TRUE(base::StringToInt64(result[0]->id, &display_id)) << "Display id must be convertable to integer: " << result[0]->id; @@ -126,7 +129,7 @@ ASSERT_EQ(2u, result.size()); - int64 display_id; + int64_t display_id; ASSERT_TRUE(base::StringToInt64(result[0]->id, &display_id)) << "Display id must be convertable to integer: " << result[0]->id; @@ -239,7 +242,7 @@ ASSERT_EQ(1u, result.size()); - int64 display_id; + int64_t display_id; ASSERT_TRUE(base::StringToInt64(result[0]->id, &display_id)) << "Display id must be convertable to integer: " << result[0]->id; @@ -322,7 +325,7 @@ ASSERT_EQ(2u, result.size()); - int64 display_id; + int64_t display_id; ASSERT_TRUE(base::StringToInt64(result[1]->id, &display_id)) << "Display id must be convertable to integer: " << result[1]->id; ASSERT_TRUE(DisplayExists(display_id)) << display_id << " not found"; @@ -372,13 +375,13 @@ ASSERT_EQ(2u, result.size()); - int64 display_id_primary; + int64_t display_id_primary; ASSERT_TRUE(base::StringToInt64(result[0]->id, &display_id_primary)) << "Display id must be convertable to integer: " << result[0]->id; ASSERT_TRUE(DisplayExists(display_id_primary)) << display_id_primary << " not found"; - int64 display_id_secondary; + int64_t display_id_secondary; ASSERT_TRUE(base::StringToInt64(result[1]->id, &display_id_secondary)) << "Display id must be convertable to integer: " << result[1]->id; ASSERT_TRUE(DisplayExists(display_id_secondary)) << display_id_secondary @@ -1061,7 +1064,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetOverscanForInternal) { UpdateDisplay("1200x600,600x1000*2"); - const int64 internal_display_id = + const int64_t internal_display_id = ash::test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay(); api::system_display::DisplayProperties info;
diff --git a/chrome/browser/extensions/display_info_provider_mac.h b/chrome/browser/extensions/display_info_provider_mac.h index a83d60af..eb3189b1 100644 --- a/chrome/browser/extensions/display_info_provider_mac.h +++ b/chrome/browser/extensions/display_info_provider_mac.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_MAC_H_ #define CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_MAC_H_ +#include "base/macros.h" #include "extensions/browser/api/system_display/display_info_provider.h" namespace extensions {
diff --git a/chrome/browser/extensions/display_info_provider_win.cc b/chrome/browser/extensions/display_info_provider_win.cc index 8ddfbc0..39a8ab3 100644 --- a/chrome/browser/extensions/display_info_provider_win.cc +++ b/chrome/browser/extensions/display_info_provider_win.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/display_info_provider_win.h" #include <windows.h> +#include <stddef.h> #include "base/hash.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/extensions/display_info_provider_win.h b/chrome/browser/extensions/display_info_provider_win.h index 3976fb2d..20d33b86 100644 --- a/chrome/browser/extensions/display_info_provider_win.h +++ b/chrome/browser/extensions/display_info_provider_win.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_WIN_H_ #define CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_WIN_H_ +#include "base/macros.h" #include "extensions/browser/api/system_display/display_info_provider.h" namespace extensions {
diff --git a/chrome/browser/extensions/error_console/error_console.h b/chrome/browser/extensions/error_console/error_console.h index 9f2fc7aa..679b2c2 100644 --- a/chrome/browser/extensions/error_console/error_console.h +++ b/chrome/browser/extensions/error_console/error_console.h
@@ -5,6 +5,10 @@ #ifndef CHROME_BROWSER_EXTENSIONS_ERROR_CONSOLE_ERROR_CONSOLE_H_ #define CHROME_BROWSER_EXTENSIONS_ERROR_CONSOLE_ERROR_CONSOLE_H_ +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/prefs/pref_change_registrar.h" @@ -178,7 +182,7 @@ ErrorMap errors_; // The default mask to use if an Extension does not have specific settings. - int32 default_mask_; + int32_t default_mask_; // The profile with which the ErrorConsole is associated. Only collect errors // from extensions and RenderViews associated with this Profile (and it's
diff --git a/chrome/browser/extensions/error_console/error_console_browsertest.cc b/chrome/browser/extensions/error_console/error_console_browsertest.cc index c14cbaf..8307ced9 100644 --- a/chrome/browser/extensions/error_console/error_console_browsertest.cc +++ b/chrome/browser/extensions/error_console/error_console_browsertest.cc
@@ -4,11 +4,15 @@ #include "chrome/browser/extensions/error_console/error_console.h" +#include <stddef.h> + #include "base/files/file_path.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/error_console/error_console_factory.h b/chrome/browser/extensions/error_console/error_console_factory.h index 2a298ce4..c394ef5a 100644 --- a/chrome/browser/extensions/error_console/error_console_factory.h +++ b/chrome/browser/extensions/error_console/error_console_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_ERROR_CONSOLE_ERROR_CONSOLE_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_ERROR_CONSOLE_ERROR_CONSOLE_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/error_console/error_console_unittest.cc b/chrome/browser/extensions/error_console/error_console_unittest.cc index df74c5c..f356ebdb 100644 --- a/chrome/browser/extensions/error_console/error_console_unittest.cc +++ b/chrome/browser/extensions/error_console/error_console_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/error_console/error_console.h" +#include <stddef.h> + #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h"
diff --git a/chrome/browser/extensions/event_router_forwarder.cc b/chrome/browser/extensions/event_router_forwarder.cc index c74dddc2..b92ce90 100644 --- a/chrome/browser/extensions/event_router_forwarder.cc +++ b/chrome/browser/extensions/event_router_forwarder.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/extensions/event_router_forwarder.h" +#include <stddef.h> + #include "base/bind.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_manager.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/event_router_forwarder.h b/chrome/browser/extensions/event_router_forwarder.h index 92b4bc7..ed25673 100644 --- a/chrome/browser/extensions/event_router_forwarder.h +++ b/chrome/browser/extensions/event_router_forwarder.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/event_router_forwarder_unittest.cc b/chrome/browser/extensions/event_router_forwarder_unittest.cc index e1710184..24e76fe2 100644 --- a/chrome/browser/extensions/event_router_forwarder_unittest.cc +++ b/chrome/browser/extensions/event_router_forwarder_unittest.cc
@@ -9,6 +9,7 @@ #include "base/power_monitor/power_monitor.h" #include "base/power_monitor/power_monitor_device_source.h" #include "base/test/thread_test_helper.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc index 90c30b8..5014ef43 100644 --- a/chrome/browser/extensions/execute_script_apitest.cc +++ b/chrome/browser/extensions/execute_script_apitest.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 "chrome/browser/extensions/extension_apitest.h" #include "net/dns/mock_host_resolver.h"
diff --git a/chrome/browser/extensions/extension_action.h b/chrome/browser/extensions/extension_action.h index 866c1e4..70ceceb 100644 --- a/chrome/browser/extensions/extension_action.h +++ b/chrome/browser/extensions/extension_action.h
@@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" #include "chrome/common/extensions/api/extension_action/action_info.h"
diff --git a/chrome/browser/extensions/extension_action_icon_factory.h b/chrome/browser/extensions/extension_action_icon_factory.h index b65adab..ac1d2b4 100644 --- a/chrome/browser/extensions/extension_action_icon_factory.h +++ b/chrome/browser/extensions/extension_action_icon_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_ICON_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_ICON_FACTORY_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_observer.h" #include "extensions/browser/extension_icon_image.h"
diff --git a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc index 673a03b4..bacf0309 100644 --- a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc +++ b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
@@ -7,8 +7,10 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/json/json_file_value_serializer.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/extension_action_storage_manager.cc b/chrome/browser/extensions/extension_action_storage_manager.cc index 401e077..148a3c9 100644 --- a/chrome/browser/extensions/extension_action_storage_manager.cc +++ b/chrome/browser/extensions/extension_action_storage_manager.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/extension_action_storage_manager.h" +#include <stdint.h> + #include "base/base64.h" #include "base/bind.h" #include "base/memory/scoped_ptr.h" @@ -48,7 +50,7 @@ // Conversion function for reading/writing to storage. SkColor RawStringToSkColor(const std::string& str) { - uint64 value = 0; + uint64_t value = 0; base::StringToUint64(str, &value); SkColor color = static_cast<SkColor>(value); DCHECK(value == color); // ensure value fits into color's 32 bits
diff --git a/chrome/browser/extensions/extension_action_storage_manager.h b/chrome/browser/extensions/extension_action_storage_manager.h index 4409b12d..de1d63b9 100644 --- a/chrome/browser/extensions/extension_action_storage_manager.h +++ b/chrome/browser/extensions/extension_action_storage_manager.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
diff --git a/chrome/browser/extensions/extension_action_test_util.h b/chrome/browser/extensions/extension_action_test_util.h index 7f5a7e2..b9a5e876 100644 --- a/chrome/browser/extensions/extension_action_test_util.h +++ b/chrome/browser/extensions/extension_action_test_util.h
@@ -5,9 +5,10 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_TEST_UTIL_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_TEST_UTIL_H_ +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "extensions/common/manifest.h"
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index fb198c79..3c58277 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc
@@ -4,10 +4,13 @@ #include "chrome/browser/extensions/extension_apitest.h" +#include <stddef.h> + #include "base/base_switches.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/extension_assets_manager.cc b/chrome/browser/extensions/extension_assets_manager.cc index b1921fb..7ce05220 100644 --- a/chrome/browser/extensions/extension_assets_manager.cc +++ b/chrome/browser/extensions/extension_assets_manager.cc
@@ -4,7 +4,9 @@ #include "chrome/browser/extensions/extension_assets_manager.h" +#include "base/macros.h" #include "base/memory/singleton.h" +#include "build/build_config.h" #include "extensions/common/extension.h" #include "extensions/common/file_util.h"
diff --git a/chrome/browser/extensions/extension_assets_manager_chromeos.cc b/chrome/browser/extensions/extension_assets_manager_chromeos.cc index 5498941d..419333f1 100644 --- a/chrome/browser/extensions/extension_assets_manager_chromeos.cc +++ b/chrome/browser/extensions/extension_assets_manager_chromeos.cc
@@ -4,11 +4,14 @@ #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" +#include <stddef.h> + #include <map> #include <vector> #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/extensions/extension_assets_manager_chromeos.h b/chrome/browser/extensions/extension_assets_manager_chromeos.h index 670a144..29212d3 100644 --- a/chrome/browser/extensions/extension_assets_manager_chromeos.h +++ b/chrome/browser/extensions/extension_assets_manager_chromeos.h
@@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "chrome/browser/extensions/extension_assets_manager.h" namespace base {
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index ba192579..71b867d 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/extension_browsertest.h" +#include <stddef.h> + #include <vector> #include "base/command_line.h" @@ -14,6 +16,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/browsertest_util.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/crx_installer.h"
diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h index 328a915..a09cff4 100644 --- a/chrome/browser/extensions/extension_browsertest.h +++ b/chrome/browser/extensions/extension_browsertest.h
@@ -12,6 +12,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/test/scoped_path_override.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_test_notification_observer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/extensions/extension_commands_global_registry.h b/chrome/browser/extensions/extension_commands_global_registry.h index de666419..e7b6754f 100644 --- a/chrome/browser/extensions/extension_commands_global_registry.h +++ b/chrome/browser/extensions/extension_commands_global_registry.h
@@ -9,6 +9,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/extensions/extension_keybinding_registry.h" #include "chrome/browser/extensions/global_shortcut_listener.h" #include "extensions/browser/browser_context_keyed_api_factory.h"
diff --git a/chrome/browser/extensions/extension_commands_global_registry_apitest.cc b/chrome/browser/extensions/extension_commands_global_registry_apitest.cc index 6dd0606..34ad9c6 100644 --- a/chrome/browser/extensions/extension_commands_global_registry_apitest.cc +++ b/chrome/browser/extensions/extension_commands_global_registry_apitest.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 "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/window_controller.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc index 95fbfab..9c6d98c 100644 --- a/chrome/browser/extensions/extension_context_menu_browsertest.cc +++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc
@@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/lazy_background_page_test_util.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index 605a53c..1b542e3 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/extension_context_menu_model.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/extensions/extension_context_menu_model.h b/chrome/browser/extensions/extension_context_menu_model.h index 1a099f9..50acfbb 100644 --- a/chrome/browser/extensions/extension_context_menu_model.h +++ b/chrome/browser/extensions/extension_context_menu_model.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/models/simple_menu_model.h"
diff --git a/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chrome/browser/extensions/extension_context_menu_model_unittest.cc index 1d979aa..bba89f1 100644 --- a/chrome/browser/extensions/extension_context_menu_model_unittest.cc +++ b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
@@ -6,6 +6,7 @@ #include <utility> +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/active_script_controller.h"
diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc index 079c2c1f..5e808289 100644 --- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc +++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index fcf31b38..1991cc3 100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/extension_creator.h" +#include <stddef.h> + #include <string> #include <vector> @@ -88,7 +90,7 @@ bool ExtensionCreator::ValidateManifest(const base::FilePath& extension_dir, crypto::RSAPrivateKey* key_pair, int run_flags) { - std::vector<uint8> public_key_bytes; + std::vector<uint8_t> public_key_bytes; if (!key_pair->ExportPublicKey(&public_key_bytes)) { error_message_ = l10n_util::GetStringUTF8(IDS_EXTENSION_PUBLIC_KEY_FAILED_TO_EXPORT); @@ -141,7 +143,7 @@ } return crypto::RSAPrivateKey::CreateFromPrivateKeyInfo( - std::vector<uint8>(private_key_bytes.begin(), private_key_bytes.end())); + std::vector<uint8_t>(private_key_bytes.begin(), private_key_bytes.end())); } crypto::RSAPrivateKey* ExtensionCreator::GenerateKey(const base::FilePath& @@ -154,7 +156,7 @@ return NULL; } - std::vector<uint8> private_key_vector; + std::vector<uint8_t> private_key_vector; if (!key_pair->ExportPrivateKey(&private_key_vector)) { error_message_ = l10n_util::GetStringUTF8(IDS_EXTENSION_PRIVATE_KEY_FAILED_TO_EXPORT); @@ -209,13 +211,13 @@ bool ExtensionCreator::SignZip(const base::FilePath& zip_path, crypto::RSAPrivateKey* private_key, - std::vector<uint8>* signature) { + std::vector<uint8_t>* signature) { scoped_ptr<crypto::SignatureCreator> signature_creator( crypto::SignatureCreator::Create(private_key, crypto::SignatureCreator::SHA1)); base::ScopedFILE zip_handle(base::OpenFile(zip_path, "rb")); size_t buffer_size = 1 << 16; - scoped_ptr<uint8[]> buffer(new uint8[buffer_size]); + scoped_ptr<uint8_t[]> buffer(new uint8_t[buffer_size]); int bytes_read = -1; while ((bytes_read = fread(buffer.get(), 1, buffer_size, zip_handle.get())) > 0) { @@ -237,7 +239,7 @@ bool ExtensionCreator::WriteCRX(const base::FilePath& zip_path, crypto::RSAPrivateKey* private_key, - const std::vector<uint8>& signature, + const std::vector<uint8_t>& signature, const base::FilePath& crx_path) { if (base::PathExists(crx_path)) base::DeleteFile(crx_path, false); @@ -247,7 +249,7 @@ return false; } - std::vector<uint8> public_key; + std::vector<uint8_t> public_key; CHECK(private_key->ExportPublicKey(&public_key)); crx_file::CrxFile::Error error; @@ -261,17 +263,17 @@ if (fwrite(&header, sizeof(header), 1, crx_handle.get()) != 1) { PLOG(ERROR) << "fwrite failed to write header"; } - if (fwrite(&public_key.front(), sizeof(uint8), public_key.size(), + if (fwrite(&public_key.front(), sizeof(uint8_t), public_key.size(), crx_handle.get()) != public_key.size()) { PLOG(ERROR) << "fwrite failed to write public_key.front"; } - if (fwrite(&signature.front(), sizeof(uint8), signature.size(), + if (fwrite(&signature.front(), sizeof(uint8_t), signature.size(), crx_handle.get()) != signature.size()) { PLOG(ERROR) << "fwrite failed to write signature.front"; } size_t buffer_size = 1 << 16; - scoped_ptr<uint8[]> buffer(new uint8[buffer_size]); + scoped_ptr<uint8_t[]> buffer(new uint8_t[buffer_size]); size_t bytes_read = 0; base::ScopedFILE zip_handle(base::OpenFile(zip_path, "rb")); while ((bytes_read = fread(buffer.get(), 1, buffer_size, @@ -317,7 +319,7 @@ // Zip up the extension. base::FilePath zip_path; - std::vector<uint8> signature; + std::vector<uint8_t> signature; bool result = false; if (CreateZip(extension_dir, temp_dir.path(), &zip_path) && SignZip(zip_path, key_pair.get(), &signature) &&
diff --git a/chrome/browser/extensions/extension_creator.h b/chrome/browser/extensions/extension_creator.h index de7aa76..34455c99 100644 --- a/chrome/browser/extensions/extension_creator.h +++ b/chrome/browser/extensions/extension_creator.h
@@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_CREATOR_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_CREATOR_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" namespace base { class FilePath; @@ -83,12 +85,12 @@ // Signs the temporary zip and returns the signature. bool SignZip(const base::FilePath& zip_path, crypto::RSAPrivateKey* private_key, - std::vector<uint8>* signature); + std::vector<uint8_t>* signature); // Export installable .crx to |crx_path|. bool WriteCRX(const base::FilePath& zip_path, crypto::RSAPrivateKey* private_key, - const std::vector<uint8>& signature, + const std::vector<uint8_t>& signature, const base::FilePath& crx_path); // Holds a message for any error that is raised during Run(...).
diff --git a/chrome/browser/extensions/extension_creator_filter.cc b/chrome/browser/extensions/extension_creator_filter.cc index 27c4e22..330557f2 100644 --- a/chrome/browser/extensions/extension_creator_filter.cc +++ b/chrome/browser/extensions/extension_creator_filter.cc
@@ -4,10 +4,14 @@ #include "chrome/browser/extensions/extension_creator_filter.h" -#include <vector> +#include <stddef.h> + #include <set> +#include <vector> #include "base/files/file_path.h" +#include "base/macros.h" +#include "build/build_config.h" #if defined(OS_WIN) #include <windows.h>
diff --git a/chrome/browser/extensions/extension_creator_filter.h b/chrome/browser/extensions/extension_creator_filter.h index 6c0aac6..80c5a4e 100644 --- a/chrome/browser/extensions/extension_creator_filter.h +++ b/chrome/browser/extensions/extension_creator_filter.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_CREATOR_FILTER_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_CREATOR_FILTER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" namespace base {
diff --git a/chrome/browser/extensions/extension_creator_filter_unittest.cc b/chrome/browser/extensions/extension_creator_filter_unittest.cc index c56e0cc..af333029 100644 --- a/chrome/browser/extensions/extension_creator_filter_unittest.cc +++ b/chrome/browser/extensions/extension_creator_filter_unittest.cc
@@ -2,9 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_creator_filter.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h"
diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc index 9b8bb66..677922fa 100644 --- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/threading/sequenced_worker_pool.h"
diff --git a/chrome/browser/extensions/extension_error_controller.h b/chrome/browser/extensions/extension_error_controller.h index 06c0613..784f78d 100644 --- a/chrome/browser/extensions/extension_error_controller.h +++ b/chrome/browser/extensions/extension_error_controller.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_ERROR_CONTROLLER_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ERROR_CONTROLLER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_error_ui.h" #include "extensions/common/extension_set.h"
diff --git a/chrome/browser/extensions/extension_error_ui_default.h b/chrome/browser/extensions/extension_error_ui_default.h index d6b01d6..2a33491 100644 --- a/chrome/browser/extensions/extension_error_ui_default.h +++ b/chrome/browser/extensions/extension_error_ui_default.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_ERROR_UI_DEFAULT_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ERROR_UI_DEFAULT_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/extensions/extension_error_ui.h" #include "chrome/browser/ui/global_error/global_error.h" #include "extensions/common/extension.h"
diff --git a/chrome/browser/extensions/extension_fullscreen_apitest.cc b/chrome/browser/extensions/extension_fullscreen_apitest.cc index 57536e3..84de0a4f 100644 --- a/chrome/browser/extensions/extension_fullscreen_apitest.cc +++ b/chrome/browser/extensions/extension_fullscreen_apitest.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 "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
diff --git a/chrome/browser/extensions/extension_functional_browsertest.cc b/chrome/browser/extensions/extension_functional_browsertest.cc index 72e75a8..508ceb37 100644 --- a/chrome/browser/extensions/extension_functional_browsertest.cc +++ b/chrome/browser/extensions/extension_functional_browsertest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "build/build_config.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/extension_garbage_collector.cc b/chrome/browser/extensions/extension_garbage_collector.cc index 0e2b354..1d494e81 100644 --- a/chrome/browser/extensions/extension_garbage_collector.cc +++ b/chrome/browser/extensions/extension_garbage_collector.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/extension_garbage_collector.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h"
diff --git a/chrome/browser/extensions/extension_garbage_collector.h b/chrome/browser/extensions/extension_garbage_collector.h index bc3fb9da..9a76806 100644 --- a/chrome/browser/extensions/extension_garbage_collector.h +++ b/chrome/browser/extensions/extension_garbage_collector.h
@@ -9,6 +9,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/install_observer.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos.cc b/chrome/browser/extensions/extension_garbage_collector_chromeos.cc index e737cc0..c712224 100644 --- a/chrome/browser/extensions/extension_garbage_collector_chromeos.cc +++ b/chrome/browser/extensions/extension_garbage_collector_chromeos.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" #include "chrome/browser/extensions/extension_garbage_collector_chromeos.h"
diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos.h b/chrome/browser/extensions/extension_garbage_collector_chromeos.h index 2da7516..57e795c7 100644 --- a/chrome/browser/extensions/extension_garbage_collector_chromeos.h +++ b/chrome/browser/extensions/extension_garbage_collector_chromeos.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_GARBAGE_COLLECTOR_CHROMEOS_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_GARBAGE_COLLECTOR_CHROMEOS_H_ +#include "base/macros.h" #include "chrome/browser/extensions/extension_garbage_collector.h" namespace extensions {
diff --git a/chrome/browser/extensions/extension_garbage_collector_factory.cc b/chrome/browser/extensions/extension_garbage_collector_factory.cc index 0383b75..a9d2583 100644 --- a/chrome/browser/extensions/extension_garbage_collector_factory.cc +++ b/chrome/browser/extensions/extension_garbage_collector_factory.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/extension_garbage_collector_factory.h" #include "base/memory/singleton.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_garbage_collector.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/install_tracker_factory.h"
diff --git a/chrome/browser/extensions/extension_garbage_collector_factory.h b/chrome/browser/extensions/extension_garbage_collector_factory.h index 000398f..6f49f30 100644 --- a/chrome/browser/extensions/extension_garbage_collector_factory.h +++ b/chrome/browser/extensions/extension_garbage_collector_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_GARBAGE_COLLECTOR_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_GARBAGE_COLLECTOR_FACTORY_H_ +#include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" namespace base {
diff --git a/chrome/browser/extensions/extension_garbage_collector_unittest.cc b/chrome/browser/extensions/extension_garbage_collector_unittest.cc index b355763..ac8d528e 100644 --- a/chrome/browser/extensions/extension_garbage_collector_unittest.cc +++ b/chrome/browser/extensions/extension_garbage_collector_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h"
diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc index c51beec8..c0777dd9 100644 --- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc +++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
@@ -14,12 +14,14 @@ #include "base/files/scoped_temp_dir.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/gcm/gcm_api.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/extension_icon_manager.h b/chrome/browser/extensions/extension_icon_manager.h index 8bdbbd1..f79f0fbe 100644 --- a/chrome/browser/extensions/extension_icon_manager.h +++ b/chrome/browser/extensions/extension_icon_manager.h
@@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/geometry/insets.h"
diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc index 3ca1104..a2b1576 100644 --- a/chrome/browser/extensions/extension_icon_manager_unittest.cc +++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc
@@ -3,9 +3,11 @@ // found in the LICENSE file. #include "base/json/json_file_value_serializer.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_icon_manager.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/extensions/extension_icon_source_apitest.cc b/chrome/browser/extensions/extension_icon_source_apitest.cc index a79ccc5..ad2cdbf5 100644 --- a/chrome/browser/extensions/extension_icon_source_apitest.cc +++ b/chrome/browser/extensions/extension_icon_source_apitest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc index c9a33c21..8721f78 100644 --- a/chrome/browser/extensions/extension_incognito_apitest.cc +++ b/chrome/browser/extensions/extension_incognito_apitest.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 "chrome/browser/extensions/browser_action_test_util.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/extension_install_checker.h b/chrome/browser/extensions/extension_install_checker.h index a13bdff..56d7da7 100644 --- a/chrome/browser/extensions/extension_install_checker.h +++ b/chrome/browser/extensions/extension_install_checker.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/extensions/extension_install_prompt.h b/chrome/browser/extensions/extension_install_prompt.h index 89463b1..be05e42 100644 --- a/chrome/browser/extensions/extension_install_prompt.h +++ b/chrome/browser/extensions/extension_install_prompt.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_ +#include <stddef.h> + #include <string> #include <vector>
diff --git a/chrome/browser/extensions/extension_install_prompt_browsertest.cc b/chrome/browser/extensions/extension_install_prompt_browsertest.cc index 75051ee..fe3dd93 100644 --- a/chrome/browser/extensions/extension_install_prompt_browsertest.cc +++ b/chrome/browser/extensions/extension_install_prompt_browsertest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/extension_install_prompt.h" +#include "base/macros.h" #include "base/run_loop.h" #include "chrome/browser/extensions/extension_install_prompt_show_params.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/extensions/extension_install_prompt_show_params.cc b/chrome/browser/extensions/extension_install_prompt_show_params.cc index 953ed36..ab291821 100644 --- a/chrome/browser/extensions/extension_install_prompt_show_params.cc +++ b/chrome/browser/extensions/extension_install_prompt_show_params.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/extension_install_prompt_show_params.h" +#include "base/macros.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/native_window_tracker.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/extensions/extension_install_prompt_show_params.h b/chrome/browser/extensions/extension_install_prompt_show_params.h index 2fe6aa5..97cc71d 100644 --- a/chrome/browser/extensions/extension_install_prompt_show_params.h +++ b/chrome/browser/extensions/extension_install_prompt_show_params.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_SHOW_PARAMS_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_SHOW_PARAMS_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/extensions/extension_install_prompt_unittest.cc b/chrome/browser/extensions/extension_install_prompt_unittest.cc index efde479..7b1c31f 100644 --- a/chrome/browser/extensions/extension_install_prompt_unittest.cc +++ b/chrome/browser/extensions/extension_install_prompt_unittest.cc
@@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <utility> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "chrome/browser/extensions/extension_install_prompt.h"
diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc index 57feb15..f0b2c84 100644 --- a/chrome/browser/extensions/extension_install_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc
@@ -3,7 +3,9 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_browsertest.h"
diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc index c303164..d9d04bc 100644 --- a/chrome/browser/extensions/extension_keybinding_apitest.cc +++ b/chrome/browser/extensions/extension_keybinding_apitest.cc
@@ -3,6 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/active_tab_permission_granter.h" #include "chrome/browser/extensions/api/commands/command_service.h"
diff --git a/chrome/browser/extensions/extension_keybinding_registry.h b/chrome/browser/extensions/extension_keybinding_registry.h index 5714bfb..fdc85df2 100644 --- a/chrome/browser/extensions/extension_keybinding_registry.h +++ b/chrome/browser/extensions/extension_keybinding_registry.h
@@ -10,6 +10,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/extensions/extension_loading_browsertest.cc b/chrome/browser/extensions/extension_loading_browsertest.cc index 3c55c65..542462c 100644 --- a/chrome/browser/extensions/extension_loading_browsertest.cc +++ b/chrome/browser/extensions/extension_loading_browsertest.cc
@@ -9,6 +9,7 @@ #include "base/strings/stringprintf.h" #include "base/version.h" #include "base/win/windows_version.h" +#include "build/build_config.h" #include "chrome/browser/extensions/devtools_util.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/extension_management_constants.h b/chrome/browser/extensions/extension_management_constants.h index 2a552dd3..39a33bf 100644 --- a/chrome/browser/extensions/extension_management_constants.h +++ b/chrome/browser/extensions/extension_management_constants.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_MANAGEMENT_CONSTANTS_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_MANAGEMENT_CONSTANTS_H_ +#include <stddef.h> + #include <string> #include "extensions/common/manifest.h"
diff --git a/chrome/browser/extensions/extension_message_bubble_controller.h b/chrome/browser/extensions/extension_message_bubble_controller.h index c3059c5..c025d24 100644 --- a/chrome/browser/extensions/extension_message_bubble_controller.h +++ b/chrome/browser/extensions/extension_message_bubble_controller.h
@@ -5,7 +5,10 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_CONTROLLER_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_CONTROLLER_H_ +#include <stddef.h> + #include <string> +#include "base/macros.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/common/extension.h"
diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc index b4e3f34..3b05553 100644 --- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc +++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
@@ -2,14 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <utility> #include "base/bind_helpers.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/extensions/dev_mode_bubble_delegate.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc index 0482137..4b9cf9b 100644 --- a/chrome/browser/extensions/extension_messages_apitest.cc +++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -2,10 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/base64.h" #include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" @@ -13,6 +17,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/messaging/incognito_connectability.h" #include "chrome/browser/extensions/extension_apitest.h" @@ -989,7 +994,7 @@ base::Unretained(&request), request_context_getter)); tls_channel_id_created_.Wait(); // Create the expected value. - std::vector<uint8> spki_vector; + std::vector<uint8_t> spki_vector; if (!channel_id_key->ExportPublicKey(&spki_vector)) return std::string(); base::StringPiece spki(reinterpret_cast<char*>(spki_vector.data()),
diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc index a865c970..5e18033 100644 --- a/chrome/browser/extensions/extension_override_apitest.cc +++ b/chrome/browser/extensions/extension_override_apitest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_web_ui.h"
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index 5c3ffb93..e948e3d 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/extensions/extension_prefs_unittest.h" -#include "base/basictypes.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/prefs/mock_pref_change_callback.h"
diff --git a/chrome/browser/extensions/extension_prefs_unittest.h b/chrome/browser/extensions/extension_prefs_unittest.h index 432d262..c0d3034 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.h +++ b/chrome/browser/extensions/extension_prefs_unittest.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_UNITTEST_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_UNITTEST_H_ +#include <stddef.h> + +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/extensions/test_extension_prefs.h" #include "content/public/test/test_browser_thread.h"
diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc index 833ebd75..0bfb20da 100644 --- a/chrome/browser/extensions/extension_protocols_unittest.cc +++ b/chrome/browser/extensions/extension_protocols_unittest.cc
@@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <string> #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/extensions/extension_reenabler_unittest.cc b/chrome/browser/extensions/extension_reenabler_unittest.cc index 3efa569..e6328c2 100644 --- a/chrome/browser/extensions/extension_reenabler_unittest.cc +++ b/chrome/browser/extensions/extension_reenabler_unittest.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 "base/macros.h" #include "base/run_loop.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_reenabler.h"
diff --git a/chrome/browser/extensions/extension_renderer_state.cc b/chrome/browser/extensions/extension_renderer_state.cc index 1792b60..c0166fe5 100644 --- a/chrome/browser/extensions/extension_renderer_state.cc +++ b/chrome/browser/extensions/extension_renderer_state.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/tab_contents/retargeting_details.h"
diff --git a/chrome/browser/extensions/extension_renderer_state.h b/chrome/browser/extensions/extension_renderer_state.h index 413a726..3c55e4072 100644 --- a/chrome/browser/extensions/extension_renderer_state.h +++ b/chrome/browser/extensions/extension_renderer_state.h
@@ -10,7 +10,7 @@ #include <string> #include <utility> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/singleton.h" namespace content {
diff --git a/chrome/browser/extensions/extension_resource_protocols.cc b/chrome/browser/extensions/extension_resource_protocols.cc index d40de60..c397681 100644 --- a/chrome/browser/extensions/extension_resource_protocols.cc +++ b/chrome/browser/extensions/extension_resource_protocols.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/extension_resource_protocols.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h" #include "base/threading/sequenced_worker_pool.h"
diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc index 651bf93..348f958 100644 --- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc +++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
@@ -4,6 +4,7 @@ #include "base/command_line.h" #include "base/logging.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 0664cfb4..89d5dec 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/extension_service.h" +#include <stddef.h> + #include <algorithm> #include <iterator> #include <set> @@ -21,6 +23,7 @@ #include "base/threading/thread_restrictions.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/content_settings/content_settings_internal_extension_provider.h"
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 4cd10fe5..0e642fd 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h
@@ -13,6 +13,7 @@ #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/extensions/extension_service_sync_unittest.cc b/chrome/browser/extensions/extension_service_sync_unittest.cc index ef959e84..861c7ad 100644 --- a/chrome/browser/extensions/extension_service_sync_unittest.cc +++ b/chrome/browser/extensions/extension_service_sync_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <map> #include <string> #include <utility> @@ -9,6 +11,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/field_trial.h"
diff --git a/chrome/browser/extensions/extension_service_test_base.cc b/chrome/browser/extensions/extension_service_test_base.cc index 9276721..c9269fcb 100644 --- a/chrome/browser/extensions/extension_service_test_base.cc +++ b/chrome/browser/extensions/extension_service_test_base.cc
@@ -11,6 +11,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_error_reporter.h" #include "chrome/browser/extensions/extension_garbage_collector_factory.h"
diff --git a/chrome/browser/extensions/extension_service_test_base.h b/chrome/browser/extensions/extension_service_test_base.h index 7f25036..e9de2739 100644 --- a/chrome/browser/extensions/extension_service_test_base.h +++ b/chrome/browser/extensions/extension_service_test_base.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_TEST_BASE_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_TEST_BASE_H_ +#include <stddef.h> + #include <string> #include "base/at_exit.h" @@ -12,6 +14,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/test/base/scoped_testing_local_state.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h"
diff --git a/chrome/browser/extensions/extension_service_test_with_install.h b/chrome/browser/extensions/extension_service_test_with_install.h index a6c3cad8e..bb9e6dc 100644 --- a/chrome/browser/extensions/extension_service_test_with_install.h +++ b/chrome/browser/extensions/extension_service_test_with_install.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_TEST_WITH_INSTALL_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_TEST_WITH_INSTALL_H_ +#include <stddef.h> + #include <string> #include "base/macros.h"
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 72c553b3..8dd46ac 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <map> #include <set> @@ -9,7 +12,6 @@ #include <vector> #include "base/at_exit.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_enumerator.h" @@ -19,6 +21,7 @@ #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/prefs/scoped_user_pref_update.h" @@ -31,6 +34,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" #include "base/version.h" +#include "build/build_config.h" #include "chrome/browser/after_startup_task_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" @@ -687,7 +691,7 @@ InitializeGoodInstalledExtensionService(); service()->Init(); - uint32 expected_num_extensions = 3u; + uint32_t expected_num_extensions = 3u; ASSERT_EQ(expected_num_extensions, loaded_.size()); EXPECT_EQ(std::string(good0), loaded_[0]->id()); @@ -4200,7 +4204,7 @@ ->GetDatabaseTracker(); base::string16 db_name = base::UTF8ToUTF16("db"); base::string16 description = base::UTF8ToUTF16("db_description"); - int64 size; + int64_t size; db_tracker->DatabaseOpened(origin_id, db_name, description, 1, &size); db_tracker->DatabaseClosed(origin_id, db_name); std::vector<storage::OriginInfo> origins; @@ -4323,7 +4327,7 @@ ->GetDatabaseTracker(); base::string16 db_name = base::UTF8ToUTF16("db"); base::string16 description = base::UTF8ToUTF16("db_description"); - int64 size; + int64_t size; db_tracker->DatabaseOpened(origin_id, db_name, description, 1, &size); db_tracker->DatabaseClosed(origin_id, db_name); std::vector<storage::OriginInfo> origins;
diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc index 2990f6d..5982232 100644 --- a/chrome/browser/extensions/extension_special_storage_policy.cc +++ b/chrome/browser/extensions/extension_special_storage_policy.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/extension_special_storage_policy.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" @@ -39,7 +42,9 @@ namespace { -void ReportQuotaUsage(storage::QuotaStatusCode code, int64 usage, int64 quota) { +void ReportQuotaUsage(storage::QuotaStatusCode code, + int64_t usage, + int64_t quota) { if (code == storage::kQuotaStatusOk) { // We're interested in the amount of space hosted apps are using. Record it // when the extension is granted the unlimited storage permission (once per
diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc index 6671691e..19ffd73d 100644 --- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc +++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
@@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/extensions/extension_special_storage_policy.h"
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index 7918358..462f2ba 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/base_switches.h" @@ -11,6 +14,7 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_util.h" @@ -134,8 +138,8 @@ if (!unauthenticated_load_allowed_) num_expected_extensions = 0; - ASSERT_EQ(static_cast<uint32>(num_expected_extensions), - static_cast<uint32>(found_extensions)); + ASSERT_EQ(static_cast<uint32_t>(num_expected_extensions), + static_cast<uint32_t>(found_extensions)); ExtensionService* service = extensions::ExtensionSystem::Get( browser()->profile())->extension_service();
diff --git a/chrome/browser/extensions/extension_storage_apitest.cc b/chrome/browser/extensions/extension_storage_apitest.cc index 3437b14..299091c 100644 --- a/chrome/browser/extensions/extension_storage_apitest.cc +++ b/chrome/browser/extensions/extension_storage_apitest.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 "chrome/browser/extensions/extension_apitest.h" #if defined(OS_WIN)
diff --git a/chrome/browser/extensions/extension_storage_monitor.cc b/chrome/browser/extensions/extension_storage_monitor.cc index 25581ed..690d488 100644 --- a/chrome/browser/extensions/extension_storage_monitor.cc +++ b/chrome/browser/extensions/extension_storage_monitor.cc
@@ -48,8 +48,8 @@ // Set the thresholds for the first notification. Once a threshold is exceeded, // it will be doubled to throttle notifications. -const int64 kMBytes = 1024 * 1024; -const int64 kExtensionInitialThreshold = 1000 * kMBytes; +const int64_t kMBytes = 1024 * 1024; +const int64_t kExtensionInitialThreshold = 1000 * kMBytes; // Notifications have an ID so that we can update them. const char kNotificationIdFormat[] = "ExtensionStorageMonitor-$1-$2"; @@ -83,11 +83,11 @@ extension_id, ExtensionRegistry::EVERYTHING); } -void LogTemporaryStorageUsage(int64 usage, +void LogTemporaryStorageUsage(int64_t usage, storage::QuotaStatusCode status, - int64 global_quota) { + int64_t global_quota) { if (status == storage::kQuotaStatusOk) { - int64 per_app_quota = + int64_t per_app_quota = global_quota / storage::QuotaManager::kPerHostTemporaryPortion; // Note we use COUNTS_100 (instead of PERCENT) because this can potentially // exceed 100%. @@ -117,7 +117,7 @@ scoped_refptr<storage::QuotaManager> quota_manager, const std::string& extension_id, const GURL& site_url, - int64 next_threshold, + int64_t next_threshold, const base::TimeDelta& rate, bool should_uma) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -144,7 +144,7 @@ // Updates the threshold for an extension already being monitored. void UpdateThresholdForExtension(const std::string& extension_id, - int64 next_threshold) { + int64_t next_threshold) { DCHECK_CURRENTLY_ON(BrowserThread::IO); for (OriginStorageStateMap::iterator it = origin_state_map_.begin(); @@ -205,7 +205,7 @@ // If |next_threshold| is -1, it signifies that we should not enforce (and // only track) storage for this extension. - int64 next_threshold; + int64_t next_threshold; bool should_uma; @@ -333,7 +333,7 @@ return; } - int64 next_threshold = GetNextStorageThresholdFromPrefs(extension->id()); + int64_t next_threshold = GetNextStorageThresholdFromPrefs(extension->id()); if (next_threshold <= initial_extension_threshold_) { // Clear the next threshold in the prefs. This effectively raises it to // |initial_extension_threshold_|. If the current threshold is already @@ -380,8 +380,8 @@ void ExtensionStorageMonitor::OnStorageThresholdExceeded( const std::string& extension_id, - int64 next_threshold, - int64 current_usage) { + int64_t next_threshold, + int64_t current_usage) { DCHECK_CURRENTLY_ON(BrowserThread::UI); const Extension* extension = GetExtensionById(context_, extension_id); @@ -402,10 +402,9 @@ current_usage)); } -void ExtensionStorageMonitor::OnImageLoaded( - const std::string& extension_id, - int64 current_usage, - const gfx::Image& image) { +void ExtensionStorageMonitor::OnImageLoaded(const std::string& extension_id, + int64_t current_usage, + const gfx::Image& image) { const Extension* extension = GetExtensionById(context_, extension_id); if (!extension) return; @@ -600,7 +599,7 @@ UNINSTALL_SOURCE_STORAGE_THRESHOLD_EXCEEDED); } -int64 ExtensionStorageMonitor::GetNextStorageThreshold( +int64_t ExtensionStorageMonitor::GetNextStorageThreshold( const std::string& extension_id) const { int next_threshold = GetNextStorageThresholdFromPrefs(extension_id); if (next_threshold == 0) { @@ -613,7 +612,7 @@ void ExtensionStorageMonitor::SetNextStorageThreshold( const std::string& extension_id, - int64 next_threshold) { + int64_t next_threshold) { extension_prefs_->UpdateExtensionPref( extension_id, kPrefNextStorageThreshold, @@ -622,12 +621,12 @@ : NULL); } -int64 ExtensionStorageMonitor::GetNextStorageThresholdFromPrefs( +int64_t ExtensionStorageMonitor::GetNextStorageThresholdFromPrefs( const std::string& extension_id) const { std::string next_threshold_str; if (extension_prefs_->ReadPrefAsString( extension_id, kPrefNextStorageThreshold, &next_threshold_str)) { - int64 next_threshold; + int64_t next_threshold; if (base::StringToInt64(next_threshold_str, &next_threshold)) return next_threshold; }
diff --git a/chrome/browser/extensions/extension_storage_monitor.h b/chrome/browser/extensions/extension_storage_monitor.h index df3b8ef..237b98b 100644 --- a/chrome/browser/extensions/extension_storage_monitor.h +++ b/chrome/browser/extensions/extension_storage_monitor.h
@@ -5,8 +5,11 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_STORAGE_MONITOR_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_STORAGE_MONITOR_H_ +#include <stdint.h> + #include <set> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" @@ -77,10 +80,10 @@ std::string GetNotificationId(const std::string& extension_id); void OnStorageThresholdExceeded(const std::string& extension_id, - int64 next_threshold, - int64 current_usage); + int64_t next_threshold, + int64_t current_usage); void OnImageLoaded(const std::string& extension_id, - int64 current_usage, + int64_t current_usage, const gfx::Image& image); void OnNotificationButtonClick(const std::string& extension_id, int button_index); @@ -98,13 +101,14 @@ // Returns/sets the next threshold for displaying a notification if an // extension or app consumes excessive disk space. - int64 GetNextStorageThreshold(const std::string& extension_id) const; + int64_t GetNextStorageThreshold(const std::string& extension_id) const; void SetNextStorageThreshold(const std::string& extension_id, - int64 next_threshold); + int64_t next_threshold); // Returns the raw next storage threshold value stored in prefs. Returns 0 if // the initial threshold has not yet been reached. - int64 GetNextStorageThresholdFromPrefs(const std::string& extension_id) const; + int64_t GetNextStorageThresholdFromPrefs( + const std::string& extension_id) const; // Returns/sets whether notifications should be shown if an extension or app // consumes too much disk space. @@ -118,7 +122,7 @@ // The first notification is shown after the initial threshold is exceeded. // A lower threshold is set by tests. - int64 initial_extension_threshold_; + int64_t initial_extension_threshold_; // The rate at which we would like to receive storage updates // from QuotaManager. Overridden in tests.
diff --git a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc index 10b7c25..f02d3a8 100644 --- a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc +++ b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <set> #include "base/run_loop.h" @@ -92,7 +94,7 @@ return storage_monitor_; } - int64 GetInitialExtensionThreshold() { + int64_t GetInitialExtensionThreshold() { CHECK(storage_monitor_); return storage_monitor_->initial_extension_threshold_; } @@ -117,13 +119,13 @@ return monitor()->IsStorageNotificationEnabled(extension_id); } - int64 GetNextStorageThreshold(const std::string& extension_id) { + int64_t GetNextStorageThreshold(const std::string& extension_id) { return monitor()->GetNextStorageThreshold(extension_id); } void WriteBytesExpectingNotification(const Extension* extension, int num_bytes) { - int64 previous_threshold = GetNextStorageThreshold(extension->id()); + int64_t previous_threshold = GetNextStorageThreshold(extension->id()); WriteBytes(extension, num_bytes, true); EXPECT_GT(GetNextStorageThreshold(extension->id()), previous_threshold); } @@ -231,8 +233,8 @@ // Expect to receive no further notifications when usage continues to // increase. - int64 next_threshold = GetNextStorageThreshold(extension->id()); - int64 next_data_size = next_threshold - GetInitialExtensionThreshold(); + int64_t next_threshold = GetNextStorageThreshold(extension->id()); + int64_t next_data_size = next_threshold - GetInitialExtensionThreshold(); ASSERT_GT(next_data_size, 0); WriteBytesNotExpectingNotification(extension, next_data_size);
diff --git a/chrome/browser/extensions/extension_sync_service.cc b/chrome/browser/extensions/extension_sync_service.cc index c94a634..4bb8cf6 100644 --- a/chrome/browser/extensions/extension_sync_service.cc +++ b/chrome/browser/extensions/extension_sync_service.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/extensions/extension_sync_service.h" #include "base/auto_reset.h" -#include "base/basictypes.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/bookmark_app_helper.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/extension_sync_service.h b/chrome/browser/extensions/extension_sync_service.h index 59c042e..fcfa72dd 100644 --- a/chrome/browser/extensions/extension_sync_service.h +++ b/chrome/browser/extensions/extension_sync_service.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "base/version.h" #include "chrome/browser/extensions/sync_bundle.h"
diff --git a/chrome/browser/extensions/extension_system_factory.h b/chrome/browser/extensions/extension_system_factory.h index 128fdef..eeba13d 100644 --- a/chrome/browser/extensions/extension_system_factory.h +++ b/chrome/browser/extensions/extension_system_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "chrome/browser/extensions/extension_system_impl.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc index 836c829..61b12fe 100644 --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -12,6 +12,7 @@ #include "base/memory/weak_ptr.h" #include "base/strings/string_tokenizer.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/chrome_app_sorting.h" #include "chrome/browser/extensions/chrome_content_verifier_delegate.h"
diff --git a/chrome/browser/extensions/extension_system_impl.h b/chrome/browser/extensions/extension_system_impl.h index 0ad93570..30522b1 100644 --- a/chrome/browser/extensions/extension_system_impl.h +++ b/chrome/browser/extensions/extension_system_impl.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_IMPL_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_IMPL_H_ +#include "base/macros.h" +#include "build/build_config.h" #include "extensions/browser/extension_system.h" #include "extensions/common/one_shot_event.h"
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc index 0d87ec3..4651a09 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/extension_tab_util.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index e580bb6f..082edeef0 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/extensions/extension_test_notification_observer.cc b/chrome/browser/extensions/extension_test_notification_observer.cc index 62b55e6..f0d2d52 100644 --- a/chrome/browser/extensions/extension_test_notification_observer.cc +++ b/chrome/browser/extensions/extension_test_notification_observer.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/extension_test_notification_observer.h" +#include <stddef.h> + #include "base/callback_list.h" #include "chrome/browser/extensions/extension_action_test_util.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/extension_user_script_loader_unittest.cc b/chrome/browser/extensions/extension_user_script_loader_unittest.cc index b343026..e211b489 100644 --- a/chrome/browser/extensions/extension_user_script_loader_unittest.cc +++ b/chrome/browser/extensions/extension_user_script_loader_unittest.cc
@@ -4,6 +4,8 @@ #include "extensions/browser/extension_user_script_loader.h" +#include <stddef.h> + #include <set> #include <string>
diff --git a/chrome/browser/extensions/extension_util.cc b/chrome/browser/extensions/extension_util.cc index 7fe28854e..5b4bfd48 100644 --- a/chrome/browser/extensions/extension_util.cc +++ b/chrome/browser/extensions/extension_util.cc
@@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/metrics/field_trial.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_sync_service.h" #include "chrome/browser/extensions/permissions_updater.h"
diff --git a/chrome/browser/extensions/extension_view_host.cc b/chrome/browser/extensions/extension_view_host.cc index d0687d8..cab1a2eb 100644 --- a/chrome/browser/extensions/extension_view_host.cc +++ b/chrome/browser/extensions/extension_view_host.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/extension_view_host.h" +#include "base/macros.h" #include "base/strings/string_piece.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/extensions/extension_view_host.h b/chrome/browser/extensions/extension_view_host.h index a8c47a8..a5966d2 100644 --- a/chrome/browser/extensions/extension_view_host.h +++ b/chrome/browser/extensions/extension_view_host.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_VIEW_HOST_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_VIEW_HOST_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/web_modal/web_contents_modal_dialog_host.h" #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
diff --git a/chrome/browser/extensions/extension_view_host_factory.h b/chrome/browser/extensions/extension_view_host_factory.h index 5bc388c3..3ad7bbf 100644 --- a/chrome/browser/extensions/extension_view_host_factory.h +++ b/chrome/browser/extensions/extension_view_host_factory.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_VIEW_HOST_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_VIEW_HOST_FACTORY_H_ -#include "base/basictypes.h" +#include "base/macros.h" class Browser; class GURL;
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index d10afba..d5667ee 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/extension_web_ui.h" +#include <stddef.h> + #include <set> #include <vector>
diff --git a/chrome/browser/extensions/extension_web_ui_override_registrar.h b/chrome/browser/extensions/extension_web_ui_override_registrar.h index 892deb2..e8aa3de 100644 --- a/chrome/browser/extensions/extension_web_ui_override_registrar.h +++ b/chrome/browser/extensions/extension_web_ui_override_registrar.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_WEB_UI_OVERRIDE_REGISTRAR_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_WEB_UI_OVERRIDE_REGISTRAR_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/extension_registry_observer.h"
diff --git a/chrome/browser/extensions/extension_web_ui_unittest.cc b/chrome/browser/extensions/extension_web_ui_unittest.cc index cd57757..8819f67 100644 --- a/chrome/browser/extensions/extension_web_ui_unittest.cc +++ b/chrome/browser/extensions/extension_web_ui_unittest.cc
@@ -4,6 +4,7 @@ #include "base/command_line.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/extensions/test_extension_system.h"
diff --git a/chrome/browser/extensions/extension_webui_apitest.cc b/chrome/browser/extensions/extension_webui_apitest.cc index e2135c8..beabffd 100644 --- a/chrome/browser/extensions/extension_webui_apitest.cc +++ b/chrome/browser/extensions/extension_webui_apitest.cc
@@ -6,6 +6,7 @@ #include "base/files/file_util.h" #include "base/path_service.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/extensions/external_component_loader.cc b/chrome/browser/extensions/external_component_loader.cc index 506ff8aa..76e7c5f3 100644 --- a/chrome/browser/extensions/external_component_loader.cc +++ b/chrome/browser/extensions/external_component_loader.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/external_component_loader.h" #include "base/command_line.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/component_extensions_whitelist/whitelist.h" #include "chrome/browser/search/hotword_service.h"
diff --git a/chrome/browser/extensions/external_component_loader.h b/chrome/browser/extensions/external_component_loader.h index 3d75a53..3d026cef 100644 --- a/chrome/browser/extensions/external_component_loader.h +++ b/chrome/browser/extensions/external_component_loader.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/extensions/external_loader.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/external_install_error.cc b/chrome/browser/extensions/external_install_error.cc index 8b42cb1..cd13c27 100644 --- a/chrome/browser/extensions/external_install_error.cc +++ b/chrome/browser/extensions/external_install_error.cc
@@ -4,7 +4,10 @@ #include "chrome/browser/extensions/external_install_error.h" +#include <stddef.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_install_prompt_show_params.h"
diff --git a/chrome/browser/extensions/external_loader.h b/chrome/browser/extensions/external_loader.h index ecadda0..50c06ba 100644 --- a/chrome/browser/extensions/external_loader.h +++ b/chrome/browser/extensions/external_loader.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_EXTERNAL_LOADER_H_ #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h"
diff --git a/chrome/browser/extensions/external_policy_loader.h b/chrome/browser/extensions/external_policy_loader.h index 81e74f4b..72fdf3b5 100644 --- a/chrome/browser/extensions/external_policy_loader.h +++ b/chrome/browser/extensions/external_policy_loader.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/extensions/extension_management.h" #include "chrome/browser/extensions/external_loader.h"
diff --git a/chrome/browser/extensions/external_policy_loader_unittest.cc b/chrome/browser/extensions/external_policy_loader_unittest.cc index 22c5bb017..8714eae 100644 --- a/chrome/browser/extensions/external_policy_loader_unittest.cc +++ b/chrome/browser/extensions/external_policy_loader_unittest.cc
@@ -6,6 +6,7 @@ #include <string> #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/values.h" #include "base/version.h"
diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc index 9f98011d..be5f52e 100644 --- a/chrome/browser/extensions/external_pref_loader.cc +++ b/chrome/browser/extensions/external_pref_loader.cc
@@ -15,6 +15,7 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/defaults.h" #include "chrome/browser/prefs/pref_service_syncable_util.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/external_pref_loader.h b/chrome/browser/extensions/external_pref_loader.h index e2265654..2357993 100644 --- a/chrome/browser/extensions/external_pref_loader.h +++ b/chrome/browser/extensions/external_pref_loader.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_observer.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc index b3af2f3..9b62f0f 100644 --- a/chrome/browser/extensions/external_provider_impl.cc +++ b/chrome/browser/extensions/external_provider_impl.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/external_provider_impl.h" +#include <stddef.h> + #include <set> #include <vector> @@ -17,6 +19,7 @@ #include "base/trace_event/trace_event.h" #include "base/values.h" #include "base/version.h" +#include "build/build_config.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h"
diff --git a/chrome/browser/extensions/external_provider_impl.h b/chrome/browser/extensions/external_provider_impl.h index a75bdfe2..2d816bc 100644 --- a/chrome/browser/extensions/external_provider_impl.h +++ b/chrome/browser/extensions/external_provider_impl.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/external_loader.h" #include "extensions/browser/external_provider_interface.h"
diff --git a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc index 0c99551..3cd14d7a 100644 --- a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc +++ b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/external_provider_impl.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/scoped_path_override.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/extensions/external_provider_impl_unittest.cc b/chrome/browser/extensions/external_provider_impl_unittest.cc index a833f58..8b1085b4 100644 --- a/chrome/browser/extensions/external_provider_impl_unittest.cc +++ b/chrome/browser/extensions/external_provider_impl_unittest.cc
@@ -7,10 +7,12 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/test/scoped_path_override.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service_test_base.h"
diff --git a/chrome/browser/extensions/external_registry_loader_win.h b/chrome/browser/extensions/external_registry_loader_win.h index f621734..25de48d 100644 --- a/chrome/browser/extensions/external_registry_loader_win.h +++ b/chrome/browser/extensions/external_registry_loader_win.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_EXTERNAL_REGISTRY_LOADER_WIN_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/extensions/external_loader.h" namespace extensions {
diff --git a/chrome/browser/extensions/fake_safe_browsing_database_manager.cc b/chrome/browser/extensions/fake_safe_browsing_database_manager.cc index c6bb900..87e809e 100644 --- a/chrome/browser/extensions/fake_safe_browsing_database_manager.cc +++ b/chrome/browser/extensions/fake_safe_browsing_database_manager.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/fake_safe_browsing_database_manager.h" +#include <stddef.h> + #include <algorithm> #include <iterator> #include <vector>
diff --git a/chrome/browser/extensions/favicon_downloader.h b/chrome/browser/extensions/favicon_downloader.h index 98674e1..77cf8596 100644 --- a/chrome/browser/extensions/favicon_downloader.h +++ b/chrome/browser/extensions/favicon_downloader.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/extensions/favicon_downloader_unittest.cc b/chrome/browser/extensions/favicon_downloader_unittest.cc index 78026231..1a0fb62 100644 --- a/chrome/browser/extensions/favicon_downloader_unittest.cc +++ b/chrome/browser/extensions/favicon_downloader_unittest.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/extensions/favicon_downloader.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "content/public/common/favicon_url.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/extensions/global_shortcut_listener.h b/chrome/browser/extensions/global_shortcut_listener.h index 1f07df2..9aec54a 100644 --- a/chrome/browser/extensions/global_shortcut_listener.h +++ b/chrome/browser/extensions/global_shortcut_listener.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/events/keycodes/keyboard_codes.h" namespace ui {
diff --git a/chrome/browser/extensions/global_shortcut_listener_chromeos.h b/chrome/browser/extensions/global_shortcut_listener_chromeos.h index ad1181a..b47c2df 100644 --- a/chrome/browser/extensions/global_shortcut_listener_chromeos.h +++ b/chrome/browser/extensions/global_shortcut_listener_chromeos.h
@@ -7,6 +7,7 @@ #include "chrome/browser/extensions/global_shortcut_listener.h" +#include "base/macros.h" #include "ui/base/accelerators/accelerator.h" namespace extensions {
diff --git a/chrome/browser/extensions/global_shortcut_listener_mac.h b/chrome/browser/extensions/global_shortcut_listener_mac.h index 55d94ad..fa07c53 100644 --- a/chrome/browser/extensions/global_shortcut_listener_mac.h +++ b/chrome/browser/extensions/global_shortcut_listener_mac.h
@@ -13,6 +13,7 @@ #include <map> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" namespace extensions {
diff --git a/chrome/browser/extensions/global_shortcut_listener_ozone.h b/chrome/browser/extensions/global_shortcut_listener_ozone.h index e7b56be..fbd954ad 100644 --- a/chrome/browser/extensions/global_shortcut_listener_ozone.h +++ b/chrome/browser/extensions/global_shortcut_listener_ozone.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_OZONE_H_ #define CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_OZONE_H_ +#include "base/macros.h" #include "chrome/browser/extensions/global_shortcut_listener.h" namespace extensions {
diff --git a/chrome/browser/extensions/global_shortcut_listener_win.h b/chrome/browser/extensions/global_shortcut_listener_win.h index cf6430fb0..7d7d34d 100644 --- a/chrome/browser/extensions/global_shortcut_listener_win.h +++ b/chrome/browser/extensions/global_shortcut_listener_win.h
@@ -7,6 +7,7 @@ #include <windows.h> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/global_shortcut_listener.h" #include "ui/gfx/win/singleton_hwnd_observer.h"
diff --git a/chrome/browser/extensions/global_shortcut_listener_x11.cc b/chrome/browser/extensions/global_shortcut_listener_x11.cc index 5a3ad1a..f1f1c83 100644 --- a/chrome/browser/extensions/global_shortcut_listener_x11.cc +++ b/chrome/browser/extensions/global_shortcut_listener_x11.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/global_shortcut_listener_x11.h" +#include <stddef.h> + +#include "base/macros.h" #include "content/public/browser/browser_thread.h" #include "ui/base/accelerators/accelerator.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h"
diff --git a/chrome/browser/extensions/global_shortcut_listener_x11.h b/chrome/browser/extensions/global_shortcut_listener_x11.h index ba3513ad..43230b7 100644 --- a/chrome/browser/extensions/global_shortcut_listener_x11.h +++ b/chrome/browser/extensions/global_shortcut_listener_x11.h
@@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_X11_H_ #define CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_X11_H_ +#include <stdint.h> #include <X11/Xlib.h> + #include <set> +#include "base/macros.h" #include "chrome/browser/extensions/global_shortcut_listener.h" #include "ui/events/platform/platform_event_dispatcher.h"
diff --git a/chrome/browser/extensions/hotword_browsertest.cc b/chrome/browser/extensions/hotword_browsertest.cc index b06c8143..c0b02848 100644 --- a/chrome/browser/extensions/hotword_browsertest.cc +++ b/chrome/browser/extensions/hotword_browsertest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/files/file_path.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/error_console/error_console.h"
diff --git a/chrome/browser/extensions/install_signer.cc b/chrome/browser/extensions/install_signer.cc index 6b7aa35..6a0a0dc8 100644 --- a/chrome/browser/extensions/install_signer.cc +++ b/chrome/browser/extensions/install_signer.cc
@@ -4,12 +4,16 @@ #include "chrome/browser/extensions/install_signer.h" +#include <stddef.h> +#include <stdint.h> + #include "base/base64.h" #include "base/bind.h" #include "base/command_line.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" #include "base/process/process_info.h" @@ -20,6 +24,7 @@ #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/common/chrome_switches.h" #include "components/crx_file/constants.h" #include "crypto/random.h" @@ -204,7 +209,7 @@ // so older entries will not necessarily have this. if (value.HasKey(kTimestampKey)) { std::string timestamp; - int64 timestamp_value = 0; + int64_t timestamp_value = 0; if (!value.GetString(kTimestampKey, ×tamp) || !base::StringToInt64(timestamp, ×tamp_value)) { result.reset(); @@ -253,16 +258,15 @@ return false; crypto::SignatureVerifier verifier; - if (!verifier.VerifyInit(crx_file::kSignatureAlgorithm, - sizeof(crx_file::kSignatureAlgorithm), - reinterpret_cast<const uint8*>( - signature.signature.data()), - signature.signature.size(), - reinterpret_cast<const uint8*>(public_key.data()), - public_key.size())) + if (!verifier.VerifyInit( + crx_file::kSignatureAlgorithm, sizeof(crx_file::kSignatureAlgorithm), + reinterpret_cast<const uint8_t*>(signature.signature.data()), + signature.signature.size(), + reinterpret_cast<const uint8_t*>(public_key.data()), + public_key.size())) return false; - verifier.VerifyUpdate(reinterpret_cast<const uint8*>(signed_data.data()), + verifier.VerifyUpdate(reinterpret_cast<const uint8_t*>(signed_data.data()), signed_data.size()); return verifier.VerifyFinal(); }
diff --git a/chrome/browser/extensions/install_signer.h b/chrome/browser/extensions/install_signer.h index 56f23b4f..d2df9875 100644 --- a/chrome/browser/extensions/install_signer.h +++ b/chrome/browser/extensions/install_signer.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "extensions/common/extension.h"
diff --git a/chrome/browser/extensions/install_tracker.h b/chrome/browser/extensions/install_tracker.h index 4a3c264..e29b339f 100644 --- a/chrome/browser/extensions/install_tracker.h +++ b/chrome/browser/extensions/install_tracker.h
@@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/observer_list.h" #include "base/prefs/pref_change_registrar.h" #include "base/scoped_observer.h"
diff --git a/chrome/browser/extensions/install_tracker_factory.h b/chrome/browser/extensions/install_tracker_factory.h index 6a58cf44..214e9509 100644 --- a/chrome/browser/extensions/install_tracker_factory.h +++ b/chrome/browser/extensions/install_tracker_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_INSTALL_TRACKER_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_INSTALL_TRACKER_FACTORY_H_ +#include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" namespace base {
diff --git a/chrome/browser/extensions/install_verifier.cc b/chrome/browser/extensions/install_verifier.cc index 2ede600..ba9b12cb 100644 --- a/chrome/browser/extensions/install_verifier.cc +++ b/chrome/browser/extensions/install_verifier.cc
@@ -15,6 +15,7 @@ #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_management.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/install_signer.h"
diff --git a/chrome/browser/extensions/install_verifier.h b/chrome/browser/extensions/install_verifier.h index 3a29276..6caa364 100644 --- a/chrome/browser/extensions/install_verifier.h +++ b/chrome/browser/extensions/install_verifier.h
@@ -9,8 +9,8 @@ #include <set> #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/extensions/install_verifier_factory.h b/chrome/browser/extensions/install_verifier_factory.h index f0da05a..e10bedec 100644 --- a/chrome/browser/extensions/install_verifier_factory.h +++ b/chrome/browser/extensions/install_verifier_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_INSTALL_VERIFIER_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_INSTALL_VERIFIER_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index 8e47da4..9cd0447 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/installed_loader.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h"
diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc index 1408c0c..9d10cad 100644 --- a/chrome/browser/extensions/isolated_app_browsertest.cc +++ b/chrome/browser/extensions/isolated_app_browsertest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h"
diff --git a/chrome/browser/extensions/launch_util.cc b/chrome/browser/extensions/launch_util.cc index 907f9051..00d5d988 100644 --- a/chrome/browser/extensions/launch_util.cc +++ b/chrome/browser/extensions/launch_util.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/launch_util.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_sync_service.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index ce37ca1..069d62b 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -2,11 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/scoped_observer.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/extensions/browser_action_test_util.h" #include "chrome/browser/extensions/extension_action_test_util.h"
diff --git a/chrome/browser/extensions/location_bar_controller_unittest.cc b/chrome/browser/extensions/location_bar_controller_unittest.cc index d916c89..7ea046f 100644 --- a/chrome/browser/extensions/location_bar_controller_unittest.cc +++ b/chrome/browser/extensions/location_bar_controller_unittest.cc
@@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "chrome/browser/extensions/active_script_controller.h" #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" #include "chrome/browser/extensions/extension_action.h"
diff --git a/chrome/browser/extensions/menu_manager.h b/chrome/browser/extensions/menu_manager.h index 1bf4402..7386d9a 100644 --- a/chrome/browser/extensions/menu_manager.h +++ b/chrome/browser/extensions/menu_manager.h
@@ -5,14 +5,17 @@ #ifndef CHROME_BROWSER_EXTENSIONS_MENU_MANAGER_H_ #define CHROME_BROWSER_EXTENSIONS_MENU_MANAGER_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <set> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" @@ -154,7 +157,7 @@ } private: - uint32 value_; // A bitmask of Context values. + uint32_t value_; // A bitmask of Context values. }; MenuItem(const Id& id,
diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index 58f99941..3d45f6de 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc
@@ -6,6 +6,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/mock_extension_special_storage_policy.h b/chrome/browser/extensions/mock_extension_special_storage_policy.h index a485284..edc142e7 100644 --- a/chrome/browser/extensions/mock_extension_special_storage_policy.h +++ b/chrome/browser/extensions/mock_extension_special_storage_policy.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "chrome/browser/extensions/extension_special_storage_policy.h" #include "url/gurl.h"
diff --git a/chrome/browser/extensions/navigation_observer.h b/chrome/browser/extensions/navigation_observer.h index 017acc0..eae903c 100644 --- a/chrome/browser/extensions/navigation_observer.h +++ b/chrome/browser/extensions/navigation_observer.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/extensions/ntp_overridden_bubble_delegate.h b/chrome/browser/extensions/ntp_overridden_bubble_delegate.h index 357d09ce..d3659de 100644 --- a/chrome/browser/extensions/ntp_overridden_bubble_delegate.h +++ b/chrome/browser/extensions/ntp_overridden_bubble_delegate.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_NTP_OVERRIDDEN_BUBBLE_DELEGATE_H_ #define CHROME_BROWSER_EXTENSIONS_NTP_OVERRIDDEN_BUBBLE_DELEGATE_H_ +#include <stddef.h> + #include <string> #include "base/macros.h"
diff --git a/chrome/browser/extensions/options_page_apitest.cc b/chrome/browser/extensions/options_page_apitest.cc index b3ad332..62f47085 100644 --- a/chrome/browser/extensions/options_page_apitest.cc +++ b/chrome/browser/extensions/options_page_apitest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/test_extension_dir.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/extensions/pack_extension_job.h b/chrome/browser/extensions/pack_extension_job.h index 61a48cb..7d663b0f 100644 --- a/chrome/browser/extensions/pack_extension_job.h +++ b/chrome/browser/extensions/pack_extension_job.h
@@ -8,6 +8,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/strings/string16.h" #include "chrome/browser/extensions/extension_creator.h"
diff --git a/chrome/browser/extensions/page_action_browsertest.cc b/chrome/browser/extensions/page_action_browsertest.cc index fe0b60b..c69a73d5 100644 --- a/chrome/browser/extensions/page_action_browsertest.cc +++ b/chrome/browser/extensions/page_action_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h"
diff --git a/chrome/browser/extensions/path_util.cc b/chrome/browser/extensions/path_util.cc index fd7142ec..23457af2 100644 --- a/chrome/browser/extensions/path_util.cc +++ b/chrome/browser/extensions/path_util.cc
@@ -6,6 +6,7 @@ #include "base/path_service.h" #include "base/strings/sys_string_conversions.h" +#include "build/build_config.h" #if defined(OS_MACOSX) #include <CoreFoundation/CoreFoundation.h>
diff --git a/chrome/browser/extensions/pending_extension_manager.h b/chrome/browser/extensions/pending_extension_manager.h index 5193889..cd2dcb2 100644 --- a/chrome/browser/extensions/pending_extension_manager.h +++ b/chrome/browser/extensions/pending_extension_manager.h
@@ -9,6 +9,7 @@ #include <string> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "chrome/browser/extensions/pending_extension_info.h" #include "extensions/common/manifest.h"
diff --git a/chrome/browser/extensions/permission_message_combinations_unittest.cc b/chrome/browser/extensions/permission_message_combinations_unittest.cc index 5e46a53..f2b762a 100644 --- a/chrome/browser/extensions/permission_message_combinations_unittest.cc +++ b/chrome/browser/extensions/permission_message_combinations_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/values_test_util.h" #include "chrome/browser/extensions/test_extension_environment.h"
diff --git a/chrome/browser/extensions/permission_messages_unittest.cc b/chrome/browser/extensions/permission_messages_unittest.cc index 3d0a0a6..81f3fa7 100644 --- a/chrome/browser/extensions/permission_messages_unittest.cc +++ b/chrome/browser/extensions/permission_messages_unittest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <utility> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/permissions_updater.h b/chrome/browser/extensions/permissions_updater.h index c92ada8..fb5b563 100644 --- a/chrome/browser/extensions/permissions_updater.h +++ b/chrome/browser/extensions/permissions_updater.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "extensions/browser/extension_event_histogram_value.h"
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index 05fd5c0..3d10005 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/command_line.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/policy_handlers.cc b/chrome/browser/extensions/policy_handlers.cc index 8e9be50..5b65f24 100644 --- a/chrome/browser/extensions/policy_handlers.cc +++ b/chrome/browser/extensions/policy_handlers.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/policy_handlers.h" +#include <stddef.h> + #include "base/logging.h" #include "base/prefs/pref_value_map.h" #include "chrome/browser/extensions/extension_management_constants.h"
diff --git a/chrome/browser/extensions/policy_handlers.h b/chrome/browser/extensions/policy_handlers.h index c2636b2..5dd688b 100644 --- a/chrome/browser/extensions/policy_handlers.h +++ b/chrome/browser/extensions/policy_handlers.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_POLICY_HANDLERS_H_ #define CHROME_BROWSER_EXTENSIONS_POLICY_HANDLERS_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "components/policy/core/browser/configuration_policy_handler.h"
diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc index 46b49c9..f8b3777 100644 --- a/chrome/browser/extensions/process_management_browsertest.cc +++ b/chrome/browser/extensions/process_management_browsertest.cc
@@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/process_manager_browsertest.cc b/chrome/browser/extensions/process_manager_browsertest.cc index 2366754..abf9fd9 100644 --- a/chrome/browser/extensions/process_manager_browsertest.cc +++ b/chrome/browser/extensions/process_manager_browsertest.cc
@@ -4,7 +4,10 @@ #include "extensions/browser/process_manager.h" +#include <stddef.h> + #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "chrome/browser/extensions/browser_action_test_util.h"
diff --git a/chrome/browser/extensions/proxy_overridden_bubble_delegate.h b/chrome/browser/extensions/proxy_overridden_bubble_delegate.h index dedc843..2a92c34f 100644 --- a/chrome/browser/extensions/proxy_overridden_bubble_delegate.h +++ b/chrome/browser/extensions/proxy_overridden_bubble_delegate.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_PROXY_OVERRIDDEN_BUBBLE_DELEGATE_H_ #define CHROME_BROWSER_EXTENSIONS_PROXY_OVERRIDDEN_BUBBLE_DELEGATE_H_ +#include <stddef.h> + #include <string> #include "base/macros.h"
diff --git a/chrome/browser/extensions/requirements_checker_browsertest.cc b/chrome/browser/extensions/requirements_checker_browsertest.cc index 7ff03d91..e3dc361 100644 --- a/chrome/browser/extensions/requirements_checker_browsertest.cc +++ b/chrome/browser/extensions/requirements_checker_browsertest.cc
@@ -10,6 +10,7 @@ #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "chrome/browser/extensions/chrome_requirements_checker.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc index 31e7091..1dbd2f34 100644 --- a/chrome/browser/extensions/service_worker_apitest.cc +++ b/chrome/browser/extensions/service_worker_apitest.cc
@@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_apitest.h" @@ -197,7 +200,7 @@ } PushMessagingAppIdentifier GetAppIdentifierForServiceWorkerRegistration( - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const GURL& origin) { PushMessagingAppIdentifier app_identifier = PushMessagingAppIdentifier::FindByServiceWorker(
diff --git a/chrome/browser/extensions/settings_api_bubble_delegate.h b/chrome/browser/extensions/settings_api_bubble_delegate.h index aea8350..e9d8408 100644 --- a/chrome/browser/extensions/settings_api_bubble_delegate.h +++ b/chrome/browser/extensions/settings_api_bubble_delegate.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_SETTINGS_API_BUBBLE_DELEGATE_H_ #define CHROME_BROWSER_EXTENSIONS_SETTINGS_API_BUBBLE_DELEGATE_H_ +#include <stddef.h> + #include <string> #include "base/macros.h"
diff --git a/chrome/browser/extensions/shared_module_service.h b/chrome/browser/extensions/shared_module_service.h index 9c9e302..f870f82f 100644 --- a/chrome/browser/extensions/shared_module_service.h +++ b/chrome/browser/extensions/shared_module_service.h
@@ -7,6 +7,7 @@ #include <list> +#include "base/macros.h" #include "base/scoped_observer.h" #include "extensions/browser/extension_registry_observer.h" #include "extensions/common/manifest_handlers/shared_module_info.h"
diff --git a/chrome/browser/extensions/shared_user_script_master.h b/chrome/browser/extensions/shared_user_script_master.h index 656f514..b697829e 100644 --- a/chrome/browser/extensions/shared_user_script_master.h +++ b/chrome/browser/extensions/shared_user_script_master.h
@@ -7,6 +7,7 @@ #include <set> +#include "base/macros.h" #include "base/scoped_observer.h" #include "extensions/browser/extension_registry_observer.h" #include "extensions/browser/extension_user_script_loader.h"
diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc index 17f443f..07092da 100644 --- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc +++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
@@ -10,6 +10,7 @@ #include "base/logging.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/signin/signin_promo.h"
diff --git a/chrome/browser/extensions/signin/scoped_gaia_auth_extension.h b/chrome/browser/extensions/signin/scoped_gaia_auth_extension.h index d032565..3010473 100644 --- a/chrome/browser/extensions/signin/scoped_gaia_auth_extension.h +++ b/chrome/browser/extensions/signin/scoped_gaia_auth_extension.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_SIGNIN_SCOPED_GAIA_AUTH_EXTENSION_H_ #define CHROME_BROWSER_EXTENSIONS_SIGNIN_SCOPED_GAIA_AUTH_EXTENSION_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace content { class BrowserContext;
diff --git a/chrome/browser/extensions/startup_helper.h b/chrome/browser/extensions/startup_helper.h index 82cc596..d852d2f 100644 --- a/chrome/browser/extensions/startup_helper.h +++ b/chrome/browser/extensions/startup_helper.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_STARTUP_HELPER_H_ #define CHROME_BROWSER_EXTENSIONS_STARTUP_HELPER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/pack_extension_job.h"
diff --git a/chrome/browser/extensions/stubs_apitest.cc b/chrome/browser/extensions/stubs_apitest.cc index 4361260..fc819407 100644 --- a/chrome/browser/extensions/stubs_apitest.cc +++ b/chrome/browser/extensions/stubs_apitest.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 "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/ui_test_utils.h"
diff --git a/chrome/browser/extensions/suspicious_extension_bubble_delegate.h b/chrome/browser/extensions/suspicious_extension_bubble_delegate.h index 0d1406e..82cd2e6 100644 --- a/chrome/browser/extensions/suspicious_extension_bubble_delegate.h +++ b/chrome/browser/extensions/suspicious_extension_bubble_delegate.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_SUSPICIOUS_EXTENSION_BUBBLE_DELEGATE_H_ #define CHROME_BROWSER_EXTENSIONS_SUSPICIOUS_EXTENSION_BUBBLE_DELEGATE_H_ +#include <stddef.h> + #include "base/macros.h" #include "chrome/browser/extensions/extension_message_bubble_controller.h"
diff --git a/chrome/browser/extensions/sync_bundle.h b/chrome/browser/extensions/sync_bundle.h index 944812a..d8229bf 100644 --- a/chrome/browser/extensions/sync_bundle.h +++ b/chrome/browser/extensions/sync_bundle.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "sync/api/sync_change.h" #include "sync/api/sync_change_processor.h"
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc index a7ca271..07ccc99 100644 --- a/chrome/browser/extensions/tab_helper.cc +++ b/chrome/browser/extensions/tab_helper.cc
@@ -7,6 +7,7 @@ #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/active_script_controller.h" #include "chrome/browser/extensions/activity_log/activity_log.h"
diff --git a/chrome/browser/extensions/tab_helper.h b/chrome/browser/extensions/tab_helper.h index 435cfff..702bb1c 100644 --- a/chrome/browser/extensions/tab_helper.h +++ b/chrome/browser/extensions/tab_helper.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/extensions/test_blacklist.h b/chrome/browser/extensions/test_blacklist.h index d8061ed..44269fa 100644 --- a/chrome/browser/extensions/test_blacklist.h +++ b/chrome/browser/extensions/test_blacklist.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/extensions/blacklist.h" #include "chrome/browser/extensions/blacklist_state_fetcher.h"
diff --git a/chrome/browser/extensions/test_blacklist_state_fetcher.h b/chrome/browser/extensions/test_blacklist_state_fetcher.h index 373a842..98e7b4a 100644 --- a/chrome/browser/extensions/test_blacklist_state_fetcher.h +++ b/chrome/browser/extensions/test_blacklist_state_fetcher.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chrome/browser/extensions/blacklist_state_fetcher.h" #include "chrome/common/safe_browsing/crx_info.pb.h" #include "net/url_request/test_url_fetcher_factory.h"
diff --git a/chrome/browser/extensions/test_extension_environment.cc b/chrome/browser/extensions/test_extension_environment.cc index 930119b..c9bc1aa0 100644 --- a/chrome/browser/extensions/test_extension_environment.cc +++ b/chrome/browser/extensions/test_extension_environment.cc
@@ -8,8 +8,10 @@ #include "base/command_line.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/sessions/session_tab_helper.h"
diff --git a/chrome/browser/extensions/test_extension_environment.h b/chrome/browser/extensions/test_extension_environment.h index 9a4a36b7..99aa7f7 100644 --- a/chrome/browser/extensions/test_extension_environment.h +++ b/chrome/browser/extensions/test_extension_environment.h
@@ -5,8 +5,10 @@ #ifndef CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_ #define CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_ENVIRONMENT_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #if defined(OS_WIN) #include "ui/base/win/scoped_ole_initializer.h"
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index bdd5dab..c62b588 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/prefs/json_pref_store.h"
diff --git a/chrome/browser/extensions/test_extension_prefs.h b/chrome/browser/extensions/test_extension_prefs.h index 29855ec..886a64c 100644 --- a/chrome/browser/extensions/test_extension_prefs.h +++ b/chrome/browser/extensions/test_extension_prefs.h
@@ -8,6 +8,7 @@ #include <string> #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc index 44f7dd3e..90531b2 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/extensions/theme_installed_infobar_delegate.h" +#include <stddef.h> + #include <string> #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/infobars/infobar_service.h"
diff --git a/chrome/browser/extensions/token_cache/token_cache_service.h b/chrome/browser/extensions/token_cache/token_cache_service.h index a1c71f22..b96afaf 100644 --- a/chrome/browser/extensions/token_cache/token_cache_service.h +++ b/chrome/browser/extensions/token_cache/token_cache_service.h
@@ -8,9 +8,9 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/time/time.h" #include "components/keyed_service/core/keyed_service.h" #include "components/signin/core/browser/signin_manager_base.h"
diff --git a/chrome/browser/extensions/token_cache/token_cache_service_factory.h b/chrome/browser/extensions/token_cache/token_cache_service_factory.h index b2112f8..ac11defe 100644 --- a/chrome/browser/extensions/token_cache/token_cache_service_factory.h +++ b/chrome/browser/extensions/token_cache/token_cache_service_factory.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_TOKEN_CACHE_TOKEN_CACHE_SERVICE_FACTORY_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/token_cache/token_cache_service_unittest.cc b/chrome/browser/extensions/token_cache/token_cache_service_unittest.cc index f1c6d9b..9734ed7 100644 --- a/chrome/browser/extensions/token_cache/token_cache_service_unittest.cc +++ b/chrome/browser/extensions/token_cache/token_cache_service_unittest.cc
@@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stddef.h> + #include "base/compiler_specific.h" #include "base/time/time.h" #include "chrome/browser/extensions/token_cache/token_cache_service.h"
diff --git a/chrome/browser/extensions/unpacked_installer.h b/chrome/browser/extensions/unpacked_installer.h index db95a07..41bbebd 100644 --- a/chrome/browser/extensions/unpacked_installer.h +++ b/chrome/browser/extensions/unpacked_installer.h
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.h b/chrome/browser/extensions/updater/chrome_update_client_config.h index 1e6cab6..5f7ab3b 100644 --- a/chrome/browser/extensions/updater/chrome_update_client_config.h +++ b/chrome/browser/extensions/updater/chrome_update_client_config.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "components/component_updater/configurator_impl.h" #include "extensions/browser/updater/update_client_config.h"
diff --git a/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.h b/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.h index 8e9bf855..d671e67f 100644 --- a/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.h +++ b/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_EXTENSIONS_UPDATER_CHROMEOS_EXTENSION_CACHE_DELEGATE_H_ #define CHROME_BROWSER_EXTENSIONS_UPDATER_CHROMEOS_EXTENSION_CACHE_DELEGATE_H_ +#include <stddef.h> + #include "base/files/file_path.h" #include "base/macros.h" #include "chrome/browser/extensions/updater/extension_cache_delegate.h"
diff --git a/chrome/browser/extensions/updater/extension_cache_fake.h b/chrome/browser/extensions/updater/extension_cache_fake.h index d7b0fde9..bffc8e9 100644 --- a/chrome/browser/extensions/updater/extension_cache_fake.h +++ b/chrome/browser/extensions/updater/extension_cache_fake.h
@@ -9,6 +9,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "extensions/browser/updater/extension_cache.h" namespace extensions {
diff --git a/chrome/browser/extensions/updater/extension_cache_impl.cc b/chrome/browser/extensions/updater/extension_cache_impl.cc index 44a82954..3f00c43 100644 --- a/chrome/browser/extensions/updater/extension_cache_impl.cc +++ b/chrome/browser/extensions/updater/extension_cache_impl.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/updater/extension_cache_impl.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/memory/singleton.h" #include "base/metrics/histogram.h" @@ -96,7 +99,7 @@ } init_callbacks_.clear(); - uint64 cache_size = 0; + uint64_t cache_size = 0; size_t extensions_count = 0; if (cache_->GetStatistics(&cache_size, &extensions_count)) { UMA_HISTOGRAM_COUNTS_100("Extensions.ExtensionCacheCount",
diff --git a/chrome/browser/extensions/updater/extension_cache_impl.h b/chrome/browser/extensions/updater/extension_cache_impl.h index 58b07328..e04245f 100644 --- a/chrome/browser/extensions/updater/extension_cache_impl.h +++ b/chrome/browser/extensions/updater/extension_cache_impl.h
@@ -11,6 +11,7 @@ #include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc index da7611d..939fe69 100644 --- a/chrome/browser/extensions/updater/extension_updater.cc +++ b/chrome/browser/extensions/updater/extension_updater.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/updater/extension_updater.h" +#include <stdint.h> + #include <algorithm> #include <set> #include <vector> @@ -255,8 +257,8 @@ double delay_ms = target_delay.InMillisecondsF(); double jitter_factor = (RandDouble() * .2) - 0.1; delay_ms += delay_ms * jitter_factor; - TimeDelta actual_delay = TimeDelta::FromMilliseconds( - static_cast<int64>(delay_ms)); + TimeDelta actual_delay = + TimeDelta::FromMilliseconds(static_cast<int64_t>(delay_ms)); // Save the time of next check. Time next = Time::Now() + actual_delay; @@ -285,7 +287,7 @@ } // Save the last check time, and schedule the next check. - int64 now = Time::Now().ToInternalValue(); + int64_t now = Time::Now().ToInternalValue(); prefs_->SetInt64(pref_names::kLastUpdateCheck, now); ScheduleNextCheck(TimeDelta::FromSeconds(frequency_seconds_)); }
diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h index e5cebd4..3cb450d 100644 --- a/chrome/browser/extensions/updater/extension_updater.h +++ b/chrome/browser/extensions/updater/extension_updater.h
@@ -14,6 +14,7 @@ #include "base/callback_forward.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h"
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index b733a79..c128629 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <list> #include <map> #include <set> @@ -11,6 +14,7 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" @@ -24,6 +28,7 @@ #include "base/thread_task_runner_handle.h" #include "base/threading/thread.h" #include "base/version.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_error_reporter.h" @@ -1776,7 +1781,7 @@ Time last_ping_day = service.extension_prefs()->LastPingDay(extension->id()); EXPECT_FALSE(last_ping_day.is_null()); - int64 seconds_diff = (Time::Now() - last_ping_day).InSeconds(); + int64_t seconds_diff = (Time::Now() - last_ping_day).InSeconds(); EXPECT_LT(seconds_diff - results.daystart_elapsed_seconds, 5); }
diff --git a/chrome/browser/extensions/updater/local_extension_cache.cc b/chrome/browser/extensions/updater/local_extension_cache.cc index e265b8c..4caec7d8 100644 --- a/chrome/browser/extensions/updater/local_extension_cache.cc +++ b/chrome/browser/extensions/updater/local_extension_cache.cc
@@ -30,7 +30,7 @@ LocalExtensionCache::LocalExtensionCache( const base::FilePath& cache_dir, - uint64 max_cache_size, + uint64_t max_cache_size, const base::TimeDelta& max_cache_age, const scoped_refptr<base::SequencedTaskRunner>& backend_task_runner) : cache_dir_(cache_dir), @@ -40,8 +40,7 @@ state_(kUninitialized), cache_status_polling_delay_( base::TimeDelta::FromMilliseconds(kCacheStatusPollingDelayMs)), - weak_ptr_factory_(this) { -} + weak_ptr_factory_(this) {} LocalExtensionCache::~LocalExtensionCache() { if (state_ == kReady) @@ -213,7 +212,7 @@ return true; } -bool LocalExtensionCache::GetStatistics(uint64* cache_size, +bool LocalExtensionCache::GetStatistics(uint64_t* cache_size, size_t* extensions_count) { if (state_ != kReady) return false; @@ -609,14 +608,13 @@ const std::string& version, const std::string& expected_hash, const base::Time& last_used, - uint64 size, + uint64_t size, const base::FilePath& file_path) : version(version), expected_hash(base::ToLowerASCII(expected_hash)), last_used(last_used), size(size), - file_path(file_path) { -} + file_path(file_path) {} LocalExtensionCache::CacheItemInfo::~CacheItemInfo() { }
diff --git a/chrome/browser/extensions/updater/local_extension_cache.h b/chrome/browser/extensions/updater/local_extension_cache.h index ffb38c2..0bd50ef 100644 --- a/chrome/browser/extensions/updater/local_extension_cache.h +++ b/chrome/browser/extensions/updater/local_extension_cache.h
@@ -5,11 +5,15 @@ #ifndef CHROME_BROWSER_EXTENSIONS_UPDATER_LOCAL_EXTENSION_CACHE_H_ #define CHROME_BROWSER_EXTENSIONS_UPDATER_LOCAL_EXTENSION_CACHE_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <string> #include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" @@ -31,11 +35,11 @@ // |max_cache_age| - maximum age that unused item can be kept in cache, 0 age // means that all unused cache items will be removed on Shutdown. // All file I/O is done via the |backend_task_runner|. - LocalExtensionCache(const base::FilePath& cache_dir, - uint64 max_cache_size, - const base::TimeDelta& max_cache_age, - const scoped_refptr<base::SequencedTaskRunner>& - backend_task_runner); + LocalExtensionCache( + const base::FilePath& cache_dir, + uint64_t max_cache_size, + const base::TimeDelta& max_cache_age, + const scoped_refptr<base::SequencedTaskRunner>& backend_task_runner); ~LocalExtensionCache(); // Name of flag file that indicates that cache is ready (import finished). @@ -85,8 +89,7 @@ bool RemoveExtension(const std::string& id, const std::string& expected_hash); // Return cache statistics. Returns |false| if cache is not ready. - bool GetStatistics(uint64* cache_size, - size_t* extensions_count); + bool GetStatistics(uint64_t* cache_size, size_t* extensions_count); // Outputs properly formatted extension file name, as it will be stored in // cache. If |expected_hash| is empty, it will be <id>-<version>.crx, @@ -107,13 +110,13 @@ std::string version; std::string expected_hash; base::Time last_used; - uint64 size; + uint64_t size; base::FilePath file_path; CacheItemInfo(const std::string& version, const std::string& expected_hash, const base::Time& last_used, - uint64 size, + uint64_t size, const base::FilePath& file_path); ~CacheItemInfo(); }; @@ -247,7 +250,7 @@ base::FilePath cache_dir_; // Maximum size of cache dir on disk. - uint64 max_cache_size_; + uint64_t max_cache_size_; // Minimal age of unused item in cache, items prior to this age will be // deleted on shutdown.
diff --git a/chrome/browser/extensions/updater/local_extension_cache_unittest.cc b/chrome/browser/extensions/updater/local_extension_cache_unittest.cc index 6dcda932..2ef7759 100644 --- a/chrome/browser/extensions/updater/local_extension_cache_unittest.cc +++ b/chrome/browser/extensions/updater/local_extension_cache_unittest.cc
@@ -4,10 +4,14 @@ #include "chrome/browser/extensions/updater/local_extension_cache.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -97,7 +101,7 @@ crypto::SecureHash* hash = crypto::SecureHash::Create(crypto::SecureHash::SHA256); hash->Update(data.c_str(), size); - uint8 output[crypto::kSHA256Length]; + uint8_t output[crypto::kSHA256Length]; hash->Finish(output, sizeof(output)); const std::string hex_hash = base::ToLowerASCII(base::HexEncode(output, sizeof(output)));
diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc index 56a8c35..3485c056 100644 --- a/chrome/browser/extensions/user_script_listener.cc +++ b/chrome/browser/extensions/user_script_listener.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/extensions/user_script_listener.h" #include "base/bind.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/timer/elapsed_timer.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/extensions/user_script_listener.h b/chrome/browser/extensions/user_script_listener.h index 6e49b684..92426e7 100644 --- a/chrome/browser/extensions/user_script_listener.h +++ b/chrome/browser/extensions/user_script_listener.h
@@ -10,6 +10,7 @@ #include <map> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc index c72a03c..6befa17 100644 --- a/chrome/browser/extensions/user_script_listener_unittest.cc +++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -4,6 +4,7 @@ #include "base/files/file_util.h" #include "base/json/json_file_value_serializer.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/threading/thread.h"
diff --git a/chrome/browser/extensions/wake_event_page_apitest.cc b/chrome/browser/extensions/wake_event_page_apitest.cc index 8f95d81b..e88f79d04 100644 --- a/chrome/browser/extensions/wake_event_page_apitest.cc +++ b/chrome/browser/extensions/wake_event_page_apitest.cc
@@ -5,6 +5,7 @@ #include <string> #include "base/auto_reset.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/scoped_observer.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/extensions/warning_badge_service.cc b/chrome/browser/extensions/warning_badge_service.cc index 78269b6..f226fb3 100644 --- a/chrome/browser/extensions/warning_badge_service.cc +++ b/chrome/browser/extensions/warning_badge_service.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/warning_badge_service.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/stl_util.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/warning_badge_service_factory.h"
diff --git a/chrome/browser/extensions/warning_badge_service.h b/chrome/browser/extensions/warning_badge_service.h index 88672de..9d6aa85 100644 --- a/chrome/browser/extensions/warning_badge_service.h +++ b/chrome/browser/extensions/warning_badge_service.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_WARNING_BADGE_SERVICE_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/threading/non_thread_safe.h" #include "components/keyed_service/core/keyed_service.h" #include "extensions/browser/warning_service.h"
diff --git a/chrome/browser/extensions/warning_badge_service_factory.h b/chrome/browser/extensions/warning_badge_service_factory.h index f748c04..a89f168 100644 --- a/chrome/browser/extensions/warning_badge_service_factory.h +++ b/chrome/browser/extensions/warning_badge_service_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_WARNING_BADGE_SERVICE_FACTORY_H_ #define CHROME_BROWSER_EXTENSIONS_WARNING_BADGE_SERVICE_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/extensions/webstore_data_fetcher.h b/chrome/browser/extensions/webstore_data_fetcher.h index d75b999..0cb26f3 100644 --- a/chrome/browser/extensions/webstore_data_fetcher.h +++ b/chrome/browser/extensions/webstore_data_fetcher.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "net/url_request/url_fetcher_delegate.h"
diff --git a/chrome/browser/extensions/webstore_inline_installer.h b/chrome/browser/extensions/webstore_inline_installer.h index ebdab6a..22ae82138 100644 --- a/chrome/browser/extensions/webstore_inline_installer.h +++ b/chrome/browser/extensions/webstore_inline_installer.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/webstore_standalone_installer.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/extensions/webstore_install_with_prompt.h b/chrome/browser/extensions/webstore_install_with_prompt.h index dbabe50fb..5973a9bd 100644 --- a/chrome/browser/extensions/webstore_install_with_prompt.h +++ b/chrome/browser/extensions/webstore_install_with_prompt.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_WEBSTORE_INSTALL_WITH_PROMPT_H_ #define CHROME_BROWSER_EXTENSIONS_WEBSTORE_INSTALL_WITH_PROMPT_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/webstore_standalone_installer.h" #include "chrome/browser/ui/native_window_tracker.h"
diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index 79b73bec..219f2d3 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/webstore_installer.h" +#include <stddef.h> #include <stdint.h> #include <limits> @@ -23,6 +24,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/download/download_crx_util.h" #include "chrome/browser/download/download_prefs.h"
diff --git a/chrome/browser/extensions/webstore_installer_test.h b/chrome/browser/extensions/webstore_installer_test.h index be226719..ec88e2e8 100644 --- a/chrome/browser/extensions/webstore_installer_test.h +++ b/chrome/browser/extensions/webstore_installer_test.h
@@ -8,6 +8,7 @@ #include <string> #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "extensions/browser/extension_dialog_auto_confirm.h" #include "url/gurl.h"
diff --git a/chrome/browser/extensions/webstore_standalone_installer.h b/chrome/browser/extensions/webstore_standalone_installer.h index 57f05bdae..70151fa7 100644 --- a/chrome/browser/extensions/webstore_standalone_installer.h +++ b/chrome/browser/extensions/webstore_standalone_installer.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/active_install_data.h"
diff --git a/chrome/browser/extensions/webstore_startup_installer.h b/chrome/browser/extensions/webstore_startup_installer.h index cfbbf76..f0358c377 100644 --- a/chrome/browser/extensions/webstore_startup_installer.h +++ b/chrome/browser/extensions/webstore_startup_installer.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_WEBSTORE_STARTUP_INSTALLER_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "chrome/browser/extensions/webstore_install_with_prompt.h" namespace extensions {
diff --git a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc index 7d6d9773..0f8accd 100644 --- a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc +++ b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc
@@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/scoped_observer.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/webstore_installer_test.h" #include "chrome/browser/infobars/infobar_service.h"
diff --git a/chrome/browser/extensions/window_controller.cc b/chrome/browser/extensions/window_controller.cc index e35be66..67b3d47c 100644 --- a/chrome/browser/extensions/window_controller.cc +++ b/chrome/browser/extensions/window_controller.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/extensions/window_controller.h" +#include <stddef.h> + #include "base/values.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/window_controller_list.h"
diff --git a/chrome/browser/extensions/window_controller.h b/chrome/browser/extensions/window_controller.h index 62d10786..2f0546c 100644 --- a/chrome/browser/extensions/window_controller.h +++ b/chrome/browser/extensions/window_controller.h
@@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_EXTENSIONS_WINDOW_CONTROLLER_H_ #define CHROME_BROWSER_EXTENSIONS_WINDOW_CONTROLLER_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/common/extensions/api/windows.h" class Browser; // TODO(stevenjb) eliminate this dependency.
diff --git a/chrome/browser/extensions/window_controller_list.h b/chrome/browser/extensions/window_controller_list.h index ddb78b47..755bcaf 100644 --- a/chrome/browser/extensions/window_controller_list.h +++ b/chrome/browser/extensions/window_controller_list.h
@@ -8,6 +8,7 @@ #include <list> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/observer_list.h" #include "chrome/browser/extensions/window_controller.h"
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index 6acc7bdf..a27ebb5 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc
@@ -2,10 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/command_line.h" #include "base/memory/scoped_vector.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/extensions/window_open_interactive_apitest.cc b/chrome/browser/extensions/window_open_interactive_apitest.cc index 912f1ab..bc3e1f96 100644 --- a/chrome/browser/extensions/window_open_interactive_apitest.cc +++ b/chrome/browser/extensions/window_open_interactive_apitest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/extensions/zipfile_installer.h b/chrome/browser/extensions/zipfile_installer.h index 7aa594c..8898908 100644 --- a/chrome/browser/extensions/zipfile_installer.h +++ b/chrome/browser/extensions/zipfile_installer.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/extensions/zipfile_installer_unittest.cc b/chrome/browser/extensions/zipfile_installer_unittest.cc index d4421e64..e0fa78e5 100644 --- a/chrome/browser/extensions/zipfile_installer_unittest.cc +++ b/chrome/browser/extensions/zipfile_installer_unittest.cc
@@ -12,6 +12,7 @@ #include "base/strings/string_util.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/extensions/zipfile_installer.h"
diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.h b/chrome/browser/ui/cocoa/accelerators_cocoa.h index d736814..ef63d51 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.h +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.h
@@ -11,6 +11,7 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "ui/base/accelerators/accelerator.h" namespace base {
diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/cocoa/accelerators_cocoa.mm index ee41e6e..9d08d37 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm
@@ -5,8 +5,10 @@ #include "chrome/browser/ui/cocoa/accelerators_cocoa.h" #import <Cocoa/Cocoa.h> +#include <stddef.h> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "chrome/app/chrome_command_ids.h" #import "ui/base/accelerators/platform_accelerator_cocoa.h"
diff --git a/chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm b/chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm index 596cb02..d500d9f 100644 --- a/chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm +++ b/chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm
@@ -4,9 +4,11 @@ #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" -#include "base/basictypes.h" +#include <stddef.h> + #include "base/bind.h" #include "base/mac/bundle_locations.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/scoped_observer.h"
diff --git a/chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm index d7120e8..1191d18 100644 --- a/chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm
@@ -4,6 +4,7 @@ #include "base/command_line.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/applescript/apple_event_util.mm b/chrome/browser/ui/cocoa/applescript/apple_event_util.mm index aa4ac44..f798950 100644 --- a/chrome/browser/ui/cocoa/applescript/apple_event_util.mm +++ b/chrome/browser/ui/cocoa/applescript/apple_event_util.mm
@@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/applescript/apple_event_util.h" #import <Carbon/Carbon.h> +#include <stddef.h> #include "base/logging.h" #include "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/applescript/apple_event_util_unittest.mm b/chrome/browser/ui/cocoa/applescript/apple_event_util_unittest.mm index 043cc308..7b962cc5 100644 --- a/chrome/browser/ui/cocoa/applescript/apple_event_util_unittest.mm +++ b/chrome/browser/ui/cocoa/applescript/apple_event_util_unittest.mm
@@ -5,10 +5,12 @@ #import "chrome/browser/ui/cocoa/applescript/apple_event_util.h" #include <CoreServices/CoreServices.h> +#include <stddef.h> +#include <stdint.h> -#include "base/basictypes.h" #include "base/json/json_reader.h" #include "base/mac/scoped_aedesc.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm index 55e6d82..a14dae5 100644 --- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm +++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
@@ -10,6 +10,7 @@ #import "base/mac/foundation_util.h" #import "base/mac/scoped_nsobject.h" #import "base/mac/scoped_objc_class_swizzler.h" +#include "base/macros.h" #include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/apps/app_browsertest_util.h"
diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm index 8f0bc4e..5d2afbe9 100644 --- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm +++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm
@@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/mac/scoped_cftyperef.h" +#include "base/macros.h" #include "base/run_loop.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"
diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h index 50c6150c..9b5a08e0 100644 --- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h +++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/web_contents_observer.h" #include "extensions/browser/app_window/app_window.h"
diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm index 2b647ba..a2fa0af 100644 --- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm +++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
@@ -11,6 +11,7 @@ #import "base/mac/scoped_cftyperef.h" #import "base/mac/scoped_nsobject.h" #import "base/mac/sdk_forward_declarations.h" +#include "base/macros.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h" #include "chrome/browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h"
diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm index d9040dc..d7aa404 100644 --- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm +++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm
@@ -6,6 +6,7 @@ #include "base/command_line.h" #import "base/mac/foundation_util.h" +#include "base/macros.h" #include "base/run_loop.h" #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/apps/app_browsertest_util.h"
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm index 692aaac..fc4f446 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm
@@ -4,6 +4,7 @@ #import "chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h" #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h b/chrome/browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h index 3e2a76a..027d2775 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h +++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_COCOA_AUTOFILL_AUTOFILL_DIALOG_VIEW_TESTER_COCOA_H_ #define CHROME_BROWSER_UI_COCOA_AUTOFILL_AUTOFILL_DIALOG_VIEW_TESTER_COCOA_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/ui/autofill/autofill_dialog_view_tester.h" @class AutofillDialogWindowController;
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.mm b/chrome/browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.mm index 950af84..7feb99f66 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.mm
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h" +#include <stddef.h> + #include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h" #import "chrome/browser/ui/cocoa/autofill/autofill_dialog_window_controller.h"
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_notification_container.mm b/chrome/browser/ui/cocoa/autofill/autofill_notification_container.mm index 66561b2c..0d7a651 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_notification_container.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_notification_container.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/autofill/autofill_notification_container.h" +#include <stddef.h> + #include "base/logging.h" #include "base/mac/scoped_nsobject.h" #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_pop_up_button_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_pop_up_button_unittest.mm index 04fd67eb..b63e9aa 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_pop_up_button_unittest.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_pop_up_button_unittest.mm
@@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/autofill/autofill_pop_up_button.h" #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h"
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h index 3cf9c36..314a6ab 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h +++ b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h
@@ -5,11 +5,13 @@ #ifndef CHROME_BROWSER_UI_COCOA_AUTOFILL_AUTOFILL_POPUP_VIEW_BRIDGE_H_ #define CHROME_BROWSER_UI_COCOA_AUTOFILL_AUTOFILL_POPUP_VIEW_BRIDGE_H_ +#include <stddef.h> + #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/ui/autofill/autofill_popup_view.h" #include "chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h"
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h index 6ddc713..4850667 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h +++ b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_AUTOFILL_AUTOFILL_POPUP_VIEW_COCOA_H_ #import <Cocoa/Cocoa.h> +#include <stddef.h> #import "chrome/browser/ui/cocoa/autofill/autofill_popup_base_view_cocoa.h"
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_section_container.mm b/chrome/browser/ui/cocoa/autofill/autofill_section_container.mm index 40584c3..cbd3bdf8 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_section_container.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_section_container.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/autofill/autofill_section_container.h" +#include <stddef.h> + #include <algorithm> #include "base/mac/foundation_util.h"
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_textfield_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_textfield_unittest.mm index 628c15d5..8fb537a 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_textfield_unittest.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_textfield_unittest.mm
@@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/autofill/autofill_textfield.h" #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest_mac.h"
diff --git a/chrome/browser/ui/cocoa/autofill/down_arrow_popup_menu_cell_unittest.mm b/chrome/browser/ui/cocoa/autofill/down_arrow_popup_menu_cell_unittest.mm index 02bb1e3..d3c72f8 100644 --- a/chrome/browser/ui/cocoa/autofill/down_arrow_popup_menu_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/autofill/down_arrow_popup_menu_cell_unittest.mm
@@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h"
diff --git a/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.h b/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.h index ebd3fafb..fa003f0 100644 --- a/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.h +++ b/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_UI_COCOA_AUTOFILL_NEW_CREDIT_CARD_BUBBLE_COCOA_H_ #define CHROME_BROWSER_UI_COCOA_AUTOFILL_NEW_CREDIT_CARD_BUBBLE_COCOA_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/autofill/new_credit_card_bubble_view.h"
diff --git a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_bridge.h b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_bridge.h index 829d8f3e..8ef800e 100644 --- a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_bridge.h +++ b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_bridge.h
@@ -7,9 +7,9 @@ #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/ui/autofill/password_generation_popup_view.h" @class PasswordGenerationPopupViewCocoa;
diff --git a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm index 2c5212c..99e84c9 100644 --- a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm
@@ -4,6 +4,7 @@ #import "chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
diff --git a/chrome/browser/ui/cocoa/autofill/simple_grid_layout.mm b/chrome/browser/ui/cocoa/autofill/simple_grid_layout.mm index 2694877..6333319c 100644 --- a/chrome/browser/ui/cocoa/autofill/simple_grid_layout.mm +++ b/chrome/browser/ui/cocoa/autofill/simple_grid_layout.mm
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/cocoa/autofill/simple_grid_layout.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h"
diff --git a/chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm index 91b83784..d64940f 100644 --- a/chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm
@@ -8,6 +8,7 @@ #import "base/mac/scoped_nsobject.h" #import "base/mac/scoped_objc_class_swizzler.h" #import "base/mac/sdk_forward_declarations.h" +#include "base/macros.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h index 09bcef9..a831ab3d 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h
@@ -11,8 +11,8 @@ #ifndef CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_BRIDGE_H_ #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_BRIDGE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "components/bookmarks/browser/bookmark_model_observer.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h index ec447cd..0fb924b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_ #import <Cocoa/Cocoa.h> +#include <stdint.h> #include <map> #import "base/mac/cocoa_protocols.h" @@ -185,8 +186,8 @@ // to represent the bookmark node they refer to. This map provides // a mapping from one to the other, so we can properly identify the // node from the item. When adding items in, we start with seedId_. - int32 seedId_; - std::map<int32,int64> menuTagMap_; + int32_t seedId_; + std::map<int32_t, int64_t> menuTagMap_; // Our bookmark buttons, ordered from L-->R. base::scoped_nsobject<NSMutableArray> buttons_; @@ -434,8 +435,8 @@ - (NSRect)frameForBookmarkButtonFromCell:(NSCell*)cell xOffset:(int*)xOffset; - (void)checkForBookmarkButtonGrowth:(NSButton*)button; - (void)frameDidChange; -- (int64)nodeIdFromMenuTag:(int32)tag; -- (int32)menuTagFromNodeId:(int64)menuid; +- (int64_t)nodeIdFromMenuTag:(int32_t)tag; +- (int32_t)menuTagFromNodeId:(int64_t)menuid; - (void)updateTheme:(const ui::ThemeProvider*)themeProvider; - (BookmarkButton*)buttonForDroppingOnAtPoint:(NSPoint)point; - (BOOL)isEventAnExitEvent:(NSEvent*)event;
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 04789bf..0d5f6502 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" +#include <stddef.h> + #include "base/mac/bundle_locations.h" #include "base/mac/sdk_forward_declarations.h" #include "base/metrics/histogram.h" @@ -1112,7 +1114,7 @@ } - (IBAction)openBookmarkMenuItem:(id)sender { - int64 tag = [self nodeIdFromMenuTag:[sender tag]]; + int64_t tag = [self nodeIdFromMenuTag:[sender tag]]; const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(bookmarkModel_, tag); WindowOpenDisposition disposition = @@ -1898,12 +1900,12 @@ } // Given a NSMenuItem tag, return the appropriate bookmark node id. -- (int64)nodeIdFromMenuTag:(int32)tag { +- (int64_t)nodeIdFromMenuTag:(int32_t)tag { return menuTagMap_[tag]; } // Create and return a new tag for the given node id. -- (int32)menuTagFromNodeId:(int64)menuid { +- (int32_t)menuTagFromNodeId:(int64_t)menuid { int tag = seedId_++; menuTagMap_[tag] = menuid; return tag;
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm index d1b3804..a90c7160 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -3,11 +3,13 @@ // found in the LICENSE file. #import <Cocoa/Cocoa.h> +#include <stddef.h> +#include <stdint.h> -#include "base/basictypes.h" #include "base/command_line.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" @@ -666,8 +668,8 @@ } TEST_F(BookmarkBarControllerTest, TagMap) { - int64 ids[] = { 1, 3, 4, 40, 400, 4000, 800000000, 2, 123456789 }; - std::vector<int32> tags; + int64_t ids[] = {1, 3, 4, 40, 400, 4000, 800000000, 2, 123456789}; + std::vector<int32_t> tags; // Generate some tags for (unsigned int i = 0; i < arraysize(ids); i++) { @@ -705,7 +707,7 @@ item = [menu itemWithTitle:@"small"]; EXPECT_TRUE(item); if (item) { - int64 tag = [bar_ nodeIdFromMenuTag:[item tag]]; + int64_t tag = [bar_ nodeIdFromMenuTag:[item tag]]; const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(model, tag); EXPECT_TRUE(node); EXPECT_EQ(gurl, node->url());
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm index 287434a73..f0b85f5 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" +#include <stddef.h> + #include "base/mac/bundle_locations.h" #include "base/strings/sys_string_conversions.h" #import "chrome/browser/bookmarks/bookmark_model_factory.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm index 078e7bf4..e516532 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/mac/scoped_nsobject.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm index ee9e0a7..cf4f54a 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
@@ -4,8 +4,8 @@ #import <Cocoa/Cocoa.h> -#include "base/basictypes.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_observer_cocoa.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_observer_cocoa.h index 26ada2d..b494397 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_observer_cocoa.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_observer_cocoa.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BUBBLE_OBSERVER_COCOA_H_ #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BUBBLE_OBSERVER_COCOA_H_ +#include "base/macros.h" #include "chrome/browser/ui/bookmarks/bookmark_bubble_observer.h" #import "base/mac/scoped_nsobject.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h index d3b6a16e..4efe37c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h
@@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> -#include "base/basictypes.h" #include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm index 20362be..708e470 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm
@@ -6,6 +6,7 @@ #include <vector> +#include "base/macros.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h index a0d1d47..bf79c3f 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h
@@ -23,8 +23,8 @@ #include <set> -#include "base/basictypes.h" #include "base/mac/scoped_block.h" +#include "base/macros.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_model_observer.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm index 1745013..beff947 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm
@@ -3,6 +3,7 @@ // found in the LICENSE file. #import <Cocoa/Cocoa.h> +#include <stddef.h> #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm index 7ab9686..c26ebd8 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
@@ -4,8 +4,11 @@ #import "chrome/browser/ui/cocoa/browser_window_controller.h" +#include <stddef.h> #import "base/mac/mac_util.h" + #include "base/mac/sdk_forward_declarations.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/ui/cocoa/browser_window_factory_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_factory_cocoa.mm index aa8a77a..808cc18 100644 --- a/chrome/browser/ui/cocoa/browser_window_factory_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_factory_cocoa.mm
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/cocoa/browser_window_controller.h"
diff --git a/chrome/browser/ui/cocoa/browser_window_fullscreen_transition.mm b/chrome/browser/ui/cocoa/browser_window_fullscreen_transition.mm index 3b8b6312..83ce249 100644 --- a/chrome/browser/ui/cocoa/browser_window_fullscreen_transition.mm +++ b/chrome/browser/ui/cocoa/browser_window_fullscreen_transition.mm
@@ -10,6 +10,7 @@ #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" #import "base/mac/sdk_forward_declarations.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/framed_browser_window.h" #import "chrome/browser/ui/cocoa/tabs/tab_strip_background_view.h"
diff --git a/chrome/browser/ui/cocoa/browser_window_layout_unittest.mm b/chrome/browser/ui/cocoa/browser_window_layout_unittest.mm index a67c4db..8389fc8 100644 --- a/chrome/browser/ui/cocoa/browser_window_layout_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_layout_unittest.mm
@@ -5,6 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #import "chrome/browser/ui/cocoa/browser_window_layout.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h"
diff --git a/chrome/browser/ui/cocoa/bubble_sync_promo_controller.mm b/chrome/browser/ui/cocoa/bubble_sync_promo_controller.mm index 8e87c845..adf2a6f 100644 --- a/chrome/browser/ui/cocoa/bubble_sync_promo_controller.mm +++ b/chrome/browser/ui/cocoa/bubble_sync_promo_controller.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/bubble_sync_promo_controller.h" +#include <stddef.h> + #include "base/strings/sys_string_conversions.h" #include "chrome/browser/signin/signin_promo.h" #include "chrome/browser/ui/chrome_pages.h"
diff --git a/chrome/browser/ui/cocoa/certificate_viewer_mac.mm b/chrome/browser/ui/cocoa/certificate_viewer_mac.mm index e562222..5c41b94f 100644 --- a/chrome/browser/ui/cocoa/certificate_viewer_mac.mm +++ b/chrome/browser/ui/cocoa/certificate_viewer_mac.mm
@@ -10,6 +10,7 @@ #include "base/mac/foundation_util.h" #include "base/mac/scoped_cftyperef.h" +#include "base/macros.h" #include "chrome/browser/certificate_viewer.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h"
diff --git a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm index 220299f..0ce4df8d 100644 --- a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm +++ b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm
@@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_web_dialog_sheet.h"
diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm index efa051f..05038cf 100644 --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm
@@ -4,6 +4,9 @@ #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h" +#include <stddef.h> + +#include "base/macros.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h" #import "testing/gtest_mac.h"
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h index 8fd3c525..e895491e 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
@@ -5,6 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/browsing_data/cookies_tree_model.h" #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm index 9448bf7..7f0d845 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" +#include <stddef.h> + #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h index 701787e..03ce3e4 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h
@@ -6,6 +6,7 @@ #import <Cocoa/Cocoa.h> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/base_bubble_controller.h" #include "content/public/common/media_stream_request.h"
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm index 53b04b61..e3baead 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
@@ -4,8 +4,11 @@ #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm index 7e79313..c4db6b17 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm
@@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> #include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" + #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/parsed_cookie.h" @@ -59,7 +61,7 @@ GURL origin("http://chromium.org"); std::string database_name("sassolungo"); std::string description("a great place to climb"); - int64 size = 1234; + int64_t size = 1234; base::Time last_modified = base::Time::Now(); BrowsingDataDatabaseHelper::DatabaseInfo info( storage::DatabaseIdentifier::CreateFromOrigin(origin), @@ -89,7 +91,7 @@ TEST_F(CookiesDetailsTest, CreateForTreeLocalStorage) { base::scoped_nsobject<CocoaCookieDetails> details; const GURL kOrigin("http://chromium.org/"); - int64 size = 1234; + int64_t size = 1234; base::Time last_modified = base::Time::Now(); BrowsingDataLocalStorageHelper::LocalStorageInfo info( kOrigin, size, last_modified); @@ -147,7 +149,7 @@ base::scoped_nsobject<CocoaCookieDetails> details; GURL origin("http://moose.org/"); - int64 size = 1234; + int64_t size = 1234; base::Time last_modified = base::Time::Now(); content::IndexedDBInfo info(origin, size, @@ -285,7 +287,7 @@ base::scoped_nsobject<CocoaCookieDetails> details; GURL origin("https://example.com/"); - int64 size = 1234; + int64_t size = 1234; base::Time last_modified = base::Time::Now(); content::CacheStorageUsageInfo info(origin, size, last_modified);
diff --git a/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm b/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm index e6602e96..00535e9 100644 --- a/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm
@@ -4,6 +4,7 @@ #import "chrome/browser/ui/cocoa/dev_tools_controller.h" +#include "base/macros.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/devtools/devtools_window_testing.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/cocoa/dock_icon.mm b/chrome/browser/ui/cocoa/dock_icon.mm index 7b38acb4..6ccd62c 100644 --- a/chrome/browser/ui/cocoa/dock_icon.mm +++ b/chrome/browser/ui/cocoa/dock_icon.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/dock_icon.h" +#include <stdint.h> + #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/scoped_nsobject.h" @@ -21,7 +23,7 @@ const float kBadgeIndent = 5.0f; // The maximum update rate for the dock icon. 200ms = 5fps. -const int64 kUpdateFrequencyMs = 200; +const int64_t kUpdateFrequencyMs = 200; } // namespace
diff --git a/chrome/browser/ui/cocoa/download/download_item_cell_unittest.mm b/chrome/browser/ui/cocoa/download/download_item_cell_unittest.mm index a51b6eef..ac8201aa 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/download/download_item_cell_unittest.mm
@@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/download/download_item_cell.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/download/download_item_model.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "content/public/test/mock_download_item.h"
diff --git a/chrome/browser/ui/cocoa/download/download_item_mac.h b/chrome/browser/ui/cocoa/download/download_item_mac.h index a6e430d..3ab544e 100644 --- a/chrome/browser/ui/cocoa/download/download_item_mac.h +++ b/chrome/browser/ui/cocoa/download/download_item_mac.h
@@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> +#include "base/macros.h" #include "base/task/cancelable_task_tracker.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/icon_manager.h"
diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm index fafbb78..617b58c 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" +#include <stddef.h> + #include "base/mac/bundle_locations.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/download/download_stats.h"
diff --git a/chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h b/chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h index 82ed351d..84f0fad 100644 --- a/chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h +++ b/chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_COCOA_ENCODING_MENU_CONTROLLER_DELEGATE_MAC_H_ #define CHROME_BROWSER_UI_COCOA_ENCODING_MENU_CONTROLLER_DELEGATE_MAC_H_ -#include "base/basictypes.h" // For DISALLOW_IMPLICIT_CONSTRUCTORS +#include "base/macros.h" @class NSMenu; class Profile;
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm index cd374308..edb52129 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
@@ -8,6 +8,7 @@ #include <cmath> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm index c01b1621..b320419 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm
@@ -4,6 +4,7 @@ #import <Cocoa/Cocoa.h> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm index 322fbf6..cde8d81b 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm
@@ -4,8 +4,11 @@ #include "chrome/browser/extensions/browser_action_test_util.h" +#include <stddef.h> + #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm index 26ed2eb..c2429c41 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm
@@ -6,7 +6,6 @@ #include <algorithm> -#include "base/basictypes.h" #import "chrome/browser/ui/cocoa/view_id_util.h" #include "grit/theme_resources.h" #include "ui/base/cocoa/appkit_utils.h"
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm index 18e0f92..773c3c8 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm index f9a32af..71d31d7 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
@@ -4,8 +4,11 @@ #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" +#include <stddef.h> + #include <string> +#include "base/macros.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/extensions/extension_message_bubble_controller.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/cocoa/extensions/bundle_util.mm b/chrome/browser/ui/cocoa/extensions/bundle_util.mm index 0315a9d..364310b 100644 --- a/chrome/browser/ui/cocoa/extensions/bundle_util.mm +++ b/chrome/browser/ui/cocoa/extensions/bundle_util.mm
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/cocoa/extensions/bundle_util.h" +#include <stddef.h> + #include "base/mac/mac_util.h" #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.h b/chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.h index 0f87210c..c82beba 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.h +++ b/chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.h
@@ -7,6 +7,7 @@ #import <Foundation/Foundation.h> +#include "base/macros.h" #include "chrome/browser/ui/extensions/extension_action_platform_delegate.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm index 1f84175..58075eb 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h" +#include <stddef.h> + #include "base/auto_reset.h" #include "base/i18n/rtl.h" #include "base/mac/bundle_locations.h"
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm index cee5e9e..537389ed 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
@@ -4,7 +4,10 @@ #import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h" +#include <stddef.h> + #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm index 75629f5a..3bb9fa6 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
@@ -3,11 +3,12 @@ // found in the LICENSE file. #import <Cocoa/Cocoa.h> +#include <stddef.h> -#include "base/basictypes.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/values.h"
diff --git a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h index e30bf2e..0f28a3b 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h +++ b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h
@@ -8,6 +8,7 @@ #include <string> #include <utility> +#include "base/macros.h" #include "chrome/browser/extensions/extension_keybinding_registry.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator_manager.h"
diff --git a/chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm b/chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm index d4e4fd7..66ff65cb 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm
@@ -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 "base/macros.h" #include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm index 570855f..d38805a 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
@@ -7,6 +7,7 @@ #include <algorithm> #include "base/callback.h" +#include "base/macros.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/extension_view_host.h" #include "chrome/browser/extensions/extension_view_host_factory.h"
diff --git a/chrome/browser/ui/cocoa/extensions/extension_view_mac.h b/chrome/browser/ui/cocoa/extensions/extension_view_mac.h index e74135a..36cbd8c6 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_view_mac.h +++ b/chrome/browser/ui/cocoa/extensions/extension_view_mac.h
@@ -7,7 +7,7 @@ #include <ApplicationServices/ApplicationServices.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/extensions/extension_view.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/geometry/size.h"
diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h index 3fe80cc..42252af9 100644 --- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h +++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h
@@ -8,6 +8,7 @@ #import <Cocoa/Cocoa.h> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "chrome/browser/media_galleries/media_galleries_dialog_controller.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" #import "chrome/browser/ui/cocoa/extensions/media_gallery_list_entry_view.h"
diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm index 976d672..5dd8949 100644 --- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h" +#include <stddef.h> + #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/chrome_style.h"
diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm index 0621695..d90de4d 100644 --- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm
@@ -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 "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock.h"
diff --git a/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm b/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm index 4f9a443..fc449e2c 100644 --- a/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.mm
@@ -5,6 +5,7 @@ #include "base/logging.h" #import "base/mac/foundation_util.h" #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h"
diff --git a/chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h b/chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h index 4e828cf..c7ea9824 100644 --- a/chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h +++ b/chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h
@@ -9,6 +9,7 @@ #include "base/gtest_prod_util.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/extensions/extension_install_prompt.h" class ExtensionInstallPromptShowParams;
diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h index 80299a6..de7358a 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h
@@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "chrome/browser/ui/find_bar/find_bar.h" class Browser;
diff --git a/chrome/browser/ui/cocoa/framed_browser_window.mm b/chrome/browser/ui/cocoa/framed_browser_window.mm index 1ec0904..898b419 100644 --- a/chrome/browser/ui/cocoa/framed_browser_window.mm +++ b/chrome/browser/ui/cocoa/framed_browser_window.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/framed_browser_window.h" +#include <stddef.h> + #include "base/logging.h" #include "base/mac/sdk_forward_declarations.h" #include "chrome/browser/global_keyboard_shortcuts_mac.h"
diff --git a/chrome/browser/ui/cocoa/handoff_active_url_observer.h b/chrome/browser/ui/cocoa/handoff_active_url_observer.h index d866d46..b78207d 100644 --- a/chrome/browser/ui/cocoa/handoff_active_url_observer.h +++ b/chrome/browser/ui/cocoa/handoff_active_url_observer.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_COCOA_HANDOFF_ACTIVE_URL_OBSERVER_H_ #define CHROME_BROWSER_UI_COCOA_HANDOFF_ACTIVE_URL_OBSERVER_H_ +#include "base/macros.h" #include "chrome/browser/ui/browser_list_observer.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.h b/chrome/browser/ui/cocoa/history_menu_bridge.h index 5a3bc576..fa71b371 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.h +++ b/chrome/browser/ui/cocoa/history_menu_bridge.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/scoped_observer.h" #include "base/task/cancelable_task_tracker.h"
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index 3f2d31f6..187d0c80c 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/cocoa/history_menu_bridge.h" +#include <stddef.h> + #include "base/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm index 7b5d14e8..b8f948a 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
@@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/mac/bundle_locations.h" +#include "base/macros.h" #include "base/process/process.h" #include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h"
diff --git a/chrome/browser/ui/cocoa/info_bubble_window.mm b/chrome/browser/ui/cocoa/info_bubble_window.mm index 1fa2247..02945546 100644 --- a/chrome/browser/ui/cocoa/info_bubble_window.mm +++ b/chrome/browser/ui/cocoa/info_bubble_window.mm
@@ -6,9 +6,9 @@ #include <Carbon/Carbon.h> -#include "base/basictypes.h" #include "base/logging.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/chrome_notification_types.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm index 32ae261..8e614fef 100644 --- a/chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.h" +#include <stddef.h> + #include "base/logging.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
diff --git a/chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.mm index 11317bc..76873f0 100644 --- a/chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.mm
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.h" +#include <stddef.h> + #include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/infobars/infobar_utilities.h" #include "grit/components_strings.h"
diff --git a/chrome/browser/ui/cocoa/infobars/infobar_cocoa.h b/chrome/browser/ui/cocoa/infobars/infobar_cocoa.h index 8de4841b..3fd58a2 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_cocoa.h +++ b/chrome/browser/ui/cocoa/infobars/infobar_cocoa.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_COCOA_H_ #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "components/infobars/core/infobar.h"
diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h b/chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h index 50d3633f..c159c819 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h +++ b/chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_CONTAINER_COCOA_H_ #define CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_CONTAINER_COCOA_H_ +#include <stddef.h> + +#include "base/macros.h" #include "chrome/browser/ui/infobar_container_delegate.h" @class InfoBarContainerController;
diff --git a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h index 11f92462..63c859d 100644 --- a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h +++ b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_COCOA_INFOBARS_MOCK_CONFIRM_INFOBAR_DELEGATE_H_ #define CHROME_BROWSER_UI_COCOA_INFOBARS_MOCK_CONFIRM_INFOBAR_DELEGATE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "components/infobars/core/confirm_infobar_delegate.h"
diff --git a/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm b/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm index bcf6d72c..14fce732f 100644 --- a/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm +++ b/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/infobars/translate_infobar_base.h" +#include <stddef.h> + #include "base/logging.h" #include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm b/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm index 3d78553c..aef043b 100644 --- a/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm +++ b/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm
@@ -3,8 +3,10 @@ // found in the LICENSE file. #import <Cocoa/Cocoa.h> +#include <stddef.h> #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #import "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/infobars/infobar_service.h"
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h index 9a0dd56..d32c5404 100644 --- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h +++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
@@ -7,6 +7,7 @@ #include "base/logging.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/app_modal/native_app_modal_dialog.h"
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm index bba61e6..fa6d65f9 100644 --- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
@@ -5,10 +5,12 @@ #include "chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h" #import <Cocoa/Cocoa.h> +#include <stddef.h> #include "base/i18n/rtl.h" #include "base/logging.h" #import "base/mac/foundation_util.h" +#include "base/macros.h" #include "base/strings/sys_string_conversions.h" #import "chrome/browser/chrome_browser_application_mac.h" #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h"
diff --git a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm index 24f345a0..0127678 100644 --- a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm +++ b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/ui/cocoa/l10n_util.h b/chrome/browser/ui/cocoa/l10n_util.h index c49d1930..64a70e7 100644 --- a/chrome/browser/ui/cocoa/l10n_util.h +++ b/chrome/browser/ui/cocoa/l10n_util.h
@@ -3,6 +3,7 @@ // found in the LICENSE file. #import <Cocoa/Cocoa.h> +#include <stddef.h> #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm index 5068f0c..01d8b200 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" +#include <stddef.h> + #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_logging.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h b/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h index 25b5bd8..8ac7e60 100644 --- a/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h
@@ -9,6 +9,7 @@ #include "base/gtest_prod_util.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h" #import "ui/base/cocoa/appkit_utils.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h index c6c692d..417e4d82 100644 --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_CONTENT_SETTING_DECORATION_H_ #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_CONTENT_SETTING_DECORATION_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/location_bar/image_decoration.h" #include "components/content_settings/core/common/content_settings_types.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h index 36a9a74..ce43dbe 100644 --- a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h
@@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> +#include "base/macros.h" #include "chrome/browser/ui/cocoa/location_bar/bubble_decoration.h" // Draws the "Extended Validation SSL" bubble. This will be a lock
diff --git a/chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h b/chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h index ef9cf95a..da6e6fd 100644 --- a/chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h
@@ -7,7 +7,7 @@ #import <Cocoa/Cocoa.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/ui/cocoa/location_bar/image_decoration.h" class LocationBarViewMac;
diff --git a/chrome/browser/ui/cocoa/location_bar/image_decoration.h b/chrome/browser/ui/cocoa/location_bar/image_decoration.h index 8f540f9d..13482cf9 100644 --- a/chrome/browser/ui/cocoa/location_bar/image_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/image_decoration.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_IMAGE_DECORATION_H_ #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h" // |LocationBarDecoration| which sizes and draws itself according to
diff --git a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h index 4d0d23a..543549b 100644 --- a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h
@@ -10,6 +10,7 @@ #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h" #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/string16.h" // Draws the keyword hint, "Press [tab] to search <site>".
diff --git a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm index 705d8ac..9d44e61 100644 --- a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <cmath> #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h b/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h index c930022..dd405a88 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h
@@ -7,7 +7,7 @@ #import <Cocoa/Cocoa.h> -#import "base/basictypes.h" +#include "base/macros.h" // Base class for decorations at the left and right of the location // bar. For instance, the location icon.
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h index 1a19548..435d0520 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
@@ -8,7 +8,9 @@ #include <string> #import <Cocoa/Cocoa.h> +#include <stddef.h> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h index 5e9e55e..7630f2c 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h
@@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> +#include "base/macros.h" #include "chrome/browser/ui/cocoa/location_bar/image_decoration.h" class LocationBarViewMac;
diff --git a/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h b/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h index e43b6df9..4fe37f8 100644 --- a/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h
@@ -8,6 +8,7 @@ #import <Cocoa/Cocoa.h> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/cocoa/location_bar/image_decoration.h" #include "chrome/browser/ui/passwords/manage_passwords_icon.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h index 3bb5e18..32885ec8 100644 --- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PAGE_ACTION_DECORATION_H_ #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PAGE_ACTION_DECORATION_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #import "chrome/browser/ui/cocoa/location_bar/image_decoration.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h index da4f9a02..1c2a0f00 100644 --- a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h
@@ -10,6 +10,7 @@ #import <Cocoa/Cocoa.h> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/ui/cocoa/location_bar/bubble_decoration.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/star_decoration.h b/chrome/browser/ui/cocoa/location_bar/star_decoration.h index 20a0741..b862ac7 100644 --- a/chrome/browser/ui/cocoa/location_bar/star_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/star_decoration.h
@@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> +#include "base/macros.h" #include "chrome/browser/ui/cocoa/location_bar/image_decoration.h" class CommandUpdater;
diff --git a/chrome/browser/ui/cocoa/location_bar/translate_decoration.h b/chrome/browser/ui/cocoa/location_bar/translate_decoration.h index 1d7f484..e6114731 100644 --- a/chrome/browser/ui/cocoa/location_bar/translate_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/translate_decoration.h
@@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> +#include "base/macros.h" #include "chrome/browser/ui/cocoa/location_bar/image_decoration.h" class CommandUpdater;
diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h index d8b540fc..5b5d5ac 100644 --- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h
@@ -7,7 +7,7 @@ #import <Cocoa/Cocoa.h> -#include "base/basictypes.h" +#include "base/macros.h" #import "chrome/browser/ui/cocoa/browser/zoom_bubble_controller.h" #include "chrome/browser/ui/cocoa/location_bar/image_decoration.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm index 4261962..69cde08 100644 --- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm +++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm
@@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" #include "base/auto_reset.h" +#include "base/macros.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/browser/zoom_bubble_controller.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm index 77d72da..1316ad6 100644 --- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm
@@ -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 "base/macros.h" #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "components/ui/zoom/zoom_controller.h"
diff --git a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm index 549c11a..2c24253b 100644 --- a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm +++ b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm
@@ -6,6 +6,7 @@ #include "base/mac/bundle_locations.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h index d8151aa..8b4b8f01 100644 --- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h +++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_BRIDGE_H_ #define CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_BRIDGE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/media/desktop_media_list_observer.h" // Protocol corresponding to |DesktopMediaListObserver|.
diff --git a/chrome/browser/ui/cocoa/multi_key_equivalent_button.mm b/chrome/browser/ui/cocoa/multi_key_equivalent_button.mm index cfe0a692..b1e9536 100644 --- a/chrome/browser/ui/cocoa/multi_key_equivalent_button.mm +++ b/chrome/browser/ui/cocoa/multi_key_equivalent_button.mm
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h" @implementation MultiKeyEquivalentButton
diff --git a/chrome/browser/ui/cocoa/native_window_tracker_cocoa.h b/chrome/browser/ui/cocoa/native_window_tracker_cocoa.h index 7704adc..622b267 100644 --- a/chrome/browser/ui/cocoa/native_window_tracker_cocoa.h +++ b/chrome/browser/ui/cocoa/native_window_tracker_cocoa.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_NATIVE_WINDOW_TRACKER_COCOA_H_ #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/ui/native_window_tracker.h" @class BridgedNativeWindowTracker;
diff --git a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h index 3b5fa07..f28262f 100644 --- a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h +++ b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h
@@ -7,8 +7,8 @@ #import <AppKit/AppKit.h> -#include "base/basictypes.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_member.h"
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm index 5f99177..6c69364 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h" +#include <stddef.h> + #include <algorithm> #include <cmath>
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm index ed1967c..000990d 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm
@@ -4,8 +4,11 @@ #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h" +#include <stddef.h> + #include "base/json/json_reader.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h index cfe5c4d7..920c8cfc 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_MATRIX_H_ #import <Cocoa/Cocoa.h> +#include <stddef.h> #import "ui/base/cocoa/tracking_area.h" #include "ui/base/window_open_disposition.h"
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm index be2e19a..7ccef29 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm
@@ -5,6 +5,9 @@ #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h" #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h" +#include <stddef.h> + +#include "base/macros.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "ui/events/test/cocoa_test_event_utils.h"
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_separator_view_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_separator_view_unittest.mm index 85149a35..3040495b 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_separator_view_unittest.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_separator_view_unittest.mm
@@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_separator_view.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" class OmniboxPopupBottomSeparatorViewTest : public CocoaTest {
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h index 188c70e..a98a2d9 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h
@@ -6,9 +6,10 @@ #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_POPUP_VIEW_MAC_H_ #import <Cocoa/Cocoa.h> +#include <stddef.h> -#include "base/basictypes.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h" #include "components/omnibox/browser/autocomplete_match.h"
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm index 5bc6be2..f488072d 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm
@@ -4,6 +4,9 @@ #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h index 4ebedbbc..e05a9a3 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h
@@ -6,7 +6,9 @@ #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_ #import <Cocoa/Cocoa.h> +#include <stddef.h> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm index 298dc4f..0584051 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm
@@ -4,6 +4,9 @@ #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" +#include <stddef.h> + +#include "base/macros.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #include "chrome/browser/ui/omnibox/chrome_omnibox_client.h" #include "chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h"
diff --git a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm index 5976a85d..46a49cf 100644 --- a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm
@@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h" #include "base/mac/foundation_util.h" +#include "base/macros.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
diff --git a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm index 5c2936f..122ab79 100644 --- a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
diff --git a/chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm b/chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm index 32cad33..d6eed99 100644 --- a/chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm
@@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h" #include "base/mac/foundation_util.h" +#include "base/macros.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #import "chrome/browser/ui/cocoa/one_click_signin_view_controller.h"
diff --git a/chrome/browser/ui/cocoa/panels/display_settings_provider_cocoa.mm b/chrome/browser/ui/cocoa/panels/display_settings_provider_cocoa.mm index ecc2ff05..818f312 100644 --- a/chrome/browser/ui/cocoa/panels/display_settings_provider_cocoa.mm +++ b/chrome/browser/ui/cocoa/panels/display_settings_provider_cocoa.mm
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #import "chrome/browser/app_controller_mac.h"
diff --git a/chrome/browser/ui/cocoa/panels/panel_cocoa.h b/chrome/browser/ui/cocoa/panels/panel_cocoa.h index 3b0556f..7d24746 100644 --- a/chrome/browser/ui/cocoa/panels/panel_cocoa.h +++ b/chrome/browser/ui/cocoa/panels/panel_cocoa.h
@@ -7,6 +7,7 @@ #import <Foundation/Foundation.h> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/panels/native_panel.h" #include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h b/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h index f93b79b..7a642e0 100644 --- a/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h +++ b/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h
@@ -10,8 +10,8 @@ #include <list> #include <map> -#include "base/basictypes.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/panels/native_panel_stack_window.h" #include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/ui/cocoa/passwords/credentials_selection_view.mm b/chrome/browser/ui/cocoa/passwords/credentials_selection_view.mm index cf408a41..ee2669af 100644 --- a/chrome/browser/ui/cocoa/passwords/credentials_selection_view.mm +++ b/chrome/browser/ui/cocoa/passwords/credentials_selection_view.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/passwords/credentials_selection_view.h" +#include <stddef.h> + #include "chrome/browser/ui/chrome_style.h" #import "chrome/browser/ui/cocoa/bubble_combobox.h" #import "chrome/browser/ui/cocoa/passwords/passwords_bubble_utils.h"
diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_view_controller_unittest.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_view_controller_unittest.mm index 2689adb..74219fc 100644 --- a/chrome/browser/ui/cocoa/passwords/manage_passwords_view_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_view_controller_unittest.mm
@@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/passwords/manage_passwords_view_controller.h" #include "base/mac/foundation_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/cocoa/passwords/base_passwords_controller_test.h"
diff --git a/chrome/browser/ui/cocoa/passwords/passwords_list_view_controller_unittest.mm b/chrome/browser/ui/cocoa/passwords/passwords_list_view_controller_unittest.mm index e096537..0832ab9d 100644 --- a/chrome/browser/ui/cocoa/passwords/passwords_list_view_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/passwords/passwords_list_view_controller_unittest.mm
@@ -6,6 +6,7 @@ #include "base/mac/foundation_util.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/password_manager/password_store_factory.h"
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm index 24a969d..4489901 100644 --- a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm +++ b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm
@@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h" #include "base/mac/foundation_util.h" +#include "base/macros.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h"
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_icon_controller.mm b/chrome/browser/ui/cocoa/profiles/avatar_icon_controller.mm index 6b8dbb8..120abec 100644 --- a/chrome/browser/ui/cocoa/profiles/avatar_icon_controller.mm +++ b/chrome/browser/ui/cocoa/profiles/avatar_icon_controller.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h" +#include <stddef.h> + #include "base/mac/foundation_util.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h b/chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h index ee4ae5e..16a5039 100644 --- a/chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h +++ b/chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_PROFILES_AVATAR_MENU_BUBBLE_CONTROLLER_H_ #import <Cocoa/Cocoa.h> +#include <stddef.h> #include "base/mac/objc_property_releaser.h" #include "base/mac/scoped_nsobject.h"
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm index ce8d3cb3..a8ad3a2 100644 --- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm +++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
@@ -6,8 +6,10 @@ #import <Carbon/Carbon.h> // kVK_Return. #import <Cocoa/Cocoa.h> +#include <stddef.h> #include "base/mac/bundle_locations.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm index 7520220f..9995ba92 100644 --- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
@@ -7,6 +7,7 @@ #include "base/command_line.h" #import "base/mac/foundation_util.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm index 5ee576fe..b40a221d 100644 --- a/chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm +++ b/chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/profiles/profile_menu_controller.h" +#include <stddef.h> + #include "base/mac/scoped_nsobject.h" #include "base/metrics/histogram_macros.h" #include "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm index 71ef63e..25e6e64 100644 --- a/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/profiles/profile_menu_controller.h" +#include <stddef.h> + #include "base/mac/scoped_nsobject.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_cocoa.h b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_cocoa.h index 47160ae..6f27470 100644 --- a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_cocoa.h +++ b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_cocoa.h
@@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
diff --git a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm index faf59b4..7c5e8a9 100644 --- a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm +++ b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm
@@ -4,6 +4,8 @@ #import "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.h" +#include <stddef.h> + #include <algorithm> #include <cmath>
diff --git a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm index 9fe87623..d90788a 100644 --- a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm
@@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/cocoa/profiles/user_manager_mac.h b/chrome/browser/ui/cocoa/profiles/user_manager_mac.h index 662cd4c..dd1c1c6c 100644 --- a/chrome/browser/ui/cocoa/profiles/user_manager_mac.h +++ b/chrome/browser/ui/cocoa/profiles/user_manager_mac.h
@@ -8,6 +8,7 @@ #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_window.h"
diff --git a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm index aa80c6eb..48a02249 100644 --- a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm +++ b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/cocoa/profiles/user_manager_mac.h" #include "base/mac/foundation_util.h" +#include "base/macros.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm b/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm index e4769a1..eb88416 100644 --- a/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/cocoa/profiles/user_manager_mac.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "chrome/browser/profiles/profile_window.h"
diff --git a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h index 0709cf2a..82dd4ce1 100644 --- a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h +++ b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h
@@ -8,6 +8,7 @@ #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" @class MenuController;
diff --git a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm index 34ccbf69..26ceb2f 100644 --- a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm +++ b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm
@@ -6,6 +6,7 @@ #include "base/compiler_specific.h" #import "base/mac/scoped_sending_event.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/sys_string_conversions.h" #include "base/tracked_objects.h"
diff --git a/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.h b/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.h index 617f4777..62b10a4 100644 --- a/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.h +++ b/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.h
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/ui/screen_capture_notification_ui.h"
diff --git a/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa_unittest.mm b/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa_unittest.mm index e7da2c4..d471c054 100644 --- a/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa_unittest.mm
@@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.h" #include "base/bind.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
diff --git a/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.h b/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.h index c79aca94c..49df0d0 100644 --- a/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.h +++ b/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_SINGLE_WEB_CONTENTS_DIALOG_MANAGER_COCOA_H_ #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "components/web_modal/single_web_contents_dialog_manager.h" class ConstrainedWindowMac;
diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm index 6e2703d..82c5a329 100644 --- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm +++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
@@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h" #import <SecurityInterface/SFChooseIdentityPanel.h> +#include <stddef.h> #include "base/logging.h" #include "base/mac/foundation_util.h"
diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.h b/chrome/browser/ui/cocoa/status_bubble_mac.h index 8911eae..e9d7457 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac.h +++ b/chrome/browser/ui/cocoa/status_bubble_mac.h
@@ -9,8 +9,10 @@ #import <Cocoa/Cocoa.h> #import <QuartzCore/QuartzCore.h> +#include <stdint.h> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/ui/status_bubble.h" @@ -105,7 +107,7 @@ // TimerFired must be called from one of these states. StartTimer may be // called while the timer is still running; in that case, the timer will be // reset. CancelTimer may be called from any state. - void StartTimer(int64 time_ms); + void StartTimer(int64_t time_ms); void CancelTimer(); void TimerFired();
diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.mm b/chrome/browser/ui/cocoa/status_bubble_mac.mm index dfa18af..503a070 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac.mm +++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm
@@ -46,8 +46,8 @@ const CGFloat kBubbleOpacity = 1.0; // Delay before showing or hiding the bubble after a SetStatus or SetURL call. -const int64 kShowDelayMS = 80; -const int64 kHideDelayMS = 250; +const int64_t kShowDelayMS = 80; +const int64_t kHideDelayMS = 250; // How long each fade should last. const NSTimeInterval kShowFadeInDurationSeconds = 0.120; @@ -595,7 +595,7 @@ }]; } -void StatusBubbleMac::StartTimer(int64 delay_ms) { +void StatusBubbleMac::StartTimer(int64_t delay_ms) { DCHECK([NSThread isMainThread]); DCHECK(state_ == kBubbleShowingTimer || state_ == kBubbleHidingTimer);
diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h index e9ff3bc..19be8217 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h +++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
@@ -10,6 +10,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/status_icons/desktop_notification_balloon.h" #include "chrome/browser/status_icons/status_icon.h"
diff --git a/chrome/browser/ui/cocoa/status_icons/status_tray_mac.h b/chrome/browser/ui/cocoa/status_icons/status_tray_mac.h index 3f621557..0b61797c 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_tray_mac.h +++ b/chrome/browser/ui/cocoa/status_icons/status_tray_mac.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_TRAY_MAC_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/status_icons/status_tray.h" class StatusTrayMac : public StatusTray {
diff --git a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h index ba8f7cf..ed7550b 100644 --- a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h +++ b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
@@ -7,7 +7,7 @@ #if defined(__OBJC__) -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/renderer_context_menu/context_menu_delegate.h" #include "content/public/browser/web_contents_view_delegate.h"
diff --git a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h index e7cbc171..4ea3b7d 100644 --- a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h +++ b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_INSTANT_OVERLAY_CONTROLLER_MAC_H_ #define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_INSTANT_OVERLAY_CONTROLLER_MAC_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/search/instant_overlay_controller.h" class Browser;
diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h index 45655b5..3f1eb330 100644 --- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h +++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_CONTROLLER_H_ #define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_SAD_TAB_CONTROLLER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/ui/sad_tab.h" #import <Cocoa/Cocoa.h>
diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.mm index ca74414..64931f65 100644 --- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.mm +++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.mm
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h" +#include <stddef.h> + #include "base/logging.h" #include "base/strings/sys_string_conversions.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm index bbb0dc4..c2dac239 100644 --- a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm +++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
@@ -4,10 +4,13 @@ #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" +#include <stdint.h> + #include <utility> #include "base/mac/scoped_cftyperef.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/devtools/devtools_window.h" #import "chrome/browser/themes/theme_properties.h" #import "chrome/browser/themes/theme_service.h" @@ -338,8 +341,8 @@ // TODO(miu): This is basically media::ComputeLetterboxRegion(), and it // looks like others have written this code elsewhere. Let's consolidate // into a shared function ui/gfx/geometry or around there. - const int64 x = static_cast<int64>(captureSize.width()) * rect.height(); - const int64 y = static_cast<int64>(captureSize.height()) * rect.width(); + const int64_t x = static_cast<int64_t>(captureSize.width()) * rect.height(); + const int64_t y = static_cast<int64_t>(captureSize.height()) * rect.width(); if (y < x) { rect.ClampToCenteredSize(gfx::Size( rect.width(), static_cast<int>(y / captureSize.width())));
diff --git a/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h b/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h index 38428f5..7118942 100644 --- a/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h +++ b/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_WEB_DRAG_BOOKMARK_HANDLER_MAC_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/bookmarks/browser/bookmark_node_data.h" #include "content/public/browser/web_drag_dest_delegate.h"
diff --git a/chrome/browser/ui/cocoa/tab_dialogs_cocoa.h b/chrome/browser/ui/cocoa/tab_dialogs_cocoa.h index 690e0686..46ce2d58 100644 --- a/chrome/browser/ui/cocoa/tab_dialogs_cocoa.h +++ b/chrome/browser/ui/cocoa/tab_dialogs_cocoa.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_COCOA_TAB_DIALOGS_COCOA_H_ #define CHROME_BROWSER_UI_COCOA_TAB_DIALOGS_COCOA_H_ +#include "base/macros.h" #include "chrome/browser/ui/tab_dialogs.h" // Cocoa implementation of TabDialogs interface.
diff --git a/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h b/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h index 19ff9d2a4..1eed74f 100644 --- a/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h +++ b/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h
@@ -8,6 +8,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
diff --git a/chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.mm b/chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.mm index 3877b6d..2d1888e 100644 --- a/chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.mm +++ b/chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.mm
@@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/mac/foundation_util.h" +#include "base/macros.h" #include "base/thread_task_runner_handle.h" #import "chrome/browser/ui/cocoa/tabs/tab_view.h" #include "content/public/browser/user_metrics.h"
diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm index 7b1909a3..f5fcce01 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm
@@ -3,8 +3,10 @@ // found in the LICENSE file. #import <Cocoa/Cocoa.h> +#include <stddef.h> #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index c0ccef46..4e64b91 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -13,6 +13,7 @@ #include "base/command_line.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_nsautorelease_pool.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.h b/chrome/browser/ui/cocoa/task_manager_mac.h index 83c22f5b..f3a1f0d 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac.h +++ b/chrome/browser/ui/cocoa/task_manager_mac.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/ui/cocoa/table_row_nsimage_cache.h"
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm index a24ae9f..518fec6f 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac.mm
@@ -4,10 +4,13 @@ #include "chrome/browser/ui/cocoa/task_manager_mac.h" +#include <stddef.h> + #include <algorithm> #include <vector> #include "base/mac/bundle_locations.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.mm b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.mm index ef7f2ae..9a67000 100644 --- a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.mm +++ b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.mm
@@ -4,6 +4,7 @@ #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h" +#include "base/macros.h" #import "chrome/browser/ui/cocoa/themed_window.h" #include "ui/gfx/canvas_skia_paint.h" #include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell_unittest.mm b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell_unittest.mm index 8b2ba97..7fa5b65 100644 --- a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell_unittest.mm
@@ -4,6 +4,7 @@ #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
diff --git a/chrome/browser/ui/cocoa/toolbar/media_router_action_platform_delegate_cocoa.h b/chrome/browser/ui/cocoa/toolbar/media_router_action_platform_delegate_cocoa.h index 53a21d6..9f6a1f7 100644 --- a/chrome/browser/ui/cocoa/toolbar/media_router_action_platform_delegate_cocoa.h +++ b/chrome/browser/ui/cocoa/toolbar/media_router_action_platform_delegate_cocoa.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_MEDIA_ROUTER_ACTION_PLATFORM_DELEGATE_COCOA_H_ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_MEDIA_ROUTER_ACTION_PLATFORM_DELEGATE_COCOA_H_ +#include "base/macros.h" #include "chrome/browser/ui/toolbar/media_router_action_platform_delegate.h" // The Cocoa platform delegate for the Media Router component action.
diff --git a/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm b/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm index 67c1b58..eec4d00 100644 --- a/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm +++ b/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm
@@ -4,6 +4,9 @@ #import "chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.h" +#include <stddef.h> + +#include "base/macros.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h" #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index 45c8080c..09ed148 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -10,6 +10,7 @@ #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" #include "base/mac/sdk_forward_declarations.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/prefs/pref_service.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm index 8f4c0594..10c8868 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm
@@ -5,6 +5,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm b/chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm index 7ebf118..88a34d96 100644 --- a/chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm
@@ -6,6 +6,7 @@ #include "base/mac/foundation_util.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/bubble_combobox.h"
diff --git a/chrome/browser/ui/cocoa/url_drop_target.mm b/chrome/browser/ui/cocoa/url_drop_target.mm index b1d6fd2..55d5e2bd 100644 --- a/chrome/browser/ui/cocoa/url_drop_target.mm +++ b/chrome/browser/ui/cocoa/url_drop_target.mm
@@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/url_drop_target.h" -#include "base/basictypes.h" #include "chrome/browser/ui/cocoa/drag_util.h" #import "third_party/mozilla/NSPasteboard+Utils.h" #include "url/gurl.h"
diff --git a/chrome/browser/ui/cocoa/validation_message_bubble_cocoa.h b/chrome/browser/ui/cocoa/validation_message_bubble_cocoa.h index 6d6f0ca..3defb679 100644 --- a/chrome/browser/ui/cocoa/validation_message_bubble_cocoa.h +++ b/chrome/browser/ui/cocoa/validation_message_bubble_cocoa.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_VALIDATION_MESSAGE_BUBBLE_COCOA_H_ #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/ui/validation_message_bubble.h" @class ValidationMessageBubbleController;
diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm index 20a888a..460eb66 100644 --- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm +++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/command_line.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/web_contents_modal_dialog_host_cocoa.h b/chrome/browser/ui/cocoa/web_contents_modal_dialog_host_cocoa.h index e8b0378..d1e0e41 100644 --- a/chrome/browser/ui/cocoa/web_contents_modal_dialog_host_cocoa.h +++ b/chrome/browser/ui/cocoa/web_contents_modal_dialog_host_cocoa.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_COCOA_WEB_CONTENTS_DIALOG_HOST_COCOA_H_ #define CHROME_BROWSER_UI_COCOA_WEB_CONTENTS_DIALOG_HOST_COCOA_H_ +#include "base/macros.h" #include "components/web_modal/web_contents_modal_dialog_host.h" @class ConstrainedWindowSheetController;
diff --git a/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac.h b/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac.h index 093bc11..08b4ffc 100644 --- a/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac.h +++ b/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_WEB_CONTENTS_MODAL_DIALOG_MANAGER_VIEWS_MAC_H_ #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "components/web_modal/single_web_contents_dialog_manager.h" #include "ui/views/widget/widget_observer.h"
diff --git a/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm b/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm index 81fdc4a..f225203 100644 --- a/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm +++ b/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm
@@ -6,6 +6,7 @@ #import <Cocoa/Cocoa.h> +#include "base/macros.h" #include "base/run_loop.h" #include "base/test/test_timeouts.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller.h b/chrome/browser/ui/cocoa/web_dialog_window_controller.h index 05c624a..f78813b 100644 --- a/chrome/browser/ui/cocoa/web_dialog_window_controller.h +++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.h
@@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "ui/web_dialogs/web_dialog_ui.h"
diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm index 1180f952..e9dd1348 100644 --- a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm +++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
@@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/browser_dialogs.h" #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm index 24c36a2..aff2fa69 100644 --- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm
@@ -7,6 +7,7 @@ #include <algorithm> #include "base/mac/bind_objc_block.h" +#include "base/macros.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h index 703d12e4..2d4f1962 100644 --- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h +++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h
@@ -5,6 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ssl/security_state_model.h" #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm index 6b6fa00..e59c9f5 100644 --- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm
@@ -4,7 +4,10 @@ #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h" +#include <stddef.h> + #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest_mac.h"
diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc index 30c555f..fc1e991ca 100644 --- a/chrome/browser/ui/views/accelerator_table.cc +++ b/chrome/browser/ui/views/accelerator_table.cc
@@ -4,7 +4,10 @@ #include "chrome/browser/ui/views/accelerator_table.h" -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "ui/base/accelerators/accelerator.h" #include "ui/events/event_constants.h"
diff --git a/chrome/browser/ui/views/accelerator_table_unittest.cc b/chrome/browser/ui/views/accelerator_table_unittest.cc index 156dd9b5..31bf6e49 100644 --- a/chrome/browser/ui/views/accelerator_table_unittest.cc +++ b/chrome/browser/ui/views/accelerator_table_unittest.cc
@@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <set> -#include "base/basictypes.h" +#include "build/build_config.h" #include "chrome/browser/ui/views/accelerator_table.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/event_constants.h"
diff --git a/chrome/browser/ui/views/accelerator_utils_aura.cc b/chrome/browser/ui/views/accelerator_utils_aura.cc index 42f4592..3efed3672 100644 --- a/chrome/browser/ui/views/accelerator_utils_aura.cc +++ b/chrome/browser/ui/views/accelerator_utils_aura.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/views/accelerator_table.h"
diff --git a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc index af5bae2..b3fd44db 100644 --- a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc +++ b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc b/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc index d1a9795..6c056274 100644 --- a/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc +++ b/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc
@@ -4,6 +4,7 @@ #include <oleacc.h> +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/win/scoped_bstr.h" #include "base/win/scoped_com_initializer.h"
diff --git a/chrome/browser/ui/views/app_list/app_list_dialog_container.cc b/chrome/browser/ui/views/app_list/app_list_dialog_container.cc index 55fbbc32..14850052 100644 --- a/chrome/browser/ui/views/app_list/app_list_dialog_container.cc +++ b/chrome/browser/ui/views/app_list/app_list_dialog_container.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/app_list/app_list_dialog_container.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/ui/host_desktop.h" #include "third_party/skia/include/core/SkPaint.h" #include "ui/app_list/app_list_constants.h"
diff --git a/chrome/browser/ui/views/app_list/linux/app_list_linux.cc b/chrome/browser/ui/views/app_list/linux/app_list_linux.cc index 936d26d8..a8ef48a 100644 --- a/chrome/browser/ui/views/app_list/linux/app_list_linux.cc +++ b/chrome/browser/ui/views/app_list/linux/app_list_linux.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/app_list/linux/app_list_linux.h" +#include "build/build_config.h" #include "ui/app_list/app_list_switches.h" #include "ui/app_list/views/app_list_view.h" #include "ui/gfx/screen.h"
diff --git a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h index c279ccb..fb7cf76 100644 --- a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h +++ b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APP_LIST_LINUX_APP_LIST_SERVICE_LINUX_H_ #define CHROME_BROWSER_UI_VIEWS_APP_LIST_LINUX_APP_LIST_SERVICE_LINUX_H_ +#include "base/macros.h" #include "chrome/browser/ui/app_list/app_list_service_views.h" #include "ui/app_list/views/app_list_view_observer.h"
diff --git a/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.h b/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.h index 6a21f8a..0b54d1b 100644 --- a/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.h +++ b/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APP_LIST_WIN_APP_LIST_CONTROLLER_DELEGATE_WIN_H_ #define CHROME_BROWSER_UI_VIEWS_APP_LIST_WIN_APP_LIST_CONTROLLER_DELEGATE_WIN_H_ +#include "base/macros.h" #include "chrome/browser/ui/app_list/app_list_controller_delegate_views.h" // Windows specific configuration and behaviour for the AppList.
diff --git a/chrome/browser/ui/views/app_list/win/app_list_service_win.cc b/chrome/browser/ui/views/app_list/win/app_list_service_win.cc index 6692e3f..4f8490c4 100644 --- a/chrome/browser/ui/views/app_list/win/app_list_service_win.cc +++ b/chrome/browser/ui/views/app_list/win/app_list_service_win.cc
@@ -5,10 +5,13 @@ #include "chrome/browser/ui/views/app_list/win/app_list_service_win.h" #include <dwmapi.h> +#include <stddef.h> +#include <stdint.h> #include <sstream> #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" @@ -366,7 +369,7 @@ // Don't warm up the app list if it hasn't been used for a while. If the last // launch is unknown, record it as "used" on the first warmup. PrefService* local_state = g_browser_process->local_state(); - int64 last_launch_time_pref = + int64_t last_launch_time_pref = local_state->GetInt64(prefs::kAppListLastLaunchTime); if (last_launch_time_pref == 0) RecordAppListLastLaunch();
diff --git a/chrome/browser/ui/views/app_list/win/app_list_service_win.h b/chrome/browser/ui/views/app_list/win/app_list_service_win.h index b9ce4ed5b..8e8d00b 100644 --- a/chrome/browser/ui/views/app_list/win/app_list_service_win.h +++ b/chrome/browser/ui/views/app_list/win/app_list_service_win.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_APP_LIST_WIN_APP_LIST_SERVICE_WIN_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/app_list/app_list_service_views.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc index 44faee3..22fec42 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "ash/test/ash_test_base.h" +#include "base/macros.h" #include "chrome/browser/extensions/test_extension_environment.h" #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h" #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc index 0eb10bc1..b09f4a4 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc
@@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h index 0cb3f8f..add262f 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_DIALOG_VIEWS_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "extensions/browser/extension_registry_observer.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/view.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc index 2492a17..8d9e597c 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h index 145d164..628d7fd0 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_FOOTER_PANEL_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.h b/chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.h index f69069e..a758683d 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.h +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_HEADER_PANEL_H_ #define CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_HEADER_PANEL_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_panel.h" #include "ui/views/controls/link_listener.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_panel.h b/chrome/browser/ui/views/apps/app_info_dialog/app_info_panel.h index 6cf33e1..b9d1208 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_panel.h +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_panel.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_PANEL_H_ #define CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_PANEL_H_ +#include "base/macros.h" #include "ui/views/view.h" class Profile;
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc index c0de46c..82964d9 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc
@@ -10,6 +10,7 @@ #include "apps/app_load_service.h" #include "apps/saved_files_service.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/string_split.h" #include "chrome/browser/profiles/profile.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h index c6e32538..e778525 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_panel.h" #include "extensions/common/permissions/permission_message_provider.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc index 531d5f9..063d0059 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h" +#include <stddef.h> + #include <vector> #include "base/callback_forward.h" @@ -11,6 +13,7 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "base/task_runner_util.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/launch_util.h" @@ -285,7 +288,7 @@ base::Bind(&AppInfoSummaryPanel::OnAppSizeCalculated, AsWeakPtr())); } -void AppInfoSummaryPanel::OnAppSizeCalculated(int64 app_size_in_bytes) { +void AppInfoSummaryPanel::OnAppSizeCalculated(int64_t app_size_in_bytes) { const int one_mebibyte_in_bytes = 1024 * 1024; if (app_size_in_bytes < one_mebibyte_in_bytes) { size_value_->SetText(
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h b/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h index 6395d8e..1b20036b 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_SUMMARY_PANEL_H_ #define CHROME_BROWSER_UI_VIEWS_APPS_APP_INFO_DIALOG_APP_INFO_SUMMARY_PANEL_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_panel.h" @@ -53,7 +56,7 @@ // Called asynchronously to calculate and update the size of the app displayed // in the dialog. void StartCalculatingAppSize(); - void OnAppSizeCalculated(int64 app_size_in_bytes); + void OnAppSizeCalculated(int64_t app_size_in_bytes); // Returns the launch type of the app (e.g. pinned tab, fullscreen, etc). extensions::LaunchType GetLaunchType() const;
diff --git a/chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h b/chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h index 2bb5ce2..c4446c2f 100644 --- a/chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h +++ b/chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_DESKTOP_NATIVE_WIDGET_AURA_WIN_H_ #define CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_DESKTOP_NATIVE_WIDGET_AURA_WIN_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" class BrowserFrame;
diff --git a/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.h b/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.h index fb3cb19..22887cf 100644 --- a/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.h +++ b/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_DESKTOP_WINDOW_TREE_HOST_WIN_H_ #define CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_DESKTOP_WINDOW_TREE_HOST_WIN_H_ +#include "base/macros.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" namespace views {
diff --git a/chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.h b/chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.h index 90aa8c4..344d35a 100644 --- a/chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.h +++ b/chrome/browser/ui/views/apps/app_window_easy_resize_window_targeter.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_EASY_RESIZE_WINDOW_TARGETER_H_ #define CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_EASY_RESIZE_WINDOW_TARGETER_H_ +#include "base/macros.h" #include "ui/wm/core/easy_resize_window_targeter.h" namespace ui {
diff --git a/chrome/browser/ui/views/apps/app_window_native_widget_mac.h b/chrome/browser/ui/views/apps/app_window_native_widget_mac.h index 9e1a2c5..61c1f18 100644 --- a/chrome/browser/ui/views/apps/app_window_native_widget_mac.h +++ b/chrome/browser/ui/views/apps/app_window_native_widget_mac.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_NATIVE_WIDGET_MAC_H #define CHROME_BROWSER_UI_VIEWS_APPS_APP_WINDOW_NATIVE_WIDGET_MAC_H +#include "base/macros.h" #include "ui/views/widget/native_widget_mac.h" namespace extensions {
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc index bd6baf26..58d9ea3 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
@@ -4,7 +4,11 @@ #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" +#include <stddef.h> + #include "apps/ui/views/app_window_frame_view.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views.h index e28cf883..31f6f06 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.h +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "extensions/components/native_app_window/native_app_window_views.h"
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc index 5c6dad7..ecb8c70 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
@@ -15,6 +15,8 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_delegate.h" #include "ash/wm/window_state_observer.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/ui/ash/ash_util.h" #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h" #include "chrome/browser/ui/host_desktop.h"
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h index 14f6fe1..331dc5d 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h
@@ -6,7 +6,9 @@ #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" #include "ui/views/context_menu_controller.h"
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.h index 18b057b..baf1dde 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.h +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.h
@@ -8,6 +8,7 @@ #import <Foundation/Foundation.h> #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" @class StartResizeNotificationObserver;
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h index 9456006..4c14562 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_ #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_WIN_H_ +#include "base/macros.h" #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h" namespace web_app {
diff --git a/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h b/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h index cccd40b6..af6bbf3f 100644 --- a/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h +++ b/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APPS_GLASS_APP_WINDOW_FRAME_VIEW_WIN_H_ #define CHROME_BROWSER_UI_VIEWS_APPS_GLASS_APP_WINDOW_FRAME_VIEW_WIN_H_ +#include "base/macros.h" #include "ui/gfx/geometry/insets.h" #include "ui/views/window/non_client_view.h"
diff --git a/chrome/browser/ui/views/apps/native_app_window_frame_view_mac.h b/chrome/browser/ui/views/apps/native_app_window_frame_view_mac.h index ee96b27..31cd708a 100644 --- a/chrome/browser/ui/views/apps/native_app_window_frame_view_mac.h +++ b/chrome/browser/ui/views/apps/native_app_window_frame_view_mac.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_FRAME_VIEW_MAC_H_ #define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_FRAME_VIEW_MAC_H_ +#include "base/macros.h" #include "ui/views/window/native_frame_view.h" namespace extensions {
diff --git a/chrome/browser/ui/views/apps/shaped_app_window_targeter.h b/chrome/browser/ui/views/apps/shaped_app_window_targeter.h index 0cd78a2..579cadb 100644 --- a/chrome/browser/ui/views/apps/shaped_app_window_targeter.h +++ b/chrome/browser/ui/views/apps/shaped_app_window_targeter.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_APPS_SHAPED_APP_WINDOW_TARGETER_H_ #define CHROME_BROWSER_UI_VIEWS_APPS_SHAPED_APP_WINDOW_TARGETER_H_ +#include "base/macros.h" #include "ui/wm/core/masked_window_targeter.h" class ChromeNativeAppWindowViews;
diff --git a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc index 96a2790..c504740 100644 --- a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc +++ b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
@@ -5,6 +5,8 @@ #include "chrome/browser/ui/views/apps/shaped_app_window_targeter.h" #include "apps/ui/views/app_window_frame_view.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/window.h"
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc index 37851a8..7aa7d71b 100644 --- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc +++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
@@ -9,6 +9,8 @@ #include "ash/shell.h" #include "base/command_line.h" #include "base/lazy_instance.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/chrome_browser_main.h" #include "chrome/browser/ui/ash/ash_init.h" #include "chrome/browser/ui/ash/ash_util.h"
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h index b72a8efb..3d99d8d 100644 --- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h +++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chrome_browser_main_extra_parts.h" class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
diff --git a/chrome/browser/ui/views/ash/tab_scrubber.cc b/chrome/browser/ui/views/ash/tab_scrubber.cc index a3583dd..1c1d537 100644 --- a/chrome/browser/ui/views/ash/tab_scrubber.cc +++ b/chrome/browser/ui/views/ash/tab_scrubber.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/ash/tab_scrubber.h" +#include <stdint.h> + #include "ash/shell.h" #include "ash/wm/window_util.h" #include "base/metrics/histogram.h" @@ -23,7 +25,7 @@ #include "ui/views/controls/glow_hover_controller.h" namespace { -const int64 kActivationDelayMS = 200; +const int64_t kActivationDelayMS = 200; } // static
diff --git a/chrome/browser/ui/views/ash/tab_scrubber.h b/chrome/browser/ui/views/ash/tab_scrubber.h index d423cca6c..e2748e0 100644 --- a/chrome/browser/ui/views/ash/tab_scrubber.h +++ b/chrome/browser/ui/views/ash/tab_scrubber.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_ASH_TAB_SCRUBBER_H_ #define CHROME_BROWSER_UI_VIEWS_ASH_TAB_SCRUBBER_H_ +#include "base/macros.h" #include "base/timer/timer.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" #include "chrome/browser/ui/views/tabs/tab_strip_observer.h"
diff --git a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc index 0b99e8d..6b3b5ab 100644 --- a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc +++ b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc
@@ -7,8 +7,10 @@ #include "ash/display/event_transformation_handler.h" #include "ash/shell.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
diff --git a/chrome/browser/ui/views/auto_keep_alive.h b/chrome/browser/ui/views/auto_keep_alive.h index 6efa54d..a9eee78 100644 --- a/chrome/browser/ui/views/auto_keep_alive.h +++ b/chrome/browser/ui/views/auto_keep_alive.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_AUTO_KEEP_ALIVE_H_ #define CHROME_BROWSER_UI_VIEWS_AUTO_KEEP_ALIVE_H_ +#include "base/macros.h" #include "ui/gfx/native_widget_types.h" // Class to scoped decrement keep alive count.
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_view_tester_views.h b/chrome/browser/ui/views/autofill/autofill_dialog_view_tester_views.h index 79b5410..c05d5863 100644 --- a/chrome/browser/ui/views/autofill/autofill_dialog_view_tester_views.h +++ b/chrome/browser/ui/views/autofill/autofill_dialog_view_tester_views.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEW_TESTER_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEW_TESTER_VIEWS_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/ui/autofill/autofill_dialog_view_tester.h" #include "components/autofill/core/browser/dialog_section.h"
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc index 5ccaa1a..599048c 100644 --- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc +++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
@@ -4,10 +4,13 @@ #include "chrome/browser/ui/views/autofill/autofill_dialog_views.h" +#include <stddef.h> + #include <utility> #include "base/bind.h" #include "base/location.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.h b/chrome/browser/ui/views/autofill/autofill_dialog_views.h index 16e306b..1631be7 100644 --- a/chrome/browser/ui/views/autofill/autofill_dialog_views.h +++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.h
@@ -8,6 +8,7 @@ #include <map> #include <set> +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h"
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views_unittest.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views_unittest.cc index 3cf3254..817fd558 100644 --- a/chrome/browser/ui/views/autofill/autofill_dialog_views_unittest.cc +++ b/chrome/browser/ui/views/autofill/autofill_dialog_views_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/autofill/autofill_dialog_views.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/autofill/mock_autofill_dialog_view_delegate.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc b/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc index cb8f766..d9a5e93e 100644 --- a/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc +++ b/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc
@@ -8,6 +8,7 @@ #include "base/location.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/ui/autofill/popup_constants.h" #include "ui/views/border.h" #include "ui/views/focus/focus_manager.h"
diff --git a/chrome/browser/ui/views/autofill/autofill_popup_base_view.h b/chrome/browser/ui/views/autofill/autofill_popup_base_view.h index 30e4beaa..1e636c51 100644 --- a/chrome/browser/ui/views/autofill/autofill_popup_base_view.h +++ b/chrome/browser/ui/views/autofill/autofill_popup_base_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_POPUP_BASE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_POPUP_BASE_VIEW_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/ui/autofill/autofill_popup_view_delegate.h"
diff --git a/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc b/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc index 95e39e6..ad57273 100644 --- a/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc +++ b/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/autofill/autofill_popup_base_view.h" +#include "build/build_config.h" #include "chrome/browser/ui/autofill/autofill_popup_view_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/views/autofill/autofill_popup_view_views.h b/chrome/browser/ui/views/autofill/autofill_popup_view_views.h index f5a558d..43b00c5c 100644 --- a/chrome/browser/ui/views/autofill/autofill_popup_view_views.h +++ b/chrome/browser/ui/views/autofill/autofill_popup_view_views.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_POPUP_VIEW_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_POPUP_VIEW_VIEWS_H_ +#include <stddef.h> + +#include "base/macros.h" #include "chrome/browser/ui/autofill/autofill_popup_view.h" #include "chrome/browser/ui/views/autofill/autofill_popup_base_view.h"
diff --git a/chrome/browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h b/chrome/browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h index e69baac..3e08339 100644 --- a/chrome/browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h +++ b/chrome/browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_CARD_UNMASK_PROMPT_VIEW_TESTER_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_CARD_UNMASK_PROMPT_VIEW_TESTER_VIEWS_H_ +#include "base/macros.h" #include "chrome/browser/ui/autofill/card_unmask_prompt_view_tester.h" namespace autofill {
diff --git a/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc b/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc index 79dae13..e1f951f8 100644 --- a/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc +++ b/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/autofill/card_unmask_prompt_views.h" -#include "base/basictypes.h" #include "base/location.h" #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/autofill/card_unmask_prompt_views.h b/chrome/browser/ui/views/autofill/card_unmask_prompt_views.h index f67aa7d..a677b1212 100644 --- a/chrome/browser/ui/views/autofill/card_unmask_prompt_views.h +++ b/chrome/browser/ui/views/autofill/card_unmask_prompt_views.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_CARD_UNMASK_PROMPT_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_CARD_UNMASK_PROMPT_VIEWS_H_ +#include <stdint.h> + +#include "base/macros.h" #include "chrome/browser/ui/autofill/autofill_dialog_models.h" #include "components/autofill/core/browser/ui/card_unmask_prompt_view.h" #include "ui/gfx/animation/animation_delegate.h"
diff --git a/chrome/browser/ui/views/autofill/decorated_textfield.h b/chrome/browser/ui/views/autofill/decorated_textfield.h index 5f058ae..d94e6d2 100644 --- a/chrome/browser/ui/views/autofill/decorated_textfield.h +++ b/chrome/browser/ui/views/autofill/decorated_textfield.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_DECORATED_TEXTFIELD_H_ #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_DECORATED_TEXTFIELD_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "ui/gfx/image/image.h"
diff --git a/chrome/browser/ui/views/autofill/expanding_textfield.cc b/chrome/browser/ui/views/autofill/expanding_textfield.cc index c7957d5..020f8e7 100644 --- a/chrome/browser/ui/views/autofill/expanding_textfield.cc +++ b/chrome/browser/ui/views/autofill/expanding_textfield.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/autofill/expanding_textfield.h" +#include <stddef.h> + #include "base/bind.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/views/autofill/expanding_textfield.h b/chrome/browser/ui/views/autofill/expanding_textfield.h index 88e304b..a95e92d 100644 --- a/chrome/browser/ui/views/autofill/expanding_textfield.h +++ b/chrome/browser/ui/views/autofill/expanding_textfield.h
@@ -7,6 +7,7 @@ #include <list> +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/ui/views/autofill/decorated_textfield.h" #include "ui/views/controls/textfield/textfield_controller.h"
diff --git a/chrome/browser/ui/views/autofill/info_bubble.cc b/chrome/browser/ui/views/autofill/info_bubble.cc index b79184a..71fff7b 100644 --- a/chrome/browser/ui/views/autofill/info_bubble.cc +++ b/chrome/browser/ui/views/autofill/info_bubble.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/autofill/info_bubble.h" #include "base/i18n/rtl.h" +#include "base/macros.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h"
diff --git a/chrome/browser/ui/views/autofill/info_bubble.h b/chrome/browser/ui/views/autofill/info_bubble.h index e5b09f66..47fd2f9 100644 --- a/chrome/browser/ui/views/autofill/info_bubble.h +++ b/chrome/browser/ui/views/autofill/info_bubble.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_INFO_BUBBLE_H_ #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_INFO_BUBBLE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/gfx/geometry/insets.h" #include "ui/views/bubble/bubble_delegate.h"
diff --git a/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.h b/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.h index 2caf84f0..4b3c531a 100644 --- a/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.h +++ b/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_NEW_CREDIT_CARD_BUBBLE_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_NEW_CREDIT_CARD_BUBBLE_VIEWS_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/autofill/new_credit_card_bubble_view.h" #include "ui/views/bubble/bubble_delegate.h"
diff --git a/chrome/browser/ui/views/autofill/password_generation_popup_view_tester_views.h b/chrome/browser/ui/views/autofill/password_generation_popup_view_tester_views.h index a3be9624..67beb94 100644 --- a/chrome/browser/ui/views/autofill/password_generation_popup_view_tester_views.h +++ b/chrome/browser/ui/views/autofill/password_generation_popup_view_tester_views.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_PASSWORD_GENERATION_POPUP_VIEW_TESTER_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_PASSWORD_GENERATION_POPUP_VIEW_TESTER_VIEWS_H_ +#include "base/macros.h" #include "chrome/browser/ui/autofill/password_generation_popup_view_tester.h" namespace autofill {
diff --git a/chrome/browser/ui/views/autofill/password_generation_popup_view_views.cc b/chrome/browser/ui/views/autofill/password_generation_popup_view_views.cc index 5f73a60..d4c8f186 100644 --- a/chrome/browser/ui/views/autofill/password_generation_popup_view_views.cc +++ b/chrome/browser/ui/views/autofill/password_generation_popup_view_views.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/autofill/password_generation_popup_view_views.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/ui/autofill/password_generation_popup_controller.h" #include "chrome/browser/ui/autofill/popup_constants.h"
diff --git a/chrome/browser/ui/views/autofill/password_generation_popup_view_views.h b/chrome/browser/ui/views/autofill/password_generation_popup_view_views.h index e85cba90..d3f703b 100644 --- a/chrome/browser/ui/views/autofill/password_generation_popup_view_views.h +++ b/chrome/browser/ui/views/autofill/password_generation_popup_view_views.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_PASSWORD_GENERATION_POPUP_VIEW_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_PASSWORD_GENERATION_POPUP_VIEW_VIEWS_H_ +#include "base/macros.h" #include "chrome/browser/ui/autofill/password_generation_popup_view.h" #include "chrome/browser/ui/views/autofill/autofill_popup_base_view.h" #include "ui/gfx/font_list.h"
diff --git a/chrome/browser/ui/views/autofill/save_card_bubble_views.cc b/chrome/browser/ui/views/autofill/save_card_bubble_views.cc index abb770e..41e7293b 100644 --- a/chrome/browser/ui/views/autofill/save_card_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/save_card_bubble_views.cc
@@ -4,7 +4,10 @@ #include "chrome/browser/ui/views/autofill/save_card_bubble_views.h" +#include <stddef.h> + #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/ui/autofill/autofill_dialog_types.h" #include "chrome/browser/ui/autofill/save_card_bubble_controller.h" #include "grit/components_strings.h"
diff --git a/chrome/browser/ui/views/autofill/tooltip_icon.cc b/chrome/browser/ui/views/autofill/tooltip_icon.cc index 0aef3c1e..3745b0f 100644 --- a/chrome/browser/ui/views/autofill/tooltip_icon.cc +++ b/chrome/browser/ui/views/autofill/tooltip_icon.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/autofill/tooltip_icon.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/timer/timer.h" #include "chrome/browser/ui/views/autofill/info_bubble.h" #include "ui/accessibility/ax_view_state.h"
diff --git a/chrome/browser/ui/views/autofill/tooltip_icon.h b/chrome/browser/ui/views/autofill/tooltip_icon.h index 709dd835..cd39fd4 100644 --- a/chrome/browser/ui/views/autofill/tooltip_icon.h +++ b/chrome/browser/ui/views/autofill/tooltip_icon.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_TOOLTIP_ICON_H_ #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_TOOLTIP_ICON_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_observer.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h index 2fd2c41..2d52b6e8 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/context_menu_controller.h" #include "ui/views/controls/link_listener.h" #include "ui/views/view.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 9fc0fe4ff..856cd00 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" +#include <stdint.h> + #include <algorithm> #include <limits> #include <string> @@ -12,12 +14,14 @@ #include "base/bind.h" #include "base/i18n/rtl.h" #include "base/location.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" #include "chrome/browser/browser_process.h" @@ -1218,8 +1222,8 @@ } void BookmarkBarView::OnImportBookmarks() { - int64 install_time = g_browser_process->metrics_service()->GetInstallDate(); - int64 time_from_install = base::Time::Now().ToTimeT() - install_time; + int64_t install_time = g_browser_process->metrics_service()->GetInstallDate(); + int64_t time_from_install = base::Time::Now().ToTimeT() - install_time; if (bookmark_bar_state_ == BookmarkBar::SHOW) { UMA_HISTOGRAM_COUNTS("Import.ShowDialog.FromBookmarkBarView", time_from_install);
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h index 4a9021c0..3ed69067 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
@@ -7,8 +7,8 @@ #include <set> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 283c9ea9..4aa14ae 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -6,11 +6,13 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/location.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/chrome_content_browser_client.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h index 5df0c94f..d349c5f 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_TEST_HELPER_H_ #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_TEST_HELPER_H_ +#include "base/macros.h" #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" // Used to access private state of BookmarkBarView for testing.
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc index 7dbed29..9271aab 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
@@ -4,10 +4,12 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc index 7654e8b..2e3080e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc
@@ -4,9 +4,10 @@ #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h" -#include "base/basictypes.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/test_extension_service.h" #include "chrome/browser/extensions/test_extension_system.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index d1b3259..c09d3ad 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h index 775eae4..f90bb19b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BUBBLE_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc index a0a95993..2353464 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc
@@ -6,7 +6,9 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/signin/fake_signin_manager_builder.h" #include "chrome/browser/signin/signin_manager_factory.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h index b90099afc..87679c5 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h" #include "ui/views/controls/menu/menu_delegate.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc index 1ab6051e..7d6aa36 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h" +#include <stddef.h> + #include <string> #include <vector> @@ -13,6 +15,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index 802d9f29..9d748c9 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
@@ -6,7 +6,6 @@ #include <string> -#include "base/basictypes.h" #include "base/logging.h" #include "base/prefs/pref_service.h" #include "base/strings/string_util.h" @@ -481,7 +480,7 @@ const BookmarkNode* to_select = parent_; if (details_.type == EditDetails::EXISTING_NODE) to_select = details_.existing_node->parent(); - int64 folder_id_to_select = to_select->id(); + int64_t folder_id_to_select = to_select->id(); EditorNode* b_node = FindNodeWithID(tree_model_->GetRoot(), folder_id_to_select); if (!b_node) @@ -518,7 +517,7 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::FindNodeWithID( BookmarkEditorView::EditorNode* node, - int64 id) { + int64_t id) { if (node->value == id) return node; for (int i = 0; i < node->child_count(); ++i) {
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h index a475273..d93ab56 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
@@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_ +#include <stdint.h> + #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/ui/bookmarks/bookmark_editor.h" #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h" @@ -53,7 +56,7 @@ public bookmarks::BookmarkModelObserver { public: // Type of node in the tree. Public purely for testing. - typedef ui::TreeNodeWithValue<int64> EditorNode; + typedef ui::TreeNodeWithValue<int64_t> EditorNode; // Model for the TreeView. Trivial subclass that doesn't allow titles with // empty strings. Public purely for testing. @@ -173,7 +176,7 @@ void CreateNodes(const bookmarks::BookmarkNode* bb_node, EditorNode* b_node); // Returns the node with the specified id, or NULL if one can't be found. - EditorNode* FindNodeWithID(BookmarkEditorView::EditorNode* node, int64 id); + EditorNode* FindNodeWithID(BookmarkEditorView::EditorNode* node, int64_t id); // Invokes ApplyEdits with the selected node. void ApplyEdits(); @@ -267,7 +270,7 @@ bool show_tree_; // List of deleted bookmark folders. - std::vector<int64> deletes_; + std::vector<int64_t> deletes_; DISALLOW_COPY_AND_ASSIGN(BookmarkEditorView); };
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h index 995187e..81460b5e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
@@ -8,6 +8,7 @@ #include <set> #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/bookmarks/browser/base_bookmark_model_observer.h" #include "components/bookmarks/browser/bookmark_node_data.h" #include "ui/views/controls/menu/menu_delegate.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h index d2bd95f..e7f27098 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h
@@ -9,6 +9,7 @@ #include <set> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/bookmarks/bookmark_stats.h" #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h" #include "components/bookmarks/browser/base_bookmark_model_observer.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc index d7dd524b..df57570 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_stats.h"
diff --git a/chrome/browser/ui/views/certificate_selector.cc b/chrome/browser/ui/views/certificate_selector.cc index 645a8639..6ce7e8e 100644 --- a/chrome/browser/ui/views/certificate_selector.cc +++ b/chrome/browser/ui/views/certificate_selector.cc
@@ -9,8 +9,10 @@ #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/certificate_viewer.h" #include "chrome/grit/generated_resources.h" #include "components/constrained_window/constrained_window_views.h"
diff --git a/chrome/browser/ui/views/certificate_selector_browsertest.cc b/chrome/browser/ui/views/certificate_selector_browsertest.cc index 1e335eb9..549b1a23 100644 --- a/chrome/browser/ui/views/certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/certificate_selector_browsertest.cc
@@ -4,6 +4,7 @@ #include "base/bind.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/ui/views/certificate_viewer_win.cc b/chrome/browser/ui/views/certificate_viewer_win.cc index 39843f97..205e41c 100644 --- a/chrome/browser/ui/views/certificate_viewer_win.cc +++ b/chrome/browser/ui/views/certificate_viewer_win.cc
@@ -12,6 +12,7 @@ #include "base/bind_helpers.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/task_runner.h" #include "base/threading/thread.h"
diff --git a/chrome/browser/ui/views/chrome_constrained_window_views_client.cc b/chrome/browser/ui/views/chrome_constrained_window_views_client.cc index a9ca4d9..b5b64d9 100644 --- a/chrome/browser/ui/views/chrome_constrained_window_views_client.cc +++ b/chrome/browser/ui/views/chrome_constrained_window_views_client.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" +#include "base/macros.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/ui/browser_finder.h" #include "components/web_modal/web_contents_modal_dialog_host.h"
diff --git a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc b/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc index e6ebf96c..107e66c 100644 --- a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc +++ b/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h" +#include "base/macros.h" +#include "build/build_config.h" #include "components/app_modal/javascript_dialog_manager.h" #include "components/app_modal/javascript_native_dialog_factory.h" #include "components/constrained_window/constrained_window_views.h"
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc index 52534d80..72f2401 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.cc +++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -10,6 +10,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser_window_state.h"
diff --git a/chrome/browser/ui/views/chrome_views_delegate.h b/chrome/browser/ui/views/chrome_views_delegate.h index d5363c9..9bc2a7d 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.h +++ b/chrome/browser/ui/views/chrome_views_delegate.h
@@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_ #define CHROME_BROWSER_UI_VIEWS_CHROME_VIEWS_DELEGATE_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/location.h" +#include "base/macros.h" #include "build/build_config.h" #include "ui/accessibility/ax_enums.h" #include "ui/views/views_delegate.h"
diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc index 10820d91..2fa3406 100644 --- a/chrome/browser/ui/views/collected_cookies_views.cc +++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/collected_cookies_views.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
diff --git a/chrome/browser/ui/views/collected_cookies_views.h b/chrome/browser/ui/views/collected_cookies_views.h index 168be74..04cbb28 100644 --- a/chrome/browser/ui/views/collected_cookies_views.h +++ b/chrome/browser/ui/views/collected_cookies_views.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_COLLECTED_COOKIES_VIEWS_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/ui/views/collected_cookies_views_browsertest.cc b/chrome/browser/ui/views/collected_cookies_views_browsertest.cc index e0c723f..1d7368db 100644 --- a/chrome/browser/ui/views/collected_cookies_views_browsertest.cc +++ b/chrome/browser/ui/views/collected_cookies_views_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/color_chooser_aura.cc b/chrome/browser/ui/views/color_chooser_aura.cc index f8d7602..0f35e99 100644 --- a/chrome/browser/ui/views/color_chooser_aura.cc +++ b/chrome/browser/ui/views/color_chooser_aura.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/color_chooser_aura.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/views/color_chooser_aura.h b/chrome/browser/ui/views/color_chooser_aura.h index cd045b8..b747f4b 100644 --- a/chrome/browser/ui/views/color_chooser_aura.h +++ b/chrome/browser/ui/views/color_chooser_aura.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_COLOR_CHOOSER_AURA_H_ #define CHROME_BROWSER_UI_VIEWS_COLOR_CHOOSER_AURA_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/color_chooser.h" #include "ui/views/color_chooser/color_chooser_listener.h"
diff --git a/chrome/browser/ui/views/color_chooser_dialog.cc b/chrome/browser/ui/views/color_chooser_dialog.cc index 25178f3..1a3557d 100644 --- a/chrome/browser/ui/views/color_chooser_dialog.cc +++ b/chrome/browser/ui/views/color_chooser_dialog.cc
@@ -7,6 +7,7 @@ #include <commdlg.h> #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/threading/thread.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ui/views/color_chooser_dialog.h b/chrome/browser/ui/views/color_chooser_dialog.h index 0173802..05515bb 100644 --- a/chrome/browser/ui/views/color_chooser_dialog.h +++ b/chrome/browser/ui/views/color_chooser_dialog.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_COLOR_CHOOSER_DIALOG_H_ #define CHROME_BROWSER_UI_VIEWS_COLOR_CHOOSER_DIALOG_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/ui/views/color_chooser_dialog.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/chrome/browser/ui/views/confirm_bubble_views.h b/chrome/browser/ui/views/confirm_bubble_views.h index 11375c6a..1cb79fc7 100644 --- a/chrome/browser/ui/views/confirm_bubble_views.h +++ b/chrome/browser/ui/views/confirm_bubble_views.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_CONFIRM_BUBBLE_VIEWS_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/views/controls/link_listener.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/conflicting_module_view_win.h b/chrome/browser/ui/views/conflicting_module_view_win.h index fa4e496..63794e5 100644 --- a/chrome/browser/ui/views/conflicting_module_view_win.h +++ b/chrome/browser/ui/views/conflicting_module_view_win.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_CONFLICTING_MODULE_VIEW_WIN_H_ #define CHROME_BROWSER_UI_VIEWS_CONFLICTING_MODULE_VIEW_WIN_H_ +#include "base/macros.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/views/bubble/bubble_delegate.h"
diff --git a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc index 66af068..12a9068 100644 --- a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc +++ b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
@@ -4,7 +4,9 @@ #include "chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc index 8262dbc..6785969 100644 --- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc +++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
@@ -4,7 +4,9 @@ #include "components/constrained_window/constrained_window_views.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/host_desktop.h"
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc index 3524261..6f454c1 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.cc +++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -10,6 +10,7 @@ #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/plugins/plugin_finder.h"
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.h b/chrome/browser/ui/views/content_setting_bubble_contents.h index c6bc636..e2dff9a 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.h +++ b/chrome/browser/ui/views/content_setting_bubble_contents.h
@@ -7,8 +7,8 @@ #include <map> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/media_stream_request.h"
diff --git a/chrome/browser/ui/views/cookie_info_view.h b/chrome/browser/ui/views/cookie_info_view.h index eed1ba9..1140138 100644 --- a/chrome/browser/ui/views/cookie_info_view.h +++ b/chrome/browser/ui/views/cookie_info_view.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/views/view.h"
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 3152d0b..995eba4 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/create_application_shortcut_view.h" +#include <stddef.h> + #include <algorithm> #include <cmath> @@ -12,6 +14,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" +#include "build/build_config.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.h b/chrome/browser/ui/views/create_application_shortcut_view.h index 3952bb1..98dff35a 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.h +++ b/chrome/browser/ui/views/create_application_shortcut_view.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/web_applications/web_app.h" #include "extensions/common/manifest_handlers/file_handler_info.h"
diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.h b/chrome/browser/ui/views/critical_notification_bubble_view.h index e7b8474..e06116f0 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.h +++ b/chrome/browser/ui/views/critical_notification_bubble_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_CRITICAL_NOTIFICATION_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_CRITICAL_NOTIFICATION_BUBBLE_VIEW_H_ +#include "base/macros.h" #include "base/timer/timer.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/button/button.h"
diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view.h b/chrome/browser/ui/views/crypto_module_password_dialog_view.h index eb243fb..8ab6df1 100644 --- a/chrome/browser/ui/views/crypto_module_password_dialog_view.h +++ b/chrome/browser/ui/views/crypto_module_password_dialog_view.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "chrome/browser/ui/crypto_module_password_dialog.h" #include "ui/views/controls/textfield/textfield_controller.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc index f1741ed..21e618c 100644 --- a/chrome/browser/ui/views/desktop_media_picker_views.cc +++ b/chrome/browser/ui/views/desktop_media_picker_views.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/ui/views/desktop_media_picker_views.h" +#include <stddef.h> + #include "base/callback.h" #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/media/desktop_media_list.h" #include "chrome/browser/ui/ash/ash_util.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/ui/views/desktop_media_picker_views.h b/chrome/browser/ui/views/desktop_media_picker_views.h index 5a978e75..a820ad9 100644 --- a/chrome/browser/ui/views/desktop_media_picker_views.h +++ b/chrome/browser/ui/views/desktop_media_picker_views.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_DESKTOP_MEDIA_PICKER_VIEWS_H_ +#include "base/macros.h" #include "chrome/browser/media/desktop_media_list_observer.h" #include "chrome/browser/media/desktop_media_picker.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/download/download_feedback_dialog_view.h b/chrome/browser/ui/views/download/download_feedback_dialog_view.h index d9b37b6a..7b24418 100644 --- a/chrome/browser/ui/views/download/download_feedback_dialog_view.h +++ b/chrome/browser/ui/views/download/download_feedback_dialog_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_FEEDBACK_DIALOG_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_FEEDBACK_DIALOG_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/controls/link_listener.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.h b/chrome/browser/ui/views/download/download_in_progress_dialog_view.h index e685748..62c1e1a 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.h +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_IN_PROGRESS_DIALOG_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_IN_PROGRESS_DIALOG_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/browser.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index a11d7ed0..20778df 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/download/download_item_view.h" +#include <stddef.h> + #include <algorithm> #include <vector>
diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h index 7504ce9b..4474524 100644 --- a/chrome/browser/ui/views/download/download_item_view.h +++ b/chrome/browser/ui/views/download/download_item_view.h
@@ -18,7 +18,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/views/download/download_item_view_md.cc b/chrome/browser/ui/views/download/download_item_view_md.cc index 7df05cfb..1fbd1304 100644 --- a/chrome/browser/ui/views/download/download_item_view_md.cc +++ b/chrome/browser/ui/views/download/download_item_view_md.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/download/download_item_view_md.h" +#include <stddef.h> + #include <algorithm> #include <vector> @@ -13,6 +15,7 @@ #include "base/i18n/break_iterator.h" #include "base/i18n/rtl.h" #include "base/location.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/views/download/download_item_view_md.h b/chrome/browser/ui/views/download/download_item_view_md.h index f069cda..196c0e7 100644 --- a/chrome/browser/ui/views/download/download_item_view_md.h +++ b/chrome/browser/ui/views/download/download_item_view_md.h
@@ -18,7 +18,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/views/download/download_shelf_context_menu_view.h b/chrome/browser/ui/views/download/download_shelf_context_menu_view.h index 09c94a1d..d6230fa 100644 --- a/chrome/browser/ui/views/download/download_shelf_context_menu_view.h +++ b/chrome/browser/ui/views/download/download_shelf_context_menu_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_SHELF_CONTEXT_MENU_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_SHELF_CONTEXT_MENU_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "chrome/browser/download/download_shelf_context_menu.h"
diff --git a/chrome/browser/ui/views/download/download_shelf_view.h b/chrome/browser/ui/views/download/download_shelf_view.h index 0be189c..2265ae9 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.h +++ b/chrome/browser/ui/views/download/download_shelf_view.h
@@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_ +#include <stddef.h> + #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/download/download_shelf.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/slide_animation.h"
diff --git a/chrome/browser/ui/views/download/download_started_animation_views.cc b/chrome/browser/ui/views/download/download_started_animation_views.cc index fabbe4be..20bd3cd 100644 --- a/chrome/browser/ui/views/download/download_started_animation_views.cc +++ b/chrome/browser/ui/views/download/download_started_animation_views.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/download/download_started_animation.h" +#include "base/macros.h" #include "content/public/browser/web_contents.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/ui/views/dropdown_bar_host.h b/chrome/browser/ui/views/dropdown_bar_host.h index c212158..481ed44c 100644 --- a/chrome/browser/ui/views/dropdown_bar_host.h +++ b/chrome/browser/ui/views/dropdown_bar_host.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_DROPDOWN_BAR_HOST_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/native_web_keyboard_event.h" #include "ui/gfx/animation/animation_delegate.h"
diff --git a/chrome/browser/ui/views/dropdown_bar_view.cc b/chrome/browser/ui/views/dropdown_bar_view.cc index 369f0e55..d2ea308c 100644 --- a/chrome/browser/ui/views/dropdown_bar_view.cc +++ b/chrome/browser/ui/views/dropdown_bar_view.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/dropdown_bar_view.h" +#include "base/macros.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/frame/browser_view.h"
diff --git a/chrome/browser/ui/views/dropdown_bar_view.h b/chrome/browser/ui/views/dropdown_bar_view.h index 08bdcdb2..27ffcda 100644 --- a/chrome/browser/ui/views/dropdown_bar_view.h +++ b/chrome/browser/ui/views/dropdown_bar_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_DROPDOWN_BAR_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_DROPDOWN_BAR_VIEW_H_ +#include "base/macros.h" #include "chrome/browser/ui/views/dropdown_bar_host.h" #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h" #include "ui/views/accessible_pane_view.h"
diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index 4b72aef..26ebc6757 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/edit_search_engine_dialog.h" +#include <stddef.h> + #include "base/i18n/case_conversion.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.h b/chrome/browser/ui/views/edit_search_engine_dialog.h index 0437949..511ad4c 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.h +++ b/chrome/browser/ui/views/edit_search_engine_dialog.h
@@ -10,6 +10,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_EDIT_SEARCH_ENGINE_DIALOG_H_ #define CHROME_BROWSER_UI_VIEWS_EDIT_SEARCH_ENGINE_DIALOG_H_ +#include "base/macros.h" #include "ui/views/controls/textfield/textfield_controller.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/elevation_icon_setter.cc b/chrome/browser/ui/views/elevation_icon_setter.cc index 356c71d..a10b8840 100644 --- a/chrome/browser/ui/views/elevation_icon_setter.cc +++ b/chrome/browser/ui/views/elevation_icon_setter.cc
@@ -6,6 +6,7 @@ #include "base/callback.h" #include "base/task_runner_util.h" +#include "build/build_config.h" #include "content/public/browser/browser_thread.h" #include "ui/views/controls/button/label_button.h"
diff --git a/chrome/browser/ui/views/elevation_icon_setter.h b/chrome/browser/ui/views/elevation_icon_setter.h index 7cb5c4d0..35d8865 100644 --- a/chrome/browser/ui/views/elevation_icon_setter.h +++ b/chrome/browser/ui/views/elevation_icon_setter.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_ELEVATION_ICON_SETTER_H_ #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/views/exclusive_access_bubble_views.cc b/chrome/browser/ui/views/exclusive_access_bubble_views.cc index fe7e770..64c4113d 100644 --- a/chrome/browser/ui/views/exclusive_access_bubble_views.cc +++ b/chrome/browser/ui/views/exclusive_access_bubble_views.cc
@@ -4,9 +4,11 @@ #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
diff --git a/chrome/browser/ui/views/exclusive_access_bubble_views.h b/chrome/browser/ui/views/exclusive_access_bubble_views.h index 07abcca..8feb2f5 100644 --- a/chrome/browser/ui/views/exclusive_access_bubble_views.h +++ b/chrome/browser/ui/views/exclusive_access_bubble_views.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_EXCLUSIVE_ACCESS_BUBBLE_VIEWS_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble.h" #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/ui/views/extensions/bookmark_app_bubble_view.cc b/chrome/browser/ui/views/extensions/bookmark_app_bubble_view.cc index dc81ed7..21a3632 100644 --- a/chrome/browser/ui/views/extensions/bookmark_app_bubble_view.cc +++ b/chrome/browser/ui/views/extensions/bookmark_app_bubble_view.cc
@@ -8,6 +8,7 @@ #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h b/chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h index 741a66e..5811455 100644 --- a/chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h +++ b/chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_BOOKMARK_APP_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_BOOKMARK_APP_BUBBLE_VIEW_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/web_application_info.h"
diff --git a/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc b/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc index ab2a0eeb..dc1ed28a 100644 --- a/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc +++ b/chrome/browser/ui/views/extensions/bookmark_override_browsertest.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 "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/api/commands/command_service.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc index 7763890..1e67be8 100644 --- a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc +++ b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" +#include <stdint.h> + #include "base/logging.h" #include "base/pickle.h" #include "base/strings/string_util.h" @@ -99,7 +101,7 @@ if (!data_iterator.ReadString(&id_)) return false; - uint64 index; + uint64_t index; if (!data_iterator.ReadUInt64(&index)) return false; index_ = static_cast<size_t>(index);
diff --git a/chrome/browser/ui/views/extensions/browser_action_drag_data.h b/chrome/browser/ui/views/extensions/browser_action_drag_data.h index ceebe79d..51851aa6 100644 --- a/chrome/browser/ui/views/extensions/browser_action_drag_data.h +++ b/chrome/browser/ui/views/extensions/browser_action_drag_data.h
@@ -5,9 +5,11 @@ #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_BROWSER_ACTION_DRAG_DATA_H_ #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_BROWSER_ACTION_DRAG_DATA_H_ +#include <stddef.h> + #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #if defined(TOOLKIT_VIEWS) #include "ui/base/dragdrop/os_exchange_data.h"
diff --git a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc b/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc index c9ff7750..f192c05 100644 --- a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/bundle_installed_bubble.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 "base/macros.h" #include "chrome/browser/extensions/bundle_installer.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/frame/browser_view.h"
diff --git a/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.h b/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.h index 4faa0d7..3da2ef9 100644 --- a/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.h +++ b/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_ACTION_PLATFORM_DELEGATE_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_ACTION_PLATFORM_DELEGATE_VIEWS_H_ +#include "base/macros.h" #include "chrome/browser/ui/extensions/extension_action_platform_delegate.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/ui/views/extensions/extension_dialog.h b/chrome/browser/ui/views/extensions/extension_dialog.h index a5de7fc..7cdd985 100644 --- a/chrome/browser/ui/views/extensions/extension_dialog.h +++ b/chrome/browser/ui/views/extensions/extension_dialog.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_DIALOG_H_ #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc index e43bd823..d67eb8e 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
@@ -4,14 +4,16 @@ #include "chrome/browser/ui/views/extensions/extension_install_dialog_view.h" +#include <stddef.h> + #include <algorithm> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.h b/chrome/browser/ui/views/extensions/extension_install_dialog_view.h index 2f15b36e..d0ee5a2 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.h +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_INSTALL_DIALOG_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_INSTALL_DIALOG_VIEW_H_ +#include "base/macros.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/slide_animation.h"
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc index 13a1b642..ca0a6f0 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/extensions/extension_install_dialog_view.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_icon_manager.h"
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc index 205d6adb..fd35fec 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <string> +#include "base/macros.h" #include "base/metrics/user_metrics_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h index 9f73a653..1c60898 100644 --- a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h +++ b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/extensions/extension_keybinding_registry.h" #include "ui/base/accelerators/accelerator.h"
diff --git a/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc index e2bb2886..3cfbe16 100644 --- a/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.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 "base/macros.h" #include "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h" #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h" #include "chrome/browser/ui/views/frame/browser_view.h"
diff --git a/chrome/browser/ui/views/extensions/extension_popup.h b/chrome/browser/ui/views/extensions/extension_popup.h index cf590cc..8e6259f 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.h +++ b/chrome/browser/ui/views/extensions/extension_popup.h
@@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/views/extensions/extension_view_views.h" #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/ui/views/extensions/extension_popup_aura.h b/chrome/browser/ui/views/extensions/extension_popup_aura.h index d9b8e50..431fa021 100644 --- a/chrome/browser/ui/views/extensions/extension_popup_aura.h +++ b/chrome/browser/ui/views/extensions/extension_popup_aura.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_POPUP_AURA_H_ #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_POPUP_AURA_H_ +#include "base/macros.h" #include "chrome/browser/ui/views/extensions/extension_popup.h" #include "ui/wm/public/activation_change_observer.h"
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc index 49486ca..53ed957 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/extension_uninstall_dialog.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc index d6b8199..1aceb3c 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.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 "base/macros.h" #include "base/run_loop.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/extensions/extension_view_views.h b/chrome/browser/ui/views/extensions/extension_view_views.h index f3b8854..251dd6b 100644 --- a/chrome/browser/ui/views/extensions/extension_view_views.h +++ b/chrome/browser/ui/views/extensions/extension_view_views.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_VIEW_VIEWS_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/extensions/extension_view.h" #include "content/public/browser/native_web_keyboard_event.h" #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc index 638d63c..db71475 100644 --- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc +++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/ui/views/extensions/media_galleries_dialog_views.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h index 136e6eef..f4097320 100644 --- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h +++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h
@@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "chrome/browser/media_galleries/media_galleries_dialog_controller.h" #include "ui/views/context_menu_controller.h" #include "ui/views/controls/button/button.h"
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc index 99c4c739..d14182f9 100644 --- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc +++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock.h"
diff --git a/chrome/browser/ui/views/external_protocol_dialog.h b/chrome/browser/ui/views/external_protocol_dialog.h index a032da6..6532be9 100644 --- a/chrome/browser/ui/views/external_protocol_dialog.h +++ b/chrome/browser/ui/views/external_protocol_dialog.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_EXTERNAL_PROTOCOL_DIALOG_H_ #define CHROME_BROWSER_UI_VIEWS_EXTERNAL_PROTOCOL_DIALOG_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "ui/views/window/dialog_delegate.h" #include "url/gurl.h"
diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index e8c9d2b..283d963 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc
@@ -6,6 +6,7 @@ #include <algorithm> +#include "build/build_config.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/find_bar/find_tab_helper.h" #include "chrome/browser/ui/view_ids.h"
diff --git a/chrome/browser/ui/views/find_bar_host.h b/chrome/browser/ui/views/find_bar_host.h index f0b5de3..af05861 100644 --- a/chrome/browser/ui/views/find_bar_host.h +++ b/chrome/browser/ui/views/find_bar_host.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_FIND_BAR_HOST_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/ui/views/dropdown_bar_host.h" #include "chrome/browser/ui/views/find_bar_view.h"
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index 1fd5b592..6e5e672 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -6,6 +6,7 @@ #include <algorithm> +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/find_bar_view.h b/chrome/browser/ui/views/find_bar_view.h index b26c753..a584385 100644 --- a/chrome/browser/ui/views/find_bar_view.h +++ b/chrome/browser/ui/views/find_bar_view.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/ui/views/dropdown_bar_view.h"
diff --git a/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc index e3328366..bd706d65 100644 --- a/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc
@@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h"
diff --git a/chrome/browser/ui/views/first_run_bubble_unittest.cc b/chrome/browser/ui/views/first_run_bubble_unittest.cc index ee15d52..7cdf5f8 100644 --- a/chrome/browser/ui/views/first_run_bubble_unittest.cc +++ b/chrome/browser/ui/views/first_run_bubble_unittest.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 "base/macros.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/views/first_run_bubble.h" #include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/ui/views/first_run_dialog.h b/chrome/browser/ui/views/first_run_dialog.h index 31f68bb9..91fe12e 100644 --- a/chrome/browser/ui/views/first_run_dialog.h +++ b/chrome/browser/ui/views/first_run_dialog.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_FIRST_RUN_DIALOG_H_ #include "base/callback.h" +#include "base/macros.h" #include "ui/views/controls/link_listener.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/frame/browser_command_handler_linux.h b/chrome/browser/ui/views/frame/browser_command_handler_linux.h index 5284fdb..9ffa036d 100644 --- a/chrome/browser/ui/views/frame/browser_command_handler_linux.h +++ b/chrome/browser/ui/views/frame/browser_command_handler_linux.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_COMMAND_HANDLER_LINUX_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_COMMAND_HANDLER_LINUX_H_ +#include "base/macros.h" #include "ui/events/event_handler.h" class BrowserView;
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc index 45a1b062..2e88804 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc
@@ -6,6 +6,7 @@ #include <dwmapi.h> +#include "base/macros.h" #include "base/process/process_handle.h" #include "base/win/windows_version.h" #include "chrome/browser/lifetime/application_lifetime.h"
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h index 4a4409a..81314c5 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h
@@ -8,6 +8,7 @@ #include <windows.h> #include <uxtheme.h> +#include "base/macros.h" #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h" #include "chrome/browser/ui/views/frame/minimize_button_metrics_win.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc index 3b0cfae0..464b3191 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h" +#include "base/macros.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/views/frame/browser_frame.h"
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h index ed1d095..ca0db90 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_X11_H_ +#include "base/macros.h" #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h" #include "chrome/browser/ui/views/frame/global_menu_bar_x11.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc index e27a168..8334cd50 100644 --- a/chrome/browser/ui/views/frame/browser_frame.cc +++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -6,6 +6,7 @@ #include "base/debug/leak_annotations.h" #include "base/i18n/rtl.h" +#include "build/build_config.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h"
diff --git a/chrome/browser/ui/views/frame/browser_frame.h b/chrome/browser/ui/views/frame/browser_frame.h index e90ea90..a7cc7645 100644 --- a/chrome/browser/ui/views/frame/browser_frame.h +++ b/chrome/browser/ui/views/frame/browser_frame.h
@@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "build/build_config.h" #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" #include "ui/views/context_menu_controller.h"
diff --git a/chrome/browser/ui/views/frame/browser_frame_android.h b/chrome/browser/ui/views/frame/browser_frame_android.h index f711d41..665059e 100644 --- a/chrome/browser/ui/views/frame/browser_frame_android.h +++ b/chrome/browser/ui/views/frame/browser_frame_android.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ANDROID_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ANDROID_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/views/frame/native_browser_frame.h" #include "ui/aura/window_tree_host_platform.h"
diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.cc b/chrome/browser/ui/views/frame/browser_frame_ash.cc index 22f2a99..b2be81d 100644 --- a/chrome/browser/ui/views/frame/browser_frame_ash.cc +++ b/chrome/browser/ui/views/frame/browser_frame_ash.cc
@@ -9,6 +9,8 @@ #include "ash/wm/window_state.h" #include "ash/wm/window_state_delegate.h" #include "ash/wm/window_util.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/views/frame/browser_shutdown.h"
diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.h b/chrome/browser/ui/views/frame/browser_frame_ash.h index b14f738..64072d1 100644 --- a/chrome/browser/ui/views/frame/browser_frame_ash.h +++ b/chrome/browser/ui/views/frame/browser_frame_ash.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ASH_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ASH_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/views/frame/native_browser_frame.h" #include "ui/views/widget/native_widget_aura.h"
diff --git a/chrome/browser/ui/views/frame/browser_frame_ashwin.h b/chrome/browser/ui/views/frame/browser_frame_ashwin.h index 2352689..9411852f 100644 --- a/chrome/browser/ui/views/frame/browser_frame_ashwin.h +++ b/chrome/browser/ui/views/frame/browser_frame_ashwin.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ASHWIN_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ASHWIN_H_ +#include "base/macros.h" #include "chrome/browser/ui/views/frame/browser_frame_ash.h" // A NativeWidgetAura subclass that provides Windows-specific behavior on the
diff --git a/chrome/browser/ui/views/frame/browser_frame_mac.h b/chrome/browser/ui/views/frame/browser_frame_mac.h index bee39dd..f456585c 100644 --- a/chrome/browser/ui/views/frame/browser_frame_mac.h +++ b/chrome/browser/ui/views/frame/browser_frame_mac.h
@@ -8,6 +8,7 @@ #include "chrome/browser/ui/views/frame/native_browser_frame.h" #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "ui/views/widget/native_widget_mac.h" class BrowserFrame;
diff --git a/chrome/browser/ui/views/frame/browser_frame_mus.cc b/chrome/browser/ui/views/frame/browser_frame_mus.cc index d0ec71f..40c9505 100644 --- a/chrome/browser/ui/views/frame/browser_frame_mus.cc +++ b/chrome/browser/ui/views/frame/browser_frame_mus.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/frame/browser_frame_mus.h" +#include <stdint.h> + #include "chrome/browser/ui/views/frame/browser_frame.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "components/mus/public/cpp/window.h"
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.h b/chrome/browser/ui/views/frame/browser_header_painter_ash.h index 3f4e7a9..821510b 100644 --- a/chrome/browser/ui/views/frame/browser_header_painter_ash.h +++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.h
@@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_ #include "ash/frame/header_painter.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" // override +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/animation/animation_delegate.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc index 57297eea..6b0ed39 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/avatar_menu.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc index ce10108..5349b06 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -12,6 +12,7 @@ #include "ash/frame/header_painter_util.h" #include "ash/shell.h" #include "base/profiler/scoped_tracker.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profiles_state.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h index 0361acd..0b9b6c8 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
@@ -7,6 +7,7 @@ #include "ash/shell_observer.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" #include "chrome/browser/ui/views/tab_icon_view_model.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc index 0c8e4a5..446a0005 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
@@ -11,6 +11,7 @@ #include "ash/shell.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "base/command_line.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc index 918be4f..5db9a7f3 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h" +#include "build/build_config.h" #include "chrome/browser/ui/views/frame/browser_view.h" #if defined(MOJO_SHELL_CLIENT)
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.h b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.h index 4f5739f52..dd230c2 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.h +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_MAC_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_MAC_H_ +#include "base/macros.h" #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" class BrowserNonClientFrameViewMac : public BrowserNonClientFrameView {
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc index a6410b5e..caa730a 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include "base/profiler/scoped_tracker.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profiles_state.h"
diff --git a/chrome/browser/ui/views/frame/browser_root_view.h b/chrome/browser/ui/views/frame/browser_root_view.h index 6849bb0..e2678fda 100644 --- a/chrome/browser/ui/views/frame/browser_root_view.h +++ b/chrome/browser/ui/views/frame/browser_root_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_ROOT_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_ROOT_VIEW_H_ +#include "base/macros.h" #include "ui/views/widget/root_view.h" class BrowserView;
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 9bc227c..b26c1727 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -4,12 +4,15 @@ #include "chrome/browser/ui/views/frame/browser_view.h" +#include <stdint.h> + #include <algorithm> #include "base/auto_reset.h" #include "base/command_line.h" #include "base/i18n/rtl.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" @@ -17,6 +20,7 @@ #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/app_mode/app_mode_utils.h" @@ -431,7 +435,7 @@ } // While animating, set opacity to cross-fade between attached and detached // backgrounds including their respective separators. - int detached_alpha = static_cast<uint8>(current_state * 255); + int detached_alpha = static_cast<uint8_t>(current_state * 255); int attached_alpha = 255 - detached_alpha; if (browser_->bookmark_bar_state() == BookmarkBar::DETACHED) { // To animate from attached to detached state:
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index 5934603f..04a9549 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -11,6 +11,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/frame/browser_view_browsertest.cc b/chrome/browser/ui/views/frame/browser_view_browsertest.cc index 07ce798..15fead8 100644 --- a/chrome/browser/ui/views/frame/browser_view_browsertest.cc +++ b/chrome/browser/ui/views/frame/browser_view_browsertest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/frame/browser_view.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/devtools/devtools_window_testing.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc index 4797340b..4cbe787 100644 --- a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/frame/browser_view.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc index 5c5e792..1d7e91e1 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.cc +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/frame/browser_view_layout.h" +#include "base/macros.h" #include "base/observer_list.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.h b/chrome/browser/ui/views/frame/browser_view_layout.h index 0f4eb35e..8528093 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.h +++ b/chrome/browser/ui/views/frame/browser_view_layout.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/layout/layout_manager.h"
diff --git a/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc b/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc index 5befe13d..33dc653 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc +++ b/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/frame/browser_view_layout.h" +#include "base/macros.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h" #include "chrome/browser/ui/views/frame/contents_layout_manager.h"
diff --git a/chrome/browser/ui/views/frame/browser_view_unittest.cc b/chrome/browser/ui/views/frame/browser_view_unittest.cc index ab66a8e..3ef5d89 100644 --- a/chrome/browser/ui/views/frame/browser_view_unittest.cc +++ b/chrome/browser/ui/views/frame/browser_view_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/frame/browser_view.h" +#include "base/macros.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/layout_constants.h"
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc index a7b7c15..799fb73b 100644 --- a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc +++ b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
@@ -7,8 +7,10 @@ #include <shlobj.h> // Must be before propkey. #include <propkey.h> #include <shellapi.h> +#include <stddef.h> #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "base/win/scoped_comptr.h"
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_win.h b/chrome/browser/ui/views/frame/browser_window_property_manager_win.h index c626ce1..e7f968ac 100644 --- a/chrome/browser/ui/views/frame/browser_window_property_manager_win.h +++ b/chrome/browser/ui/views/frame/browser_window_property_manager_win.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_WINDOW_PROPERTY_MANAGER_WIN_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_WINDOW_PROPERTY_MANAGER_WIN_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/ui/views/frame/contents_layout_manager.h b/chrome/browser/ui/views/frame/contents_layout_manager.h index b9b3749..9bd85400 100644 --- a/chrome/browser/ui/views/frame/contents_layout_manager.h +++ b/chrome/browser/ui/views/frame/contents_layout_manager.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_LAYOUT_MANAGER_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_LAYOUT_MANAGER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h" #include "ui/views/layout/layout_manager.h"
diff --git a/chrome/browser/ui/views/frame/contents_web_view.h b/chrome/browser/ui/views/frame/contents_web_view.h index 6cc7d68..9cde2a3 100644 --- a/chrome/browser/ui/views/frame/contents_web_view.h +++ b/chrome/browser/ui/views/frame/contents_web_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_WEB_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_WEB_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/views/frame/web_contents_close_handler_delegate.h" #include "ui/compositor/layer_owner_delegate.h"
diff --git a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h index 3591de6..64c69568 100644 --- a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h +++ b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/views/frame/native_browser_frame.h" #include "ui/views/context_menu_controller.h"
diff --git a/chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h b/chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h index 428c722..aaaec24b 100644 --- a/chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h +++ b/chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURALINUX_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURALINUX_H_ +#include "base/macros.h" #include "base/prefs/pref_member.h" #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.h b/chrome/browser/ui/views/frame/glass_browser_frame_view.h index 3a3d3ec..0f21f18 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.h +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/win/scoped_gdi_object.h" #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" #include "ui/views/controls/button/button.h"
diff --git a/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h b/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h index 694f776..55c10d7 100644 --- a/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h +++ b/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h
@@ -9,7 +9,7 @@ #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "ui/base/glib/glib_signal.h"
diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc index b89ede7..236d8b2 100644 --- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc +++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
@@ -6,9 +6,11 @@ #include <dlfcn.h> #include <glib-object.h> +#include <stddef.h> #include "base/debug/leak_annotations.h" #include "base/logging.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.h b/chrome/browser/ui/views/frame/global_menu_bar_x11.h index 0d80f6b..0fe689b 100644 --- a/chrome/browser/ui/views/frame/global_menu_bar_x11.h +++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.h
@@ -9,6 +9,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/scoped_observer.h"
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller.h b/chrome/browser/ui/views/frame/immersive_mode_controller.h index 21aca58..9389fb2 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller.h +++ b/chrome/browser/ui/views/frame/immersive_mode_controller.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/observer_list.h" #include "chrome/browser/ui/host_desktop.h"
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc index 31fda808..14b1d2e 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
@@ -7,6 +7,7 @@ #include "ash/shell.h" #include "ash/wm/immersive_revealed_lock.h" #include "ash/wm/window_state.h" +#include "base/macros.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h index e6dfe31..610d5041 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h
@@ -9,6 +9,7 @@ #include "ash/wm/immersive_fullscreen_controller.h" #include "ash/wm/window_state_observer.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc index 2a27679..f33ec1b 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc
@@ -11,6 +11,7 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/command_line.h" +#include "base/macros.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_stub.h b/chrome/browser/ui/views/frame/immersive_mode_controller_stub.h index f7d0f3e..c011dc41 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_stub.h +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_stub.h
@@ -7,8 +7,8 @@ #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" // Stub implementation of ImmersiveModeController for platforms which do not // support immersive mode yet.
diff --git a/chrome/browser/ui/views/frame/minimize_button_metrics_win.h b/chrome/browser/ui/views/frame/minimize_button_metrics_win.h index 6fb6d353..0b331cbe 100644 --- a/chrome/browser/ui/views/frame/minimize_button_metrics_win.h +++ b/chrome/browser/ui/views/frame/minimize_button_metrics_win.h
@@ -7,7 +7,7 @@ #include <windows.h> -#include "base/basictypes.h" +#include "base/macros.h" // Class that implements obtaining the X coordinate of the native minimize // button for the native frame on Windows.
diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory.cc b/chrome/browser/ui/views/frame/native_browser_frame_factory.cc index a6265a3..45b1c75 100644 --- a/chrome/browser/ui/views/frame/native_browser_frame_factory.cc +++ b/chrome/browser/ui/views/frame/native_browser_frame_factory.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h" +#include "build/build_config.h" #include "chrome/browser/ui/views/frame/native_browser_frame.h" namespace {
diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory.h b/chrome/browser/ui/views/frame/native_browser_frame_factory.h index 5900735..77ac886 100644 --- a/chrome/browser/ui/views/frame/native_browser_frame_factory.h +++ b/chrome/browser/ui/views/frame/native_browser_frame_factory.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_NATIVE_BROWSER_FRAME_FACTORY_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_NATIVE_BROWSER_FRAME_FACTORY_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/ui/host_desktop.h" class BrowserFrame;
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index d443540..89e89cd9 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -11,6 +11,7 @@ #include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profiles_state.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/views/frame/browser_frame.h"
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h index fdea694..9e503da 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/frame/browser_frame.h"
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc index b26381a..5752c1a5 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h" #include "base/command_line.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profiles_state.h" #include "chrome/browser/ui/layout_constants.h" #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h index 30f3d97..69ad3e3 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_ +#include "base/macros.h" #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" #include "ui/views/layout/layout_manager.h" #include "ui/views/window/frame_buttons.h"
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc index c3bca787..b784c1fe 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h" -#include "base/basictypes.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" #include "chrome/browser/ui/views/tab_icon_view.h"
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.h index 935e7801..6330077 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.h +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LINUX_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LINUX_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.h" #include "ui/views/linux_ui/window_button_order_observer.h"
diff --git a/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h b/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h index b1bc124..0a8b5e3 100644 --- a/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h +++ b/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_INSERTION_DELEGATE_WIN_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_INSERTION_DELEGATE_WIN_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/controls/menu/menu_insertion_delegate_win.h" // SystemMenuInsertionDelegateWin is used to determine the index to insert menu
diff --git a/chrome/browser/ui/views/frame/system_menu_model_builder.cc b/chrome/browser/ui/views/frame/system_menu_model_builder.cc index ea0d1cb..a671d8f 100644 --- a/chrome/browser/ui/views/frame/system_menu_model_builder.cc +++ b/chrome/browser/ui/views/frame/system_menu_model_builder.cc
@@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/host_desktop.h"
diff --git a/chrome/browser/ui/views/frame/system_menu_model_builder.h b/chrome/browser/ui/views/frame/system_menu_model_builder.h index d12dc336..c23e3fb 100644 --- a/chrome/browser/ui/views/frame/system_menu_model_builder.h +++ b/chrome/browser/ui/views/frame/system_menu_model_builder.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_BUILDER_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_BUILDER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
diff --git a/chrome/browser/ui/views/frame/system_menu_model_delegate.h b/chrome/browser/ui/views/frame/system_menu_model_delegate.h index 750d43d..49b0d8f 100644 --- a/chrome/browser/ui/views/frame/system_menu_model_delegate.h +++ b/chrome/browser/ui/views/frame/system_menu_model_delegate.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_DELEGATE_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/browser.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/models/simple_menu_model.h"
diff --git a/chrome/browser/ui/views/frame/test_with_browser_view.cc b/chrome/browser/ui/views/frame/test_with_browser_view.cc index 0867c92..1d2de85 100644 --- a/chrome/browser/ui/views/frame/test_with_browser_view.cc +++ b/chrome/browser/ui/views/frame/test_with_browser_view.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/frame/test_with_browser_view.h" +#include "build/build_config.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" #include "chrome/browser/history/history_service_factory.h"
diff --git a/chrome/browser/ui/views/frame/test_with_browser_view.h b/chrome/browser/ui/views/frame/test_with_browser_view.h index a77cb5b..611ff08 100644 --- a/chrome/browser/ui/views/frame/test_with_browser_view.h +++ b/chrome/browser/ui/views/frame/test_with_browser_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/test/base/browser_with_test_window_test.h"
diff --git a/chrome/browser/ui/views/frame/top_container_view.h b/chrome/browser/ui/views/frame/top_container_view.h index d878bc8..2623de4 100644 --- a/chrome/browser/ui/views/frame/top_container_view.h +++ b/chrome/browser/ui/views/frame/top_container_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_TOP_CONTAINER_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_TOP_CONTAINER_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/view.h" class BrowserView;
diff --git a/chrome/browser/ui/views/frame/web_app_left_header_view_ash.h b/chrome/browser/ui/views/frame/web_app_left_header_view_ash.h index 708ffb3..21eb01ad 100644 --- a/chrome/browser/ui/views/frame/web_app_left_header_view_ash.h +++ b/chrome/browser/ui/views/frame/web_app_left_header_view_ash.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_FRAME_WEB_APP_LEFT_HEADER_VIEW_ASH_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "ui/views/controls/button/button.h" class BrowserView;
diff --git a/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc b/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc index ed4ae5a..50f1178 100644 --- a/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc +++ b/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc
@@ -6,6 +6,7 @@ #include "ash/frame/caption_buttons/frame_caption_button.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/ui/toolbar/test_toolbar_model.h" #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
diff --git a/chrome/browser/ui/views/frame/web_contents_close_handler.h b/chrome/browser/ui/views/frame/web_contents_close_handler.h index 2beccbf7..2e8a7e2 100644 --- a/chrome/browser/ui/views/frame/web_contents_close_handler.h +++ b/chrome/browser/ui/views/frame/web_contents_close_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_WEB_CONTENTS_CLOSE_HANDLER_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_WEB_CONTENTS_CLOSE_HANDLER_H_ +#include "base/macros.h" #include "base/timer/timer.h" class WebContentsCloseHandlerDelegate;
diff --git a/chrome/browser/ui/views/frame/web_contents_close_handler_delegate.h b/chrome/browser/ui/views/frame/web_contents_close_handler_delegate.h index 83f0e67..36c0f6a 100644 --- a/chrome/browser/ui/views/frame/web_contents_close_handler_delegate.h +++ b/chrome/browser/ui/views/frame/web_contents_close_handler_delegate.h
@@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_WEB_CONTENTS_CLOSE_HANDLER_DELEGATE_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_WEB_CONTENTS_CLOSE_HANDLER_DELEGATE_H_ -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" namespace ui {
diff --git a/chrome/browser/ui/views/frame/web_contents_close_handler_unittest.cc b/chrome/browser/ui/views/frame/web_contents_close_handler_unittest.cc index df6763ab..0ff0896f 100644 --- a/chrome/browser/ui/views/frame/web_contents_close_handler_unittest.cc +++ b/chrome/browser/ui/views/frame/web_contents_close_handler_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/ui/views/frame/web_contents_close_handler_delegate.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc index 90d6efa..7d46d547 100644 --- a/chrome/browser/ui/views/global_error_bubble_view.cc +++ b/chrome/browser/ui/views/global_error_bubble_view.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/global_error_bubble_view.h" +#include <stddef.h> + #include <vector> #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/global_error_bubble_view.h b/chrome/browser/ui/views/global_error_bubble_view.h index b55dd45..e1481c8 100644 --- a/chrome/browser/ui/views/global_error_bubble_view.h +++ b/chrome/browser/ui/views/global_error_bubble_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_GLOBAL_ERROR_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_GLOBAL_ERROR_BUBBLE_VIEW_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h" #include "ui/views/bubble/bubble_delegate.h"
diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index c59a58a..1b47948 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -6,6 +6,7 @@ #include "base/i18n/rtl.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
diff --git a/chrome/browser/ui/views/hung_renderer_view.h b/chrome/browser/ui/views/hung_renderer_view.h index 9c216eb..d87a945 100644 --- a/chrome/browser/ui/views/hung_renderer_view.h +++ b/chrome/browser/ui/views/hung_renderer_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_HUNG_RENDERER_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_HUNG_RENDERER_VIEW_H_ +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "components/favicon/content/content_favicon_driver.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/ui/views/importer/import_lock_dialog_view.h b/chrome/browser/ui/views/importer/import_lock_dialog_view.h index 8324e0c..c69140a 100644 --- a/chrome/browser/ui/views/importer/import_lock_dialog_view.h +++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORT_LOCK_DIALOG_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORT_LOCK_DIALOG_VIEW_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ui/views/view.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.cc b/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.cc index 822226c..1aaa2ac4 100644 --- a/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.cc +++ b/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/infobars/alternate_nav_infobar_view.h" +#include <stddef.h> + #include "base/logging.h" #include "chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h" #include "ui/base/window_open_disposition.h"
diff --git a/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.h b/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.h index ee9e05f..fb7e519b 100644 --- a/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.h +++ b/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_ALTERNATE_NAV_INFOBAR_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_INFOBARS_ALTERNATE_NAV_INFOBAR_VIEW_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/views/infobars/infobar_view.h" #include "ui/views/controls/link_listener.h"
diff --git a/chrome/browser/ui/views/infobars/confirm_infobar.h b/chrome/browser/ui/views/infobars/confirm_infobar.h index 614acd1..76335054 100644 --- a/chrome/browser/ui/views/infobars/confirm_infobar.h +++ b/chrome/browser/ui/views/infobars/confirm_infobar.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_CONFIRM_INFOBAR_H_ #define CHROME_BROWSER_UI_VIEWS_INFOBARS_CONFIRM_INFOBAR_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/views/infobars/infobar_view.h" #include "ui/views/controls/link_listener.h"
diff --git a/chrome/browser/ui/views/infobars/infobar_background.h b/chrome/browser/ui/views/infobars/infobar_background.h index f21538c..631c3df7 100644 --- a/chrome/browser/ui/views/infobars/infobar_background.h +++ b/chrome/browser/ui/views/infobars/infobar_background.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_BACKGROUND_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/infobars/core/infobar_delegate.h" #include "ui/views/background.h"
diff --git a/chrome/browser/ui/views/infobars/infobar_container_view.h b/chrome/browser/ui/views/infobars/infobar_container_view.h index 0ffc46b..c4cce1f 100644 --- a/chrome/browser/ui/views/infobars/infobar_container_view.h +++ b/chrome/browser/ui/views/infobars/infobar_container_view.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_CONTAINER_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_CONTAINER_VIEW_H_ +#include <stddef.h> + +#include "base/macros.h" #include "components/infobars/core/infobar_container.h" #include "ui/views/accessible_pane_view.h"
diff --git a/chrome/browser/ui/views/infobars/infobar_view.h b/chrome/browser/ui/views/infobars/infobar_view.h index 39085f2..30f9726 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.h +++ b/chrome/browser/ui/views/infobars/infobar_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/infobars/core/infobar.h" #include "components/infobars/core/infobar_container.h" #include "third_party/skia/include/core/SkPath.h"
diff --git a/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h b/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h index 4b285838..8d10340 100644 --- a/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h +++ b/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_X11_H_ #define CHROME_BROWSER_UI_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_X11_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/app_modal/views/javascript_app_modal_dialog_views.h"
diff --git a/chrome/browser/ui/views/javascript_app_modal_event_blocker_x11.h b/chrome/browser/ui/views/javascript_app_modal_event_blocker_x11.h index a31d491..0832048 100644 --- a/chrome/browser/ui/views/javascript_app_modal_event_blocker_x11.h +++ b/chrome/browser/ui/views/javascript_app_modal_event_blocker_x11.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_JAVASCRIPT_APP_MODAL_EVENT_BLOCKER_X11_H_ #define CHROME_BROWSER_UI_VIEWS_JAVASCRIPT_APP_MODAL_EVENT_BLOCKER_X11_H_ +#include "base/macros.h" #include "ui/events/event_handler.h" class BrowserView;
diff --git a/chrome/browser/ui/views/keyboard_access_browsertest.cc b/chrome/browser/ui/views/keyboard_access_browsertest.cc index 1e9939c..0e2b462 100644 --- a/chrome/browser/ui/views/keyboard_access_browsertest.cc +++ b/chrome/browser/ui/views/keyboard_access_browsertest.cc
@@ -6,10 +6,12 @@ // toolkit_views is defined (i.e. for Chrome OS). It's not needed // on the Mac, and it's not yet implemented on Linux. +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_util.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.cc b/chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.cc index 41742d9a..50104f9 100644 --- a/chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.cc +++ b/chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.h" +#include "base/macros.h" #include "ui/aura/client/screen_position_client.h" #include "ui/events/event.h" #include "ui/events/event_processor.h"
diff --git a/chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.h b/chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.h index e48dee2..a97233a 100644 --- a/chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.h +++ b/chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_LINK_DISAMBIGUATION_LINK_DISAMBIGUATION_POPUP_H_ #define CHROME_BROWSER_UI_VIEWS_LINK_DISAMBIGUATION_LINK_DISAMBIGUATION_POPUP_H_ +#include "base/macros.h" #include "content/public/browser/web_contents_view_delegate.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/widget/widget.h"
diff --git a/chrome/browser/ui/views/load_complete_listener.h b/chrome/browser/ui/views/load_complete_listener.h index d96194f..74b04e7a5 100644 --- a/chrome/browser/ui/views/load_complete_listener.h +++ b/chrome/browser/ui/views/load_complete_listener.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_LOAD_COMPLETE_LISTENER_H_ #define CHROME_BROWSER_UI_VIEWS_LOAD_COMPLETE_LISTENER_H_ -#include "base/basictypes.h" #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/chrome/browser/ui/views/location_bar/bubble_icon_view.h b/chrome/browser/ui/views/location_bar/bubble_icon_view.h index 47b9f80b..30df952 100644 --- a/chrome/browser/ui/views/location_bar/bubble_icon_view.h +++ b/chrome/browser/ui/views/location_bar/bubble_icon_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_BUBBLE_ICON_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_BUBBLE_ICON_VIEW_H_ +#include "base/macros.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/vector_icons_public.h" #include "ui/views/controls/image_view.h"
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h index aefdbee..c8ab04a 100644 --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/content_settings/content_setting_image_model.h" #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h"
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h index 7b6bfbbc7..44d2168 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/size.h"
diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc index 80f4d17..f855868 100644 --- a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc +++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h" +#include <stddef.h> + #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.h b/chrome/browser/ui/views/location_bar/keyword_hint_view.h index dfde9f29..e918c16 100644 --- a/chrome/browser/ui/views/location_bar/keyword_hint_view.h +++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/gfx/geometry/size.h" #include "ui/views/view.h"
diff --git a/chrome/browser/ui/views/location_bar/location_bar_decoration_view.h b/chrome/browser/ui/views/location_bar/location_bar_decoration_view.h index 9bc9836..3f73081 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_decoration_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_decoration_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_DECORATION_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_DECORATION_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/controls/image_view.h" ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/location_bar/location_bar_layout.h b/chrome/browser/ui/views/location_bar/location_bar_layout.h index dd008fb..d6b8aa85 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_layout.h +++ b/chrome/browser/ui/views/location_bar/location_bar_layout.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_LAYOUT_H_ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_LAYOUT_H_ +#include "base/macros.h" #include "base/memory/scoped_vector.h" namespace gfx {
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index dc609309..0e78556 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -11,6 +11,7 @@ #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/defaults.h"
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h index 68cf65b..0bf3d44 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ +#include <stddef.h> + #include <string> #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_member.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/ssl/security_state_model.h"
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.h b/chrome/browser/ui/views/location_bar/location_icon_view.h index 6e25c96..5fe4e5f 100644 --- a/chrome/browser/ui/views/location_bar/location_icon_view.h +++ b/chrome/browser/ui/views/location_bar/location_icon_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_ +#include "base/macros.h" #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h" class LocationBarView;
diff --git a/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h b/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h index 72eb267..311f6d3 100644 --- a/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h +++ b/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_OPEN_PDF_IN_READER_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_OPEN_PDF_IN_READER_VIEW_H_ +#include "base/macros.h" #include "ui/views/controls/image_view.h" #include "ui/views/widget/widget_observer.h"
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.h b/chrome/browser/ui/views/location_bar/page_action_image_view.h index d4c14853..1f806193b9 100644 --- a/chrome/browser/ui/views/location_bar/page_action_image_view.h +++ b/chrome/browser/ui/views/location_bar/page_action_image_view.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/extensions/extension_action_view_controller.h" #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h"
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc b/chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc index d4a42d2..160dcd30 100644 --- a/chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/location_bar/page_action_image_view.h" +#include "base/macros.h" #include "base/run_loop.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_browsertest.h"
diff --git a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h index 85df0fd..6447538 100644 --- a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h +++ b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/gfx/geometry/size.h" #include "ui/views/view.h"
diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view.h b/chrome/browser/ui/views/location_bar/selected_keyword_view.h index e85f819..a20ed9d4 100644 --- a/chrome/browser/ui/views/location_bar/selected_keyword_view.h +++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h" #include "ui/views/controls/label.h"
diff --git a/chrome/browser/ui/views/location_bar/star_view.h b/chrome/browser/ui/views/location_bar/star_view.h index eec2602..2bbf3c2 100644 --- a/chrome/browser/ui/views/location_bar/star_view.h +++ b/chrome/browser/ui/views/location_bar/star_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_STAR_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_STAR_VIEW_H_ +#include "base/macros.h" #include "chrome/browser/ui/views/location_bar/bubble_icon_view.h" class Browser;
diff --git a/chrome/browser/ui/views/location_bar/star_view_browsertest.cc b/chrome/browser/ui/views/location_bar/star_view_browsertest.cc index b7f6fc58..df78339f 100644 --- a/chrome/browser/ui/views/location_bar/star_view_browsertest.cc +++ b/chrome/browser/ui/views/location_bar/star_view_browsertest.cc
@@ -7,13 +7,14 @@ #include "base/command_line.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/common/pref_names.h" -#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h"
diff --git a/chrome/browser/ui/views/location_bar/zoom_bubble_view.h b/chrome/browser/ui/views/location_bar/zoom_bubble_view.h index 3d17991..a40bfcca 100644 --- a/chrome/browser/ui/views/location_bar/zoom_bubble_view.h +++ b/chrome/browser/ui/views/location_bar/zoom_bubble_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/timer/timer.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" #include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h"
diff --git a/chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc b/chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc index 3d54f2f6..be76d0f 100644 --- a/chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h"
diff --git a/chrome/browser/ui/views/login_prompt_views.cc b/chrome/browser/ui/views/login_prompt_views.cc index c119587..830612b 100644 --- a/chrome/browser/ui/views/login_prompt_views.cc +++ b/chrome/browser/ui/views/login_prompt_views.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/login/login_prompt.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/views/login_view.h"
diff --git a/chrome/browser/ui/views/login_view.h b/chrome/browser/ui/views/login_view.h index 72ccaf62..161bf67 100644 --- a/chrome/browser/ui/views/login_view.h +++ b/chrome/browser/ui/views/login_view.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_LOGIN_VIEW_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/login/login_prompt.h" #include "components/autofill/core/common/password_form.h" #include "components/password_manager/core/browser/login_model.h"
diff --git a/chrome/browser/ui/views/menu_controller_interactive_uitest.cc b/chrome/browser/ui/views/menu_controller_interactive_uitest.cc index 80853e4..498d2177 100644 --- a/chrome/browser/ui/views/menu_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/menu_controller_interactive_uitest.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 "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/views/menu_test_base.h" #include "ui/views/controls/menu/menu_item_view.h"
diff --git a/chrome/browser/ui/views/menu_controller_test.cc b/chrome/browser/ui/views/menu_controller_test.cc index 64b245f..bc07a7e 100644 --- a/chrome/browser/ui/views/menu_controller_test.cc +++ b/chrome/browser/ui/views/menu_controller_test.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 "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/views/menu_test_base.h" #include "ui/views/controls/menu/menu_item_view.h"
diff --git a/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc b/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc index c047ca8..5995816 100644 --- a/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/menu_item_view_interactive_uitest.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 "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/views/menu_test_base.h" #include "ui/views/controls/menu/menu_item_view.h"
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc index 3dc2736..f5fada0 100644 --- a/chrome/browser/ui/views/menu_model_adapter_test.cc +++ b/chrome/browser/ui/views/menu_model_adapter_test.cc
@@ -4,6 +4,7 @@ #include "base/callback.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h"
diff --git a/chrome/browser/ui/views/menu_test_base.h b/chrome/browser/ui/views/menu_test_base.h index 9b10e5bd..87cb747 100644 --- a/chrome/browser/ui/views/menu_test_base.h +++ b/chrome/browser/ui/views/menu_test_base.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_MENU_TEST_BASE_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/test/base/view_event_test_base.h" #include "ui/events/keycodes/keyboard_codes.h"
diff --git a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc index c48a62e..ec67c29 100644 --- a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc +++ b/chrome/browser/ui/views/menu_view_drag_and_drop_test.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 "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/views/menu_test_base.h" #include "chrome/test/base/interactive_test_utils.h"
diff --git a/chrome/browser/ui/views/message_center/message_center_frame_view.cc b/chrome/browser/ui/views/message_center/message_center_frame_view.cc index f638bbe..888b6572 100644 --- a/chrome/browser/ui/views/message_center/message_center_frame_view.cc +++ b/chrome/browser/ui/views/message_center/message_center_frame_view.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/message_center/message_center_frame_view.h" +#include "build/build_config.h" #include "ui/base/hit_test.h" #include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/shadow_value.h"
diff --git a/chrome/browser/ui/views/message_center/message_center_frame_view.h b/chrome/browser/ui/views/message_center/message_center_frame_view.h index 56e90e77..b581089 100644 --- a/chrome/browser/ui/views/message_center/message_center_frame_view.h +++ b/chrome/browser/ui/views/message_center/message_center_frame_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_MESSAGE_CENTER_FRAME_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_MESSAGE_CENTER_FRAME_VIEW_H_ +#include "base/macros.h" #include "ui/views/window/non_client_view.h" namespace views {
diff --git a/chrome/browser/ui/views/message_center/web_notification_tray.h b/chrome/browser/ui/views/message_center/web_notification_tray.h index ed6d264e..ef4724e 100644 --- a/chrome/browser/ui/views/message_center/web_notification_tray.h +++ b/chrome/browser/ui/views/message_center/web_notification_tray.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/message_center/message_center_tray_delegate.h" #include "ui/views/widget/widget_observer.h"
diff --git a/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc b/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc index 6b6e035c..91490fd9 100644 --- a/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc +++ b/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc
@@ -4,11 +4,14 @@ #include "chrome/browser/ui/views/message_center/web_notification_tray.h" +#include <stddef.h> + #include <set> #include "ash/root_window_controller.h" #include "ash/system/status_area_widget.h" #include "ash/system/tray/system_tray_item.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/views/network_profile_bubble_view.h b/chrome/browser/ui/views/network_profile_bubble_view.h index 97720f6..c349c12e 100644 --- a/chrome/browser/ui/views/network_profile_bubble_view.h +++ b/chrome/browser/ui/views/network_profile_bubble_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_NETWORK_PROFILE_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_NETWORK_PROFILE_BUBBLE_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/link_listener.h"
diff --git a/chrome/browser/ui/views/new_task_manager_view.cc b/chrome/browser/ui/views/new_task_manager_view.cc index 7f75b7ef..04f70593 100644 --- a/chrome/browser/ui/views/new_task_manager_view.cc +++ b/chrome/browser/ui/views/new_task_manager_view.cc
@@ -4,7 +4,10 @@ #include "chrome/browser/ui/views/new_task_manager_view.h" +#include <stddef.h> + #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_window.h"
diff --git a/chrome/browser/ui/views/new_task_manager_view.h b/chrome/browser/ui/views/new_task_manager_view.h index e6dc04a..4890bb3 100644 --- a/chrome/browser/ui/views/new_task_manager_view.h +++ b/chrome/browser/ui/views/new_task_manager_view.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/task_manager/task_manager_table_model.h" #include "ui/base/models/simple_menu_model.h"
diff --git a/chrome/browser/ui/views/new_task_manager_view_browsertest.cc b/chrome/browser/ui/views/new_task_manager_view_browsertest.cc index 157e2f6..761a141 100644 --- a/chrome/browser/ui/views/new_task_manager_view_browsertest.cc +++ b/chrome/browser/ui/views/new_task_manager_view_browsertest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc index c070363..03c54d3 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
@@ -6,6 +6,8 @@ #include <algorithm> +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/search/search.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/layout_constants.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h index b2510b9e..41c171c 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h +++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_ +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "components/omnibox/browser/omnibox_popup_model.h" #include "components/omnibox/browser/omnibox_popup_view.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc index 74e37b25..b74b097 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
@@ -9,6 +9,7 @@ #include <atlwin.h> // NOLINT #endif +#include "base/macros.h" #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" #include <algorithm> // NOLINT
diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.h b/chrome/browser/ui/views/omnibox/omnibox_result_view.h index 264092f..1dc5fe5 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_result_view.h +++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.h
@@ -5,8 +5,11 @@ #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_ +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "components/omnibox/browser/autocomplete_match.h" #include "components/omnibox/browser/suggestion_answer.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index e5cc57cf..814d25b 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -11,6 +11,7 @@ #include "base/metrics/histogram.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" #include "chrome/browser/command_updater.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h index 2bea648b..23b5d9b 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
@@ -5,13 +5,16 @@ #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ +#include <stddef.h> + #include <set> #include <string> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "chrome/browser/ui/toolbar/chrome_toolbar_model.h" #include "components/omnibox/browser/omnibox_view.h" #include "ui/base/window_open_disposition.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc index b38eca5f0..20e2c08 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
@@ -4,7 +4,11 @@ #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" +#include <stddef.h> + #include "base/command_line.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc index dba5638..9719fd8e 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc
@@ -4,7 +4,11 @@ #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/ui/views/open_pdf_in_reader_bubble_view.h b/chrome/browser/ui/views/open_pdf_in_reader_bubble_view.h index 003eb575..dd504ec7 100644 --- a/chrome/browser/ui/views/open_pdf_in_reader_bubble_view.h +++ b/chrome/browser/ui/views/open_pdf_in_reader_bubble_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_OPEN_PDF_IN_READER_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_OPEN_PDF_IN_READER_BUBBLE_VIEW_H_ +#include "base/macros.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/link_listener.h"
diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc index 81972b0..85f1f89 100644 --- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc +++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
@@ -6,6 +6,7 @@ #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/views/elevation_icon_setter.h" #include "chrome/browser/upgrade_detector.h"
diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.h b/chrome/browser/ui/views/outdated_upgrade_bubble_view.h index b1951aa5..5499f080 100644 --- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.h +++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_OUTDATED_UPGRADE_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_OUTDATED_UPGRADE_BUBBLE_VIEW_H_ +#include "base/macros.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/button/button.h"
diff --git a/chrome/browser/ui/views/panels/panel_frame_view.cc b/chrome/browser/ui/views/panels/panel_frame_view.cc index 63a2ba9..c26a1c7 100644 --- a/chrome/browser/ui/views/panels/panel_frame_view.cc +++ b/chrome/browser/ui/views/panels/panel_frame_view.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/panels/panel_frame_view.h" +#include "build/build_config.h" #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_constants.h" #include "chrome/browser/ui/views/panels/panel_view.h"
diff --git a/chrome/browser/ui/views/panels/panel_frame_view.h b/chrome/browser/ui/views/panels/panel_frame_view.h index e3a1143..1640be0 100644 --- a/chrome/browser/ui/views/panels/panel_frame_view.h +++ b/chrome/browser/ui/views/panels/panel_frame_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PANELS_PANEL_FRAME_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_PANELS_PANEL_FRAME_VIEW_H_ +#include "base/macros.h" #include "chrome/browser/ui/panels/panel_constants.h" #include "chrome/browser/ui/views/tab_icon_view_model.h" #include "ui/views/controls/button/button.h"
diff --git a/chrome/browser/ui/views/panels/panel_stack_view.cc b/chrome/browser/ui/views/panels/panel_stack_view.cc index be70b17..67c40d1 100644 --- a/chrome/browser/ui/views/panels/panel_stack_view.cc +++ b/chrome/browser/ui/views/panels/panel_stack_view.cc
@@ -5,7 +5,9 @@ #include "chrome/browser/ui/views/panels/panel_stack_view.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_manager.h"
diff --git a/chrome/browser/ui/views/panels/panel_stack_view.h b/chrome/browser/ui/views/panels/panel_stack_view.h index 56f8ce8..4ab5743 100644 --- a/chrome/browser/ui/views/panels/panel_stack_view.h +++ b/chrome/browser/ui/views/panels/panel_stack_view.h
@@ -7,8 +7,9 @@ #include <list> #include <map> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/ui/panels/native_panel_stack_window.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/views/focus/widget_focus_manager.h"
diff --git a/chrome/browser/ui/views/panels/panel_view.cc b/chrome/browser/ui/views/panels/panel_view.cc index 2d96b3e..2932e94c 100644 --- a/chrome/browser/ui/views/panels/panel_view.cc +++ b/chrome/browser/ui/views/panels/panel_view.cc
@@ -4,10 +4,14 @@ #include "chrome/browser/ui/views/panels/panel_view.h" +#include <stddef.h> + #include <map> #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/host_desktop.h"
diff --git a/chrome/browser/ui/views/panels/panel_view.h b/chrome/browser/ui/views/panels/panel_view.h index b68e76a..e0cf85c 100644 --- a/chrome/browser/ui/views/panels/panel_view.h +++ b/chrome/browser/ui/views/panels/panel_view.h
@@ -5,7 +5,9 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PANELS_PANEL_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_PANELS_PANEL_VIEW_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/ui/panels/native_panel.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/views/widget/widget_delegate.h"
diff --git a/chrome/browser/ui/views/panels/panel_view_browsertest.cc b/chrome/browser/ui/views/panels/panel_view_browsertest.cc index 9e6dba6..cd9f75b 100644 --- a/chrome/browser/ui/views/panels/panel_view_browsertest.cc +++ b/chrome/browser/ui/views/panels/panel_view_browsertest.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 "chrome/browser/ui/panels/base_panel_browser_test.h" #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_constants.h"
diff --git a/chrome/browser/ui/views/panels/taskbar_window_thumbnailer_win.h b/chrome/browser/ui/views/panels/taskbar_window_thumbnailer_win.h index 3040039..362b8a561 100644 --- a/chrome/browser/ui/views/panels/taskbar_window_thumbnailer_win.h +++ b/chrome/browser/ui/views/panels/taskbar_window_thumbnailer_win.h
@@ -6,6 +6,8 @@ #define CHROME_BROWSER_UI_VIEWS_PANELS_TASKBAR_WINDOW_THUMBNAILER_WIN_H_ #include <vector> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/win/hwnd_subclass.h"
diff --git a/chrome/browser/ui/views/panels/x11_panel_resizer.h b/chrome/browser/ui/views/panels/x11_panel_resizer.h index dc7f7c6b..58f0737 100644 --- a/chrome/browser/ui/views/panels/x11_panel_resizer.h +++ b/chrome/browser/ui/views/panels/x11_panel_resizer.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PANELS_X11_PANEL_RESIZER_H_ #define CHROME_BROWSER_UI_VIEWS_PANELS_X11_PANEL_RESIZER_H_ +#include "base/macros.h" #include "ui/events/event_handler.h" #include "ui/gfx/geometry/point.h"
diff --git a/chrome/browser/ui/views/passwords/credentials_item_view.cc b/chrome/browser/ui/views/passwords/credentials_item_view.cc index 694161d1..90f5b1e 100644 --- a/chrome/browser/ui/views/passwords/credentials_item_view.cc +++ b/chrome/browser/ui/views/passwords/credentials_item_view.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/passwords/credentials_item_view.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/views/passwords/credentials_selection_view.cc b/chrome/browser/ui/views/passwords/credentials_selection_view.cc index e264abb..483b731 100644 --- a/chrome/browser/ui/views/passwords/credentials_selection_view.cc +++ b/chrome/browser/ui/views/passwords/credentials_selection_view.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/passwords/credentials_selection_view.h" +#include <stddef.h> + #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" #include "ui/base/models/simple_combobox_model.h" #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/ui/views/passwords/credentials_selection_view.h b/chrome/browser/ui/views/passwords/credentials_selection_view.h index e495a98..4c5d4bf 100644 --- a/chrome/browser/ui/views/passwords/credentials_selection_view.h +++ b/chrome/browser/ui/views/passwords/credentials_selection_view.h
@@ -6,6 +6,7 @@ #include <vector> +#include "base/macros.h" #include "components/autofill/core/common/password_form.h" #include "ui/views/view.h"
diff --git a/chrome/browser/ui/views/passwords/manage_password_items_view.cc b/chrome/browser/ui/views/passwords/manage_password_items_view.cc index fdafc26..eb0bca78 100644 --- a/chrome/browser/ui/views/passwords/manage_password_items_view.cc +++ b/chrome/browser/ui/views/passwords/manage_password_items_view.cc
@@ -6,6 +6,7 @@ #include <numeric> +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/views/passwords/manage_password_items_view.h b/chrome/browser/ui/views/passwords/manage_password_items_view.h index 6200e71..d0cd278e 100644 --- a/chrome/browser/ui/views/passwords/manage_password_items_view.h +++ b/chrome/browser/ui/views/passwords/manage_password_items_view.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "components/autofill/core/common/password_form.h" #include "ui/views/view.h"
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc index 3b01a8d..b6a3c1b 100644 --- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc +++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/timer/timer.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h index 4720f06f..7d51aa1 100644 --- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h +++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_VIEW_H_ +#include "base/macros.h" #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" #include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h"
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc index 7f4401f..1b1e7c56 100644 --- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc
@@ -5,8 +5,10 @@ #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/metrics/histogram_samples.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/passwords/manage_passwords_test.h" #include "chrome/browser/ui/passwords/passwords_model_delegate.h"
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc b/chrome/browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc index 00dcb72..6c360a4 100644 --- a/chrome/browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc +++ b/chrome/browser/ui/views/passwords/manage_passwords_icon_view_browsertest.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 "base/macros.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/passwords/manage_passwords_icon.h" #include "chrome/browser/ui/passwords/manage_passwords_test.h"
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_icon_views.h b/chrome/browser/ui/views/passwords/manage_passwords_icon_views.h index b0a1094..23fea160 100644 --- a/chrome/browser/ui/views/passwords/manage_passwords_icon_views.h +++ b/chrome/browser/ui/views/passwords/manage_passwords_icon_views.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PASSWORDS_MANAGE_PASSWORDS_ICON_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_PASSWORDS_MANAGE_PASSWORDS_ICON_VIEWS_H_ +#include "base/macros.h" #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" #include "chrome/browser/ui/passwords/manage_passwords_icon_view.h" #include "chrome/browser/ui/views/location_bar/bubble_icon_view.h"
diff --git a/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc b/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc index 4719d97..8f200d5 100644 --- a/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc +++ b/chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/platform_keys_certificate_selector_chromeos.h" +#include <stddef.h> + #include "base/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/profiles/avatar_menu_button.cc b/chrome/browser/ui/views/profiles/avatar_menu_button.cc index 522d128..f5bed48 100644 --- a/chrome/browser/ui/views/profiles/avatar_menu_button.cc +++ b/chrome/browser/ui/views/profiles/avatar_menu_button.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/avatar_menu.h"
diff --git a/chrome/browser/ui/views/profiles/avatar_menu_button.h b/chrome/browser/ui/views/profiles/avatar_menu_button.h index a28dc92..563e108 100644 --- a/chrome/browser/ui/views/profiles/avatar_menu_button.h +++ b/chrome/browser/ui/views/profiles/avatar_menu_button.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/models/simple_menu_model.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/button/menu_button_listener.h"
diff --git a/chrome/browser/ui/views/profiles/new_avatar_button.cc b/chrome/browser/ui/views/profiles/new_avatar_button.cc index 5faaa7dd..eefaa5bb 100644 --- a/chrome/browser/ui/views/profiles/new_avatar_button.cc +++ b/chrome/browser/ui/views/profiles/new_avatar_button.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/profiles/new_avatar_button.h" #include "base/win/windows_version.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profiles_state.h"
diff --git a/chrome/browser/ui/views/profiles/new_avatar_button.h b/chrome/browser/ui/views/profiles/new_avatar_button.h index 8181107..70c0a9e 100644 --- a/chrome/browser/ui/views/profiles/new_avatar_button.h +++ b/chrome/browser/ui/views/profiles/new_avatar_button.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_ #define CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_ +#include "base/macros.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" #include "components/signin/core/browser/signin_error_controller.h" #include "ui/views/controls/button/label_button.h"
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc index 4e0bab59f2..2c21f470 100644 --- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc +++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.h b/chrome/browser/ui/views/profiles/profile_chooser_view.h index da0eee2e..7db1362 100644 --- a/chrome/browser/ui/views/profiles/profile_chooser_view.h +++ b/chrome/browser/ui/views/profiles/profile_chooser_view.h
@@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_ +#include <stddef.h> + #include <map> #include <vector> +#include "base/macros.h" #include "chrome/browser/profiles/avatar_menu.h" #include "chrome/browser/profiles/avatar_menu_observer.h" #include "chrome/browser/profiles/profile_metrics.h"
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc index 91aebea5..27cccf7 100644 --- a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
@@ -4,7 +4,10 @@ #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" +#include <stddef.h> + #include "base/command_line.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/profiles/signin_view_controller.cc b/chrome/browser/ui/views/profiles/signin_view_controller.cc index 18e9b5c..07176ce 100644 --- a/chrome/browser/ui/views/profiles/signin_view_controller.cc +++ b/chrome/browser/ui/views/profiles/signin_view_controller.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/profiles/signin_view_controller.h" +#include "base/macros.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h" #include "chrome/browser/signin/signin_error_controller_factory.h"
diff --git a/chrome/browser/ui/views/profiles/supervised_user_avatar_label.cc b/chrome/browser/ui/views/profiles/supervised_user_avatar_label.cc index 8498e62b..dc6c40b 100644 --- a/chrome/browser/ui/views/profiles/supervised_user_avatar_label.cc +++ b/chrome/browser/ui/views/profiles/supervised_user_avatar_label.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/views/frame/browser_view.h"
diff --git a/chrome/browser/ui/views/profiles/supervised_user_avatar_label.h b/chrome/browser/ui/views/profiles/supervised_user_avatar_label.h index c3424b1a..5f1f95a 100644 --- a/chrome/browser/ui/views/profiles/supervised_user_avatar_label.h +++ b/chrome/browser/ui/views/profiles/supervised_user_avatar_label.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_PROFILES_SUPERVISED_USER_AVATAR_LABEL_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/supervised_user/supervised_users.h" #include "ui/views/controls/button/label_button.h"
diff --git a/chrome/browser/ui/views/profiles/user_manager_view.cc b/chrome/browser/ui/views/profiles/user_manager_view.cc index 2c0dfd4..342099bb 100644 --- a/chrome/browser/ui/views/profiles/user_manager_view.cc +++ b/chrome/browser/ui/views/profiles/user_manager_view.cc
@@ -4,8 +4,10 @@ #include "chrome/browser/ui/views/profiles/user_manager_view.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h"
diff --git a/chrome/browser/ui/views/profiles/user_manager_view.h b/chrome/browser/ui/views/profiles/user_manager_view.h index 5f22b03..c267637 100644 --- a/chrome/browser/ui/views/profiles/user_manager_view.h +++ b/chrome/browser/ui/views/profiles/user_manager_view.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/auto_reset.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_window.h"
diff --git a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h index 2b35ad1..835c6eb 100644 --- a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h +++ b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_VIEWS_H_ +#include "base/macros.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" #include "ui/base/ui_base_types.h"
diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index 180530b7..e8a114dd 100644 --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -7,6 +7,7 @@ #include <string> #include "base/metrics/histogram.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/views/sad_tab_view.h b/chrome/browser/ui/views/sad_tab_view.h index 863e4695..f5d07845 100644 --- a/chrome/browser/ui/views/sad_tab_view.h +++ b/chrome/browser/ui/views/sad_tab_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SAD_TAB_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_SAD_TAB_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/sad_tab.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/link_listener.h"
diff --git a/chrome/browser/ui/views/screen_capture_notification_ui_views.cc b/chrome/browser/ui/views/screen_capture_notification_ui_views.cc index 4c38c5a..03e0ef7 100644 --- a/chrome/browser/ui/views/screen_capture_notification_ui_views.cc +++ b/chrome/browser/ui/views/screen_capture_notification_ui_views.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/screen_capture_notification_ui.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/ui/views/chrome_views_export.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/views/select_file_dialog_extension.h b/chrome/browser/ui/views/select_file_dialog_extension.h index 8d70adda..caab3d8 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension.h +++ b/chrome/browser/ui/views/select_file_dialog_extension.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/ui/views/extensions/extension_dialog_observer.h" #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow
diff --git a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc index 7aa16991..49884fc1 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
@@ -7,6 +7,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/scoped_ptr.h" #include "base/path_service.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/ui/views/select_file_dialog_extension_factory.h b/chrome/browser/ui/views/select_file_dialog_extension_factory.h index 4418e3a..6724f73 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_factory.h +++ b/chrome/browser/ui/views/select_file_dialog_extension_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SELECT_FILE_DIALOG_EXTENSION_FACTORY_H_ #define CHROME_BROWSER_UI_VIEWS_SELECT_FILE_DIALOG_EXTENSION_FACTORY_H_ +#include "base/macros.h" #include "ui/shell_dialogs/select_file_dialog.h" #include "ui/shell_dialogs/select_file_dialog_factory.h"
diff --git a/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc b/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc index 502ac26..9cb41200 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension_unittest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/select_file_dialog_extension.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/shell_dialogs/selected_file_info.h"
diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc index b95a03d..3d65499 100644 --- a/chrome/browser/ui/views/session_crashed_bubble_view.cc +++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc
@@ -4,16 +4,20 @@ #include "chrome/browser/ui/views/session_crashed_bubble_view.h" +#include <stddef.h> + #include <string> #include <vector> #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/metrics/metrics_reporting_state.h"
diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.h b/chrome/browser/ui/views/session_crashed_bubble_view.h index a6688460..43cb9cd 100644 --- a/chrome/browser/ui/views/session_crashed_bubble_view.h +++ b/chrome/browser/ui/views/session_crashed_bubble_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SESSION_CRASHED_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_SESSION_CRASHED_BUBBLE_VIEW_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/session_crashed_bubble.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
diff --git a/chrome/browser/ui/views/settings_api_bubble_helper_views.cc b/chrome/browser/ui/views/settings_api_bubble_helper_views.cc index f26f2941..62f15699 100644 --- a/chrome/browser/ui/views/settings_api_bubble_helper_views.cc +++ b/chrome/browser/ui/views/settings_api_bubble_helper_views.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h" +#include "build/build_config.h" #include "chrome/browser/extensions/ntp_overridden_bubble_delegate.h" #include "chrome/browser/extensions/settings_api_bubble_delegate.h" #include "chrome/browser/extensions/settings_api_helpers.h"
diff --git a/chrome/browser/ui/views/simple_message_box_views.cc b/chrome/browser/ui/views/simple_message_box_views.cc index 1732509b..17c1195 100644 --- a/chrome/browser/ui/views/simple_message_box_views.cc +++ b/chrome/browser/ui/views/simple_message_box_views.cc
@@ -4,10 +4,11 @@ #include "chrome/browser/ui/simple_message_box.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "chrome/browser/ui/simple_message_box_internal.h" #include "chrome/grit/generated_resources.h" #include "components/constrained_window/constrained_window_views.h"
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index ceaf09d..b6465492 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/client_certificate_delegate.h"
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc index 1ff5fdf..af21263 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
@@ -5,6 +5,7 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/synchronization/waitable_event.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index 09e334e0..ef57b75 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -9,10 +9,12 @@ #include "base/bind.h" #include "base/i18n/rtl.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/themes/theme_properties.h" #include "components/url_formatter/elide_url.h" #include "components/url_formatter/url_formatter.h"
diff --git a/chrome/browser/ui/views/status_bubble_views.h b/chrome/browser/ui/views/status_bubble_views.h index 0bf83c5..02f069f 100644 --- a/chrome/browser/ui/views/status_bubble_views.h +++ b/chrome/browser/ui/views/status_bubble_views.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_STATUS_BUBBLE_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_STATUS_BUBBLE_VIEWS_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h index f93d61bf..d8ff6c71 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h +++ b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_LINUX_WRAPPER_H_ #define CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_LINUX_WRAPPER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/status_icons/desktop_notification_balloon.h" #include "chrome/browser/status_icons/status_icon.h"
diff --git a/chrome/browser/ui/views/status_icons/status_icon_win.h b/chrome/browser/ui/views/status_icons/status_icon_win.h index 6113186..9fb283c 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_win.h +++ b/chrome/browser/ui/views/status_icons/status_icon_win.h
@@ -8,8 +8,8 @@ #include <windows.h> #include <shellapi.h> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/win/scoped_gdi_object.h" #include "chrome/browser/status_icons/status_icon.h"
diff --git a/chrome/browser/ui/views/status_icons/status_tray_linux.cc b/chrome/browser/ui/views/status_icons/status_tray_linux.cc index 33e56f3..5b7b612 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_linux.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_linux.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/status_icons/status_tray_linux.h" +#include "build/build_config.h" + #if !defined(OS_CHROMEOS) #include "chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h" #include "ui/views/linux_ui/linux_ui.h"
diff --git a/chrome/browser/ui/views/status_icons/status_tray_linux.h b/chrome/browser/ui/views/status_icons/status_tray_linux.h index b6a4805..c85d5ad 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_linux.h +++ b/chrome/browser/ui/views/status_icons/status_tray_linux.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_TRAY_LINUX_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/status_icons/status_tray.h" class StatusTrayLinux : public StatusTray {
diff --git a/chrome/browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc b/chrome/browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc index 9093a00..e22a52c 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h"
diff --git a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h index 78327f9..0d5aa75 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h +++ b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_TRAY_STATE_CHANGER_WIN_H_ #define CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_TRAY_STATE_CHANGER_WIN_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/threading/non_thread_safe.h"
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.cc b/chrome/browser/ui/views/status_icons/status_tray_win.cc index c32481cb..c1f692d 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_win.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/threading/non_thread_safe.h" #include "base/threading/thread.h"
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.h b/chrome/browser/ui/views/status_icons/status_tray_win.h index f78113c32..b00f7cd 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win.h +++ b/chrome/browser/ui/views/status_icons/status_tray_win.h
@@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/status_icons/status_tray.h"
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc index 5e78d489d..b7c9898 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
@@ -5,7 +5,9 @@ #include "chrome/browser/ui/views/status_icons/status_tray_win.h" #include <commctrl.h> +#include <stddef.h> +#include "base/macros.h" #include "chrome/browser/status_icons/status_icon_menu_model.h" #include "chrome/browser/status_icons/status_icon_observer.h" #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
diff --git a/chrome/browser/ui/views/sync/bubble_sync_promo_view.cc b/chrome/browser/ui/views/sync/bubble_sync_promo_view.cc index e74134d4..906dfe7 100644 --- a/chrome/browser/ui/views/sync/bubble_sync_promo_view.cc +++ b/chrome/browser/ui/views/sync/bubble_sync_promo_view.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/sync/bubble_sync_promo_view.h" +#include <stddef.h> + #include "base/strings/string16.h" #include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/chrome/browser/ui/views/sync/bubble_sync_promo_view.h b/chrome/browser/ui/views/sync/bubble_sync_promo_view.h index 7b80591..175dcae 100644 --- a/chrome/browser/ui/views/sync/bubble_sync_promo_view.h +++ b/chrome/browser/ui/views/sync/bubble_sync_promo_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SYNC_BUBBLE_SYNC_PROMO_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_SYNC_BUBBLE_SYNC_PROMO_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/controls/styled_label_listener.h" #include "ui/views/view.h"
diff --git a/chrome/browser/ui/views/sync/bubble_sync_promo_view_unittest.cc b/chrome/browser/ui/views/sync/bubble_sync_promo_view_unittest.cc index fe7907d..ea7c104 100644 --- a/chrome/browser/ui/views/sync/bubble_sync_promo_view_unittest.cc +++ b/chrome/browser/ui/views/sync/bubble_sync_promo_view_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/sync/bubble_sync_promo_view.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h"
diff --git a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.h b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.h index 5f8b619..ecf469ac 100644 --- a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.h +++ b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.h
@@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SYNC_ONE_CLICK_SIGNIN_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_SYNC_ONE_CLICK_SIGNIN_BUBBLE_VIEW_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc b/chrome/browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc index 3466978..a5626621b 100644 --- a/chrome/browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/sync/one_click_signin_bubble_delegate.h" #include "content/public/test/test_utils.h"
diff --git a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc index 4060bb6..28a8faf 100644 --- a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc +++ b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.h" +#include <stddef.h> + #include <algorithm> #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.h b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.h index fcbe3a35..c5d7eae8 100644 --- a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.h +++ b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_SYNC_PROFILE_SIGNIN_CONFIRMATION_DIALOG_VIEWS_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/button/label_button.h"
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h index 89f110a..90b29466 100644 --- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h +++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_CHROME_WEB_CONTENTS_VIEW_DELEGATE_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_CHROME_WEB_CONTENTS_VIEW_DELEGATE_VIEWS_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/renderer_context_menu/context_menu_delegate.h" #include "content/public/browser/web_contents_view_delegate.h"
diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc index 1422d96b..1666161 100644 --- a/chrome/browser/ui/views/tab_icon_view.cc +++ b/chrome/browser/ui/views/tab_icon_view.cc
@@ -11,6 +11,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/views/tab_icon_view_model.h" #include "grit/theme_resources.h"
diff --git a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h index 3bf08799..4f503db 100644 --- a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h +++ b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TAB_MODAL_CONFIRM_DIALOG_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_TAB_MODAL_CONFIRM_DIALOG_VIEWS_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/tab_modal_confirm_dialog.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/controls/link_listener.h"
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 60ae27435..3a1ccca76 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" #include "base/auto_reset.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/task_runner_util.h" #include "base/threading/sequenced_worker_pool.h"
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h index ad95104..f15d38e8 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "chrome/browser/ui/tabs/hover_tab_selector.h"
diff --git a/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.h b/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.h index 21312538..b9ef1395 100644 --- a/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.h +++ b/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_FAKE_BASE_TAB_STRIP_CONTROLLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" #include "ui/base/models/list_selection_model.h"
diff --git a/chrome/browser/ui/views/tabs/media_indicator_button.cc b/chrome/browser/ui/views/tabs/media_indicator_button.cc index 45d2e01..88c8e8e 100644 --- a/chrome/browser/ui/views/tabs/media_indicator_button.cc +++ b/chrome/browser/ui/views/tabs/media_indicator_button.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/tabs/media_indicator_button.h" +#include "base/macros.h" #include "chrome/browser/ui/views/tabs/tab.h" #include "chrome/browser/ui/views/tabs/tab_controller.h" #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
diff --git a/chrome/browser/ui/views/tabs/media_indicator_button.h b/chrome/browser/ui/views/tabs/media_indicator_button.h index c5e7852c..f485321f 100644 --- a/chrome/browser/ui/views/tabs/media_indicator_button.h +++ b/chrome/browser/ui/views/tabs/media_indicator_button.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TABS_MEDIA_INDICATOR_BUTTON_H_ #define CHROME_BROWSER_UI_VIEWS_TABS_MEDIA_INDICATOR_BUTTON_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/tabs/tab_utils.h" #include "ui/views/controls/button/image_button.h"
diff --git a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h index 9b2f5de..ac671af 100644 --- a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h +++ b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h
@@ -7,7 +7,7 @@ #include <algorithm> -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/gfx/geometry/size.h" #include "ui/views/view_model.h"
diff --git a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc index 87819b2a..e09bfb1 100644 --- a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc +++ b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h" +#include <stddef.h> + #include <string> +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index 87250a9..1678a902 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -4,12 +4,16 @@ #include "chrome/browser/ui/views/tabs/tab.h" +#include <stddef.h> + #include <limits> #include "base/command_line.h" #include "base/debug/alias.h" +#include "base/macros.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/layout_constants.h"
diff --git a/chrome/browser/ui/views/tabs/tab.h b/chrome/browser/ui/views/tabs/tab.h index 726ca75..429e484 100644 --- a/chrome/browser/ui/views/tabs/tab.h +++ b/chrome/browser/ui/views/tabs/tab.h
@@ -9,6 +9,7 @@ #include <string> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc index c911022..b9ea7ad 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -10,6 +10,8 @@ #include "base/auto_reset.h" #include "base/callback.h" #include "base/i18n/rtl.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_list.h"
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.h b/chrome/browser/ui/views/tabs/tab_drag_controller.h index 1173ef09..63b04d4 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.h +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.h
@@ -5,8 +5,11 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER_H_ #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER_H_ +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc index 337e07be..ce52192 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -4,14 +4,18 @@ #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" +#include <stddef.h> + #include <algorithm> #include "ash/wm/window_state.h" #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h"
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h index d823f072..d6a23df 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chrome/test/base/in_process_browser_test.h" class Browser;
diff --git a/chrome/browser/ui/views/tabs/tab_renderer_data.cc b/chrome/browser/ui/views/tabs/tab_renderer_data.cc index 9e9260d..2976c2f 100644 --- a/chrome/browser/ui/views/tabs/tab_renderer_data.cc +++ b/chrome/browser/ui/views/tabs/tab_renderer_data.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/tabs/tab_renderer_data.h" #include "base/process/kill.h" +#include "build/build_config.h" TabRendererData::TabRendererData() : network_state(NETWORK_STATE_NONE),
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 99b8041..a1751b1 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/tabs/tab_strip.h" +#include <stddef.h> + #include <algorithm> #include <iterator> #include <string> @@ -11,9 +13,11 @@ #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/defaults.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/layout_constants.h"
diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h index 143a414a..aa09764 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.h +++ b/chrome/browser/ui/views/tabs/tab_strip.h
@@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/timer/timer.h" #include "chrome/browser/ui/views/tabs/tab.h"
diff --git a/chrome/browser/ui/views/tabs/tab_strip_layout.cc b/chrome/browser/ui/views/tabs/tab_strip_layout.cc index b69a1cfa..29ee3b80 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_layout.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_layout.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/tabs/tab_strip_layout.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h"
diff --git a/chrome/browser/ui/views/tabs/tab_strip_layout_unittest.cc b/chrome/browser/ui/views/tabs/tab_strip_layout_unittest.cc index bbe888c..9a477d7 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_layout_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_layout_unittest.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/ui/views/tabs/tab_strip_layout.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/ui/views/tabs/tab_strip_unittest.cc b/chrome/browser/ui/views/tabs/tab_strip_unittest.cc index b471d4fbc..5cab463 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/tabs/tab_strip.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.h" #include "chrome/browser/ui/views/tabs/tab.h"
diff --git a/chrome/browser/ui/views/tabs/tab_unittest.cc b/chrome/browser/ui/views/tabs/tab_unittest.cc index 5f8eab7c..1c2aa068 100644 --- a/chrome/browser/ui/views/tabs/tab_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_unittest.cc
@@ -4,7 +4,10 @@ #include "chrome/browser/ui/views/tabs/tab.h" +#include <stddef.h> + #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/tabs/tab_utils.h" #include "chrome/browser/ui/views/tabs/media_indicator_button.h"
diff --git a/chrome/browser/ui/views/tabs/window_finder_win.cc b/chrome/browser/ui/views/tabs/window_finder_win.cc index d0e7b55a..cb1b3211 100644 --- a/chrome/browser/ui/views/tabs/window_finder_win.cc +++ b/chrome/browser/ui/views/tabs/window_finder_win.cc
@@ -6,6 +6,7 @@ #include <shobjidl.h> +#include "base/macros.h" #include "base/win/scoped_gdi_object.h" #include "base/win/windows_version.h" #include "ui/aura/window.h"
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index 3864f10..fbfa3d6 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -4,10 +4,14 @@ #include "chrome/browser/task_manager/task_manager.h" +#include <stddef.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/theme_image_mapper.cc b/chrome/browser/ui/views/theme_image_mapper.cc index ba33555..4185c90 100644 --- a/chrome/browser/ui/views/theme_image_mapper.cc +++ b/chrome/browser/ui/views/theme_image_mapper.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/theme_image_mapper.h" +#include "build/build_config.h" #include "grit/theme_resources.h" namespace chrome {
diff --git a/chrome/browser/ui/views/toolbar/app_menu.cc b/chrome/browser/ui/views/toolbar/app_menu.cc index cd65d6ae..916ebad 100644 --- a/chrome/browser/ui/views/toolbar/app_menu.cc +++ b/chrome/browser/ui/views/toolbar/app_menu.cc
@@ -4,13 +4,17 @@ #include "chrome/browser/ui/views/toolbar/app_menu.h" +#include <stdint.h> + #include <algorithm> #include <cmath> #include <set> +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_stats.h" @@ -403,10 +407,10 @@ white.eraseARGB(0, 0, 0, 0); bitmap.lockPixels(); for (int y = 0; y < bitmap.height(); ++y) { - uint32* image_row = bitmap.getAddr32(0, y); - uint32* dst_row = white.getAddr32(0, y); + uint32_t* image_row = bitmap.getAddr32(0, y); + uint32_t* dst_row = white.getAddr32(0, y); for (int x = 0; x < bitmap.width(); ++x) { - uint32 image_pixel = image_row[x]; + uint32_t image_pixel = image_row[x]; // Fill the non transparent pixels with |color_|. dst_row[x] = (image_pixel & 0xFF000000) == 0x0 ? 0x0 : color_; } @@ -830,7 +834,7 @@ // so we get the taller menu style. PopulateMenu(root_, model); - int32 types = views::MenuRunner::HAS_MNEMONICS; + int32_t types = views::MenuRunner::HAS_MNEMONICS; if (for_drop()) { // We add NESTED_DRAG since currently the only operation to open the app // menu for is an extension action drag, which is controlled by the child
diff --git a/chrome/browser/ui/views/toolbar/back_button.h b/chrome/browser/ui/views/toolbar/back_button.h index d3b8b46..ddbe2f34 100644 --- a/chrome/browser/ui/views/toolbar/back_button.h +++ b/chrome/browser/ui/views/toolbar/back_button.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_BACK_BUTTON_H_ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BACK_BUTTON_H_ +#include "base/macros.h" #include "chrome/browser/ui/views/toolbar/toolbar_button.h" namespace ui {
diff --git a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc index fe5d30e9..23f6920 100644 --- a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc +++ b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/extensions/browser_action_test_util.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.h b/chrome/browser/ui/views/toolbar/browser_actions_container.h index 22b7eab..b433a3f 100644 --- a/chrome/browser/ui/views/toolbar/browser_actions_container.h +++ b/chrome/browser/ui/views/toolbar/browser_actions_container.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ +#include <stddef.h> + +#include "base/macros.h" #include "base/observer_list.h" #include "chrome/browser/extensions/extension_keybinding_registry.h" #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc b/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc index ab0e141..14f505f 100644 --- a/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc +++ b/chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" +#include <stddef.h> + +#include "base/macros.h" #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" #include "chrome/browser/extensions/browser_action_test_util.h" #include "chrome/browser/extensions/extension_context_menu_model.h"
diff --git a/chrome/browser/ui/views/toolbar/chevron_menu_button.cc b/chrome/browser/ui/views/toolbar/chevron_menu_button.cc index 2e87277..78ceaa4 100644 --- a/chrome/browser/ui/views/toolbar/chevron_menu_button.cc +++ b/chrome/browser/ui/views/toolbar/chevron_menu_button.cc
@@ -4,7 +4,10 @@ #include "chrome/browser/ui/views/toolbar/chevron_menu_button.h" +#include <stddef.h> + #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h index 9d01f75..e192668 100644 --- a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h +++ b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_TOOLBAR_MENU_VIEW_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h"
diff --git a/chrome/browser/ui/views/toolbar/home_button.cc b/chrome/browser/ui/views/toolbar/home_button.cc index 5d09752..dbe4840b 100644 --- a/chrome/browser/ui/views/toolbar/home_button.cc +++ b/chrome/browser/ui/views/toolbar/home_button.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/toolbar/home_button.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/toolbar/home_button.h b/chrome/browser/ui/views/toolbar/home_button.h index 88c7e94..a5914ef 100644 --- a/chrome/browser/ui/views/toolbar/home_button.h +++ b/chrome/browser/ui/views/toolbar/home_button.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_HOME_BUTTON_H_ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_HOME_BUTTON_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/views/toolbar/toolbar_button.h" class Browser;
diff --git a/chrome/browser/ui/views/toolbar/media_router_action_platform_delegate_views.h b/chrome/browser/ui/views/toolbar/media_router_action_platform_delegate_views.h index a202181..aa82857 100644 --- a/chrome/browser/ui/views/toolbar/media_router_action_platform_delegate_views.h +++ b/chrome/browser/ui/views/toolbar/media_router_action_platform_delegate_views.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_MEDIA_ROUTER_ACTION_PLATFORM_DELEGATE_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_MEDIA_ROUTER_ACTION_PLATFORM_DELEGATE_VIEWS_H_ +#include "base/macros.h" #include "chrome/browser/ui/toolbar/media_router_action_platform_delegate.h" // The Views platform delegate for the Media Router component action.
diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc index c0c4e3a..4797104 100644 --- a/chrome/browser/ui/views/toolbar/reload_button.cc +++ b/chrome/browser/ui/views/toolbar/reload_button.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/ui/views/toolbar/reload_button.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h"
diff --git a/chrome/browser/ui/views/toolbar/reload_button.h b/chrome/browser/ui/views/toolbar/reload_button.h index 3d8aa46a..b9e8bf2 100644 --- a/chrome/browser/ui/views/toolbar/reload_button.h +++ b/chrome/browser/ui/views/toolbar/reload_button.h
@@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_RELOAD_BUTTON_H_ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_RELOAD_BUTTON_H_ -#include "base/basictypes.h" #include "base/macros.h" #include "base/timer/timer.h" #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.h b/chrome/browser/ui/views/toolbar/toolbar_action_view.h index 96bd4bd..a0dde7d 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_view.h +++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ #include "base/callback.h" +#include "base/macros.h" #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h" #include "ui/views/animation/ink_drop_host.h" #include "ui/views/context_menu_controller.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc index b87527ea..2aaf36f3 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.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 "base/macros.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/extension_action_test_util.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc index 8c8b8ae..5439c50 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.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 "base/macros.h" #include "base/run_loop.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc index 5822bd9..0d63bd1 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_button.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -8,6 +8,7 @@ #include "base/location.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.h b/chrome/browser/ui/views/toolbar/toolbar_button.h index 0feb40a..637d31a5 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_button.h +++ b/chrome/browser/ui/views/toolbar/toolbar_button.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/geometry/point.h" #include "ui/views/animation/ink_drop_host.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc index d1bc606..ea7d251 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -11,6 +11,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/command_updater.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h index f3d67de0..3b518bc0 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/prefs/pref_member.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc b/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc index 2ee7c5ca..696ff67 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc
@@ -4,7 +4,11 @@ #include "chrome/browser/ui/views/toolbar/toolbar_view.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc index 51999937..8c339aa 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc
@@ -5,6 +5,7 @@ #include "base/location.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" +#include "build/build_config.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" #include "chrome/browser/ui/views/frame/browser_view.h"
diff --git a/chrome/browser/ui/views/touch_uma/touch_uma.h b/chrome/browser/ui/views/touch_uma/touch_uma.h index 34e950be..334c0fea 100644 --- a/chrome/browser/ui/views/touch_uma/touch_uma.h +++ b/chrome/browser/ui/views/touch_uma/touch_uma.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TOUCH_UMA_TOUCH_UMA_H_ #define CHROME_BROWSER_UI_VIEWS_TOUCH_UMA_TOUCH_UMA_H_ -#include "base/basictypes.h" +#include "base/macros.h" class TouchUMA { public:
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc index c8689b171..84408c2 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/translate/translate_bubble_view.h" +#include <stddef.h> + #include <algorithm> #include <string> #include <vector>
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.h b/chrome/browser/ui/views/translate/translate_bubble_view.h index c42430b..c4bf9ea4 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.h +++ b/chrome/browser/ui/views/translate/translate_bubble_view.h
@@ -8,8 +8,8 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/ui/translate/language_combobox_model.h" #include "chrome/browser/ui/translate/translate_bubble_model.h"
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc b/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc index 1c0e41b6c..e5ef9a0 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/translate/translate_bubble_view.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/translate/cld_data_harness.h"
diff --git a/chrome/browser/ui/views/uninstall_view.h b/chrome/browser/ui/views/uninstall_view.h index da2bf7454..49f76b56 100644 --- a/chrome/browser/ui/views/uninstall_view.h +++ b/chrome/browser/ui/views/uninstall_view.h
@@ -7,9 +7,9 @@ #include <map> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/base/models/combobox_model.h" #include "ui/views/controls/button/button.h"
diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc index 8acd6f0a..c5cf3f7 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.cc +++ b/chrome/browser/ui/views/update_recommended_message_box.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/update_recommended_message_box.h" +#include "build/build_config.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/views/update_recommended_message_box.h b/chrome/browser/ui/views/update_recommended_message_box.h index 92b5d1f..3d3a75d1 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.h +++ b/chrome/browser/ui/views/update_recommended_message_box.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_UPDATE_RECOMMENDED_MESSAGE_BOX_H_ #define CHROME_BROWSER_UI_VIEWS_UPDATE_RECOMMENDED_MESSAGE_BOX_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/validation_message_bubble_delegate.h b/chrome/browser/ui/views/validation_message_bubble_delegate.h index 1bf079b..623c07b8 100644 --- a/chrome/browser/ui/views/validation_message_bubble_delegate.h +++ b/chrome/browser/ui/views/validation_message_bubble_delegate.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_VALIDATION_MESSAGE_BUBBLE_DELEGATE_H_ #define CHROME_BROWSER_UI_VIEWS_VALIDATION_MESSAGE_BUBBLE_DELEGATE_H_ +#include "base/macros.h" #include "ui/views/bubble/bubble_delegate.h" // A BubbleDelegateView implementation for form validation message bubble.
diff --git a/chrome/browser/ui/views/validation_message_bubble_view.h b/chrome/browser/ui/views/validation_message_bubble_view.h index a45f3c7..3d2f3a05 100644 --- a/chrome/browser/ui/views/validation_message_bubble_view.h +++ b/chrome/browser/ui/views/validation_message_bubble_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_VALIDATION_MESSAGE_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_VALIDATION_MESSAGE_BUBBLE_VIEW_H_ +#include "base/macros.h" #include "chrome/browser/ui/validation_message_bubble.h" #include "chrome/browser/ui/views/validation_message_bubble_delegate.h"
diff --git a/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc b/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc index 7a9e8b8..474c592 100644 --- a/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc +++ b/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc
@@ -4,6 +4,7 @@ #include <set> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/platform_util.h" #include "components/constrained_window/constrained_window_views.h"
diff --git a/chrome/browser/ui/views/web_dialog_view_browsertest.cc b/chrome/browser/ui/views/web_dialog_view_browsertest.cc index d14883e..7bdfaa11 100644 --- a/chrome/browser/ui/views/web_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/web_dialog_view_browsertest.cc
@@ -5,7 +5,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc index 3330818f..5d4d566b 100644 --- a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc +++ b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc
@@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.cc b/chrome/browser/ui/views/website_settings/permission_selector_view.cc index 7f92daa..c20dfcb 100644 --- a/chrome/browser/ui/views/website_settings/permission_selector_view.cc +++ b/chrome/browser/ui/views/website_settings/permission_selector_view.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/website_settings/permission_selector_view.h" #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/website_settings/permission_menu_model.h" #include "chrome/browser/ui/website_settings/website_settings_ui.h"
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.h b/chrome/browser/ui/views/website_settings/permission_selector_view.h index 20391ac..0f9836c 100644 --- a/chrome/browser/ui/views/website_settings/permission_selector_view.h +++ b/chrome/browser/ui/views/website_settings/permission_selector_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc index 288fe223..589da89e 100644 --- a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc +++ b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc index d17af84..ab9eb80 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
@@ -4,10 +4,13 @@ #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h" +#include <stddef.h> + #include <algorithm> #include <vector> #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.h b/chrome/browser/ui/views/website_settings/website_settings_popup_view.h index d2581b1..3302546 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.h +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc index 588f091..4fabec7 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h" +#include "base/macros.h" #include "chrome/browser/ui/views/website_settings/permission_selector_view.h" #include "chrome/test/base/testing_profile.h" #include "content/public/common/ssl_status.h"
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 5d5a332..1fdbd52 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/ui/webui/about_ui.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <string> #include <utility> @@ -17,6 +20,7 @@ #include "base/format_macros.h" #include "base/i18n/number_formatting.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/metrics/statistics_recorder.h" #include "base/strings/string_number_conversions.h" @@ -27,6 +31,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" @@ -539,7 +544,7 @@ std::string AboutDiscards(const std::string& path) { std::string output; - int64 web_content_id; + int64_t web_content_id; memory::TabManager* tab_manager = g_browser_process->GetTabManager(); std::vector<std::string> path_split = base::SplitString(
diff --git a/chrome/browser/ui/webui/about_ui.h b/chrome/browser/ui/webui/about_ui.h index b453c5b..e0dbfe5 100644 --- a/chrome/browser/ui/webui/about_ui.h +++ b/chrome/browser/ui/webui/about_ui.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/app_launcher_login_handler.cc b/chrome/browser/ui/webui/app_launcher_login_handler.cc index 0391c99..7d3690e 100644 --- a/chrome/browser/ui/webui/app_launcher_login_handler.cc +++ b/chrome/browser/ui/webui/app_launcher_login_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/app_launcher_login_handler.h" +#include <stddef.h> + #include <string> #include "base/bind.h" @@ -12,6 +14,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h"
diff --git a/chrome/browser/ui/webui/app_launcher_page_ui.h b/chrome/browser/ui/webui/app_launcher_page_ui.h index d51bd71..e0222b8 100644 --- a/chrome/browser/ui/webui/app_launcher_page_ui.h +++ b/chrome/browser/ui/webui/app_launcher_page_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_APP_LAUNCHER_PAGE_UI_H_ #define CHROME_BROWSER_UI_WEBUI_APP_LAUNCHER_PAGE_UI_H_ +#include "base/macros.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/app_list/start_page_handler.h b/chrome/browser/ui/webui/app_list/start_page_handler.h index 25293dd46..f3a294d 100644 --- a/chrome/browser/ui/webui/app_list/start_page_handler.h +++ b/chrome/browser/ui/webui/app_list/start_page_handler.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_APP_LIST_START_PAGE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_APP_LIST_START_PAGE_HANDLER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/app_list/start_page_ui.h b/chrome/browser/ui/webui/app_list/start_page_ui.h index fa70e06..0408914 100644 --- a/chrome/browser/ui/webui/app_list/start_page_ui.h +++ b/chrome/browser/ui/webui/app_list/start_page_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_APP_LIST_START_PAGE_UI_H_ #define CHROME_BROWSER_UI_WEBUI_APP_LIST_START_PAGE_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace app_list {
diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc index cb83a4d..ea05f5a9 100644 --- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc +++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
@@ -14,6 +14,7 @@ #include "base/threading/platform_thread.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/prefs/session_startup_pref.h"
diff --git a/chrome/browser/ui/webui/bookmarks_ui.h b/chrome/browser/ui/webui/bookmarks_ui.h index 970ccf3..a4a1355 100644 --- a/chrome/browser/ui/webui/bookmarks_ui.h +++ b/chrome/browser/ui/webui/bookmarks_ui.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc index 8560489..410e7fcb 100644 --- a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc +++ b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/test/test_timeouts.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/ui/webui/browsing_history_handler.cc b/chrome/browser/ui/webui/browsing_history_handler.cc index 86b83ff..2ca90cc 100644 --- a/chrome/browser/ui/webui/browsing_history_handler.cc +++ b/chrome/browser/ui/webui/browsing_history_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/browsing_history_handler.h" +#include <stddef.h> + #include <set> #include "base/bind.h" @@ -222,7 +224,7 @@ // Pass the timestamps in a list. scoped_ptr<base::ListValue> timestamps(new base::ListValue); - for (std::set<int64>::const_iterator it = all_timestamps.begin(); + for (std::set<int64_t>::const_iterator it = all_timestamps.begin(); it != all_timestamps.end(); ++it) { timestamps->AppendDouble(base::Time::FromInternalValue(*it).ToJsTime()); } @@ -761,7 +763,7 @@ for (int j = 0; j < static_cast<int>(ids->GetSize()); ++j) { const base::DictionaryValue* id = NULL; std::string timestamp_string; - int64 timestamp_usec = 0; + int64_t timestamp_usec = 0; if (!ids->GetDictionary(j, &id) || !id->GetString("timestamp_usec", ×tamp_string) ||
diff --git a/chrome/browser/ui/webui/browsing_history_handler.h b/chrome/browser/ui/webui/browsing_history_handler.h index 38f7777..fa64833f5 100644 --- a/chrome/browser/ui/webui/browsing_history_handler.h +++ b/chrome/browser/ui/webui/browsing_history_handler.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_ +#include <stdint.h> + #include <string> #include "base/macros.h" @@ -85,7 +87,7 @@ std::string client_id; // Timestamps of all local or remote visits the same URL on the same day. - std::set<int64> all_timestamps; + std::set<int64_t> all_timestamps; // If true, this entry is a search result. bool is_search_result;
diff --git a/chrome/browser/ui/webui/browsing_history_handler_unittest.cc b/chrome/browser/ui/webui/browsing_history_handler_unittest.cc index 9a097be..11ad576d 100644 --- a/chrome/browser/ui/webui/browsing_history_handler_unittest.cc +++ b/chrome/browser/ui/webui/browsing_history_handler_unittest.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/ui/webui/browsing_history_handler.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" @@ -11,7 +14,7 @@ struct TestResult { std::string url; - int64 hour_offset; // Visit time in hours past the baseline time. + int64_t hour_offset; // Visit time in hours past the baseline time. }; // Duplicates on the same day in the local timezone are removed, so set a
diff --git a/chrome/browser/ui/webui/certificate_viewer_ui.h b/chrome/browser/ui/webui/certificate_viewer_ui.h index 3bad0ca..5355a07 100644 --- a/chrome/browser/ui/webui/certificate_viewer_ui.h +++ b/chrome/browser/ui/webui/certificate_viewer_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CERTIFICATE_VIEWER_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CERTIFICATE_VIEWER_UI_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" #include "ui/web_dialogs/web_dialog_ui.h"
diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.h b/chrome/browser/ui/webui/certificate_viewer_webui.h index 367f4510..530dfb7e 100644 --- a/chrome/browser/ui/webui/certificate_viewer_webui.h +++ b/chrome/browser/ui/webui/certificate_viewer_webui.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/values.h" #include "content/public/browser/web_ui_message_handler.h" #include "net/cert/x509_certificate.h"
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc b/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc index 543b7f8..78ffc32 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.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 "base/macros.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h"
diff --git a/chrome/browser/ui/webui/chrome_web_contents_handler.h b/chrome/browser/ui/webui/chrome_web_contents_handler.h index 2755a16..b88ea3e 100644 --- a/chrome/browser/ui/webui/chrome_web_contents_handler.h +++ b/chrome/browser/ui/webui/chrome_web_contents_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROME_WEB_CONTENTS_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/web_dialogs/web_dialog_web_contents_delegate.h" class ChromeWebContentsHandler
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 8f390925..2689679 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" +#include <stddef.h> + #include <vector> #include "base/bind.h" @@ -11,6 +13,7 @@ #include "base/location.h" #include "base/prefs/pref_service.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" #include "chrome/browser/engagement/site_engagement_service.h"
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h index 909a80ce..29064b60 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_CONTROLLER_FACTORY_H_ #define CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_CONTROLLER_FACTORY_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/favicon_base/favicon_callback.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h b/chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h index 90c2666..db265057 100644 --- a/chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h +++ b/chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_BLUETOOTH_PAIRING_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_BLUETOOTH_PAIRING_UI_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/web_dialogs/web_dialog_ui.h"
diff --git a/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.cc b/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.cc index 9b7cbf3..408351c 100644 --- a/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.cc +++ b/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h b/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h index 4375d00b..59b1622 100644 --- a/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h +++ b/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_CERTIFICATE_MANAGER_DIALOG_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_CERTIFICATE_MANAGER_DIALOG_UI_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/web_dialogs/web_dialog_ui.h"
diff --git a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc index 3db332e..85e29c9 100644 --- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc +++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h" +#include <stddef.h> + #include <set> #include <string> @@ -11,6 +13,7 @@ #include "base/bind_helpers.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h index 20ca6363..fcfba14 100644 --- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h +++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_CHOOSE_MOBILE_NETWORK_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_CHOOSE_MOBILE_NETWORK_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/cryptohome_ui.h b/chrome/browser/ui/webui/chromeos/cryptohome_ui.h index d0d46e66..f616d288 100644 --- a/chrome/browser/ui/webui/chromeos/cryptohome_ui.h +++ b/chrome/browser/ui/webui/chromeos/cryptohome_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_CRYPTOHOME_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_CRYPTOHOME_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.h b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.h index aa7b9af..741fb728 100644 --- a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.h +++ b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chromeos/dbus/dbus_method_call_status.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc index 112ddf7..70c5ab5 100644 --- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc +++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
@@ -4,10 +4,14 @@ #include "chrome/browser/ui/webui/chromeos/drive_internals_ui.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" @@ -69,11 +73,11 @@ base::FileEnumerator::SHOW_SYM_LINKS); base::FileEnumerator enumerator(root_path, true /* recursive */, options); - int64 total_size = 0; + int64_t total_size = 0; for (base::FilePath current = enumerator.Next(); !current.empty(); current = enumerator.Next()) { base::FileEnumerator::FileInfo info = enumerator.GetInfo(); - int64 size = info.GetSize(); + int64_t size = info.GetSize(); const bool is_directory = info.IsDirectory(); const bool is_symbolic_link = base::IsLink(info.GetName()); const base::Time last_modified = info.GetLastModifiedTime(); @@ -111,7 +115,7 @@ DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(local_storage_summary); - const int64 free_space = base::SysInfo::AmountOfFreeDiskSpace(home_path); + const int64_t free_space = base::SysInfo::AmountOfFreeDiskSpace(home_path); local_storage_summary->SetDouble("free_space", free_space); }
diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.h b/chrome/browser/ui/webui/chromeos/drive_internals_ui.h index 413f798..de0009e 100644 --- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.h +++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.h
@@ -4,6 +4,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_DRIVE_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_DRIVE_INTERNALS_UI_H_ + +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc index 7962d0f..4ae24a74 100644 --- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc +++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h" +#include <stdint.h> + #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" #include "base/bind.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chromeos/dbus/dbus_thread_manager.h" @@ -325,7 +328,7 @@ void DeviceEmulatorMessageHandler::HandleRemoveAudioNode( const base::ListValue* args) { std::string tmp_id; - uint64 id; + uint64_t id; CHECK(args->GetString(0, &tmp_id)); CHECK(base::StringToUint64(tmp_id, &id));
diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h index a6d5224..62a04d9 100644 --- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h +++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_EMULATOR_DEVICE_EMULATOR_MESSAGE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_EMULATOR_DEVICE_EMULATOR_MESSAGE_HANDLER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chromeos/dbus/power_manager/power_supply_properties.pb.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h index a695e213..91a8875 100644 --- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h +++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_EMULATOR_DEVICE_EMULATOR_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_EMULATOR_DEVICE_EMULATOR_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace power_manager {
diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.h b/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.h index 0c9174b..b5cbce3 100644 --- a/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.h +++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/chromeos/first_run/first_run_actor.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h index 0b48e7e..e53964d9 100644 --- a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h +++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_FIRST_RUN_FIRST_RUN_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_FIRST_RUN_FIRST_RUN_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace content {
diff --git a/chrome/browser/ui/webui/chromeos/image_source.cc b/chrome/browser/ui/webui/chromeos/image_source.cc index cd6eb41..5e51f37 100644 --- a/chrome/browser/ui/webui/chromeos/image_source.cc +++ b/chrome/browser/ui/webui/chromeos/image_source.cc
@@ -4,11 +4,14 @@ #include "chrome/browser/ui/webui/chromeos/image_source.h" +#include <stddef.h> + #include <vector> #include "base/bind.h" #include "base/files/file_util.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc index 623879c1..48588919 100644 --- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc +++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
@@ -4,11 +4,14 @@ #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h" +#include <stddef.h> + #include "ash/display/display_manager.h" #include "ash/shell.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h index d693465..002dad9c 100644 --- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h +++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_KEYBOARD_OVERLAY_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_KEYBOARD_OVERLAY_UI_H_ +#include "base/macros.h" #include "ui/web_dialogs/web_dialog_ui.h" class KeyboardOverlayUI : public ui::WebDialogUI {
diff --git a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h index 59a3eb65..a49c958 100644 --- a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h" #include "chrome/browser/chromeos/login/screens/network_error_model.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/authenticated_user_email_retriever.h b/chrome/browser/ui/webui/chromeos/login/authenticated_user_email_retriever.h index ba938e7..910f496 100644 --- a/chrome/browser/ui/webui/chromeos/login/authenticated_user_email_retriever.h +++ b/chrome/browser/ui/webui/chromeos/login/authenticated_user_email_retriever.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "google_apis/gaia/gaia_auth_consumer.h" #include "google_apis/gaia/gaia_auth_fetcher.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h index 73883141..2c7c6822 100644 --- a/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_AUTO_ENROLLMENT_CHECK_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h index aadad3a..7824a44d 100644 --- a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/model_view_channel.h" #include "components/login/base_screen_handler_utils.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h index 6248d1c..5f90e1e3 100644 --- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h" #include "chrome/browser/chromeos/login/version_info_updater.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h index eb77be07..c7f49cf5 100644 --- a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h +++ b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h index a36b1d4..469d2b0 100644 --- a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_ENABLE_DEBUGGING_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/login/help_app_launcher.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h index e63c850..4198e52 100644 --- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc index d3fc21f..ef2819b7 100644 --- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
@@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" #include "chrome/browser/chromeos/login/helper.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h index 09650e8..a2f9276 100644 --- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_EULA_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/chromeos/login/screens/eula_view.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h index 2e82d52e..4d7005ae 100644 --- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h index d9aea37..6b8d76a 100644 --- a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_HID_DETECTION_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_registry_simple.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc b/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc index b4f09b8a..809c7f1 100644 --- a/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc +++ b/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc
@@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/account_tracker_service_factory.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.h b/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.h index 4c9c2d5..d4309c6 100644 --- a/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.h +++ b/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_INLINE_LOGIN_HANDLER_CHROMEOS_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_INLINE_LOGIN_HANDLER_CHROMEOS_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/signin/inline_login_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc index 9934b058..1dc0fff6 100644 --- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h index ed0be00..f3d5c7e 100644 --- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h index 63b826d..01be4a23 100644 --- a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_KIOSK_AUTOLAUNCH_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h" #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen_actor.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h index 4926967..5498785 100644 --- a/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_KIOSK_ENABLE_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" #include "chrome/browser/chromeos/login/screens/kiosk_enable_screen_actor.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc index 0d2a65e..4e9effb 100644 --- a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc
@@ -4,13 +4,14 @@ #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" +#include <stddef.h> + #include <algorithm> #include <iterator> #include <map> #include <set> #include <utility> -#include "base/basictypes.h" #include "base/bind.h" #include "base/i18n/rtl.h" #include "base/location.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc index 3cca922..0b8642c 100644 --- a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc
@@ -4,8 +4,9 @@ #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" +#include <stddef.h> + #include "base/at_exit.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc index dd2aa82..dd7d245 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
@@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h index 194db47..76f2949 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/timer/timer.h" #include "chrome/browser/chromeos/status/network_menu.h" #include "chromeos/network/network_state_handler_observer.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h index f4705c0..14ffb66 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc index 0054e2fd..d4d07bf 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h index 78813817d..646f66ad 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/base/locale_util.h" #include "chrome/browser/chromeos/login/screens/network_view.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc index 287a357..7cd5e53 100644 --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -4,10 +4,13 @@ #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" +#include <stddef.h> + #include "ash/shell_window_ids.h" #include "ash/wm/screen_dimmer.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h index d710683..7ddc98b 100644 --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h index aeb8fb4..fbebfb3 100644 --- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_RESET_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/reset_view.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h index 714f59a..013fd33 100644 --- a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h +++ b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h
@@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ui/gfx/image/image.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h index 87bf490..8d89b68 100644 --- a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h +++ b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SCREENLOCK_ICON_SOURCE_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SCREENLOCK_ICON_SOURCE_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/url_data_source.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index e20843831..f3dc18055 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" +#include <stddef.h> + #include <algorithm> #include <vector> @@ -13,6 +15,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h index 56112fc..f7ca0f4 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
@@ -9,10 +9,10 @@ #include <set> #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc index aa8f2ec..3f935e7 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "ash/test/ash_test_base.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h index 7fcc42e..d2345f5 100644 --- a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" #include "components/user_manager/user_image/default_user_images.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h index 60d3ed55..adf55e37 100644 --- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/base/locale_util.h" #include "chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h index 13151fb..45280366 100644 --- a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/update_view.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h index fd8d52e..6af410a 100644 --- a/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_USER_BOARD_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/chromeos/login/ui/views/user_board_view.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h index ff15eed3..d67a52e6 100644 --- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/chromeos/login/screens/user_image_view.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h index 93596f2..367465c 100644 --- a/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_WRONG_HWID_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen_actor.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc index b3eb49c19..a7b64f57 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_shutdown.h"
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h index a50eb327..50f5460 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/singleton.h" #include "ui/web_dialogs/web_dialog_ui.h"
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index 40e9d6d..95ab6a2 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h" +#include <stddef.h> + #include <algorithm> #include <map> #include <string> @@ -12,6 +14,7 @@ #include "base/bind_helpers.h" #include "base/json/json_writer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h index ff6182b..048cf794 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_MOBILE_SETUP_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_MOBILE_SETUP_UI_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/chromeos/network_ui.cc b/chrome/browser/ui/webui/chromeos/network_ui.cc index e676261..697e2c2 100644 --- a/chrome/browser/ui/webui/chromeos/network_ui.cc +++ b/chrome/browser/ui/webui/chromeos/network_ui.cc
@@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/tab_helper.h"
diff --git a/chrome/browser/ui/webui/chromeos/network_ui.h b/chrome/browser/ui/webui/chromeos/network_ui.h index 7921ac8..72d7863 100644 --- a/chrome/browser/ui/webui/chromeos/network_ui.h +++ b/chrome/browser/ui/webui/chromeos/network_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_NETWORK_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_NETWORK_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/nfc_debug_ui.cc b/chrome/browser/ui/webui/chromeos/nfc_debug_ui.cc index 9f3244e..802877c8 100644 --- a/chrome/browser/ui/webui/chromeos/nfc_debug_ui.cc +++ b/chrome/browser/ui/webui/chromeos/nfc_debug_ui.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/webui/chromeos/nfc_debug_ui.h b/chrome/browser/ui/webui/chromeos/nfc_debug_ui.h index b376d424..0bd4470c 100644 --- a/chrome/browser/ui/webui/chromeos/nfc_debug_ui.h +++ b/chrome/browser/ui/webui/chromeos/nfc_debug_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_NFC_DEBUG_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_NFC_DEBUG_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/power_ui.cc b/chrome/browser/ui/webui/chromeos/power_ui.cc index b3db0d0..e3fc6a8d 100644 --- a/chrome/browser/ui/webui/chromeos/power_ui.cc +++ b/chrome/browser/ui/webui/chromeos/power_ui.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/power_ui.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h"
diff --git a/chrome/browser/ui/webui/chromeos/power_ui.h b/chrome/browser/ui/webui/chromeos/power_ui.h index 58def7f..19e21c9 100644 --- a/chrome/browser/ui/webui/chromeos/power_ui.h +++ b/chrome/browser/ui/webui/chromeos/power_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_POWER_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_POWER_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc index e96976a..a9f5bfa 100644 --- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc +++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h index 1e413121..895625d 100644 --- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h +++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/web_dialogs/web_dialog_ui.h"
diff --git a/chrome/browser/ui/webui/chromeos/salsa_ui.cc b/chrome/browser/ui/webui/chromeos/salsa_ui.cc index f919155..efc7ef1 100644 --- a/chrome/browser/ui/webui/chromeos/salsa_ui.cc +++ b/chrome/browser/ui/webui/chromeos/salsa_ui.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/chromeos/salsa_ui.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/chromeos/salsa_ui.h b/chrome/browser/ui/webui/chromeos/salsa_ui.h index 9ec47703..40a62e1 100644 --- a/chrome/browser/ui/webui/chromeos/salsa_ui.h +++ b/chrome/browser/ui/webui/chromeos/salsa_ui.h
@@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/chromeos/set_time_ui.cc b/chrome/browser/ui/webui/chromeos/set_time_ui.cc index d4719eb4..b32d79b 100644 --- a/chrome/browser/ui/webui/chromeos/set_time_ui.cc +++ b/chrome/browser/ui/webui/chromeos/set_time_ui.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/ui/webui/chromeos/set_time_ui.h" +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/build_time.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/system/timezone_util.h" @@ -78,7 +81,7 @@ } chromeos::DBusThreadManager::Get()->GetSystemClockClient()->SetTime( - static_cast<int64>(seconds)); + static_cast<int64_t>(seconds)); } // Handler for Javascript call to change the system time zone when the user
diff --git a/chrome/browser/ui/webui/chromeos/set_time_ui.h b/chrome/browser/ui/webui/chromeos/set_time_ui.h index 9d16b25..a63a0ed5 100644 --- a/chrome/browser/ui/webui/chromeos/set_time_ui.h +++ b/chrome/browser/ui/webui/chromeos/set_time_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_SET_TIME_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_SET_TIME_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/web_dialogs/web_dialog_ui.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc index 5f8718f7..292ab14 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
@@ -4,13 +4,16 @@ #include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h" +#include <stddef.h> +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" @@ -383,7 +386,7 @@ return; sim_lock_type_ = cellular_device->sim_lock_type(); - uint32 retries_left = cellular_device->sim_retries_left(); + uint32_t retries_left = cellular_device->sim_retries_left(); VLOG(1) << "OnNetworkDeviceSimLockChanged, lock: " << sim_lock_type_ << ", retries: " << retries_left; // There's a pending PIN operation. @@ -656,7 +659,7 @@ const DeviceState* cellular) { std::string error_msg; if (cellular) { - uint32 retries_left = cellular->sim_retries_left(); + uint32_t retries_left = cellular->sim_retries_left(); VLOG(1) << "Current state: " << state_ << " lock_type: " << sim_lock_type_ << " retries: " << retries_left; switch (state_) {
diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h index 7ad9b03..f7b03d8 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_SIM_UNLOCK_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_SIM_UNLOCK_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc b/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc index bdd3968..7443384 100644 --- a/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc +++ b/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/slow_trace_ui.h" +#include <stddef.h> + #include "base/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/ui/webui/chromeos/slow_trace_ui.h b/chrome/browser/ui/webui/chromeos/slow_trace_ui.h index 5daaddd7..bdd470b3 100644 --- a/chrome/browser/ui/webui/chromeos/slow_trace_ui.h +++ b/chrome/browser/ui/webui/chromeos/slow_trace_ui.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/chromeos/slow_ui.cc b/chrome/browser/ui/webui/chromeos/slow_ui.cc index b61840a..60822e1 100644 --- a/chrome/browser/ui/webui/chromeos/slow_ui.cc +++ b/chrome/browser/ui/webui/chromeos/slow_ui.cc
@@ -7,6 +7,7 @@ #include <string> #include "base/bind.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/chromeos/slow_ui.h b/chrome/browser/ui/webui/chromeos/slow_ui.h index 1a3e1b6a..3ba37aec 100644 --- a/chrome/browser/ui/webui/chromeos/slow_ui.h +++ b/chrome/browser/ui/webui/chromeos/slow_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_SLOW_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_SLOW_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h b/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h index 037fa35..d3d0f46 100644 --- a/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h +++ b/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_TOUCH_VIEW_CONTROLLER_DELEGATE_H_ #include "ash/shell_observer.h" +#include "base/macros.h" #include "base/observer_list.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/components_ui.cc b/chrome/browser/ui/webui/components_ui.cc index a929a16..581ca6f 100644 --- a/chrome/browser/ui/webui/components_ui.cc +++ b/chrome/browser/ui/webui/components_ui.cc
@@ -4,11 +4,15 @@ #include "chrome/browser/ui/webui/components_ui.h" +#include <stddef.h> + #include <algorithm> #include <string> #include <vector> +#include "base/macros.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/webui/components_ui.h b/chrome/browser/ui/webui/components_ui.h index f184dbe..f2e2942 100644 --- a/chrome/browser/ui/webui/components_ui.h +++ b/chrome/browser/ui/webui/components_ui.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "components/component_updater/component_updater_service.h" #include "components/update_client/crx_update_item.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc index e101888..9063116 100644 --- a/chrome/browser/ui/webui/conflicts_ui.cc +++ b/chrome/browser/ui/webui/conflicts_ui.cc
@@ -10,10 +10,12 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/enumerate_modules_model_win.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/conflicts_ui.h b/chrome/browser/ui/webui/conflicts_ui.h index a5ee969..46735f14 100644 --- a/chrome/browser/ui/webui/conflicts_ui.h +++ b/chrome/browser/ui/webui/conflicts_ui.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_ +#include "base/macros.h" +#include "build/build_config.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h index 973608f6..fee4931 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h +++ b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CONSTRAINED_WEB_DIALOG_DELEGATE_BASE_H_ #define CHROME_BROWSER_UI_WEBUI_CONSTRAINED_WEB_DIALOG_DELEGATE_BASE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" #include "ui/web_dialogs/web_dialog_ui.h"
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui.cc index 30b7cce..1b88b6c 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_ui.cc +++ b/chrome/browser/ui/webui/constrained_web_dialog_ui.cc
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/values.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_view_host.h"
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui.h b/chrome/browser/ui/webui/constrained_web_dialog_ui.h index 62c9a8b..4f7159e5 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_ui.h +++ b/chrome/browser/ui/webui/constrained_web_dialog_ui.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CONSTRAINED_WEB_DIALOG_UI_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc index 08fec2d4..cc1a222 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc +++ b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
@@ -6,6 +6,7 @@ #include "base/location.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.cc b/chrome/browser/ui/webui/cookies_tree_model_util.cc index 968f9def..3b0df4f 100644 --- a/chrome/browser/ui/webui/cookies_tree_model_util.cc +++ b/chrome/browser/ui/webui/cookies_tree_model_util.cc
@@ -13,6 +13,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browsing_data/cookies_tree_model.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/cache_storage_context.h" @@ -66,7 +67,7 @@ const char kKeyScopes[] = "scopes"; -const int64 kNegligibleUsage = 1024; // 1KiB +const int64_t kNegligibleUsage = 1024; // 1KiB } // namespace @@ -81,7 +82,7 @@ if (iter != node_map_.end()) return base::IntToString(iter->second); - int32 new_id = id_map_.Add(node); + int32_t new_id = id_map_.Add(node); node_map_[node] = new_id; return base::IntToString(new_id); } @@ -340,7 +341,7 @@ // Validate the tree path and get the node pointer. for (const base::StringPiece& cur_node : base::SplitStringPiece( path, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) { - int32 node_id = 0; + int32_t node_id = 0; if (!base::StringToInt(cur_node, &node_id)) break;
diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.h b/chrome/browser/ui/webui/cookies_tree_model_util.h index 1020885..893f70e 100644 --- a/chrome/browser/ui/webui/cookies_tree_model_util.h +++ b/chrome/browser/ui/webui/cookies_tree_model_util.h
@@ -5,11 +5,13 @@ #ifndef CHROME_BROWSER_UI_WEBUI_COOKIES_TREE_MODEL_UTIL_H_ #define CHROME_BROWSER_UI_WEBUI_COOKIES_TREE_MODEL_UTIL_H_ +#include <stdint.h> + #include <map> #include <string> -#include "base/basictypes.h" #include "base/id_map.h" +#include "base/macros.h" class CookieTreeNode; @@ -40,7 +42,7 @@ private: typedef IDMap<const CookieTreeNode> CookiesTreeNodeIdMap; - typedef std::map<const CookieTreeNode*, int32> CookieTreeNodeMap; + typedef std::map<const CookieTreeNode*, int32_t> CookieTreeNodeMap; // Populate given |dict| with cookie tree node properties. |id_map| maps // a CookieTreeNode to an ID and creates a new ID if |node| is not in the
diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc index 5961b224..6cc6c99a 100644 --- a/chrome/browser/ui/webui/crashes_ui.cc +++ b/chrome/browser/ui/webui/crashes_ui.cc
@@ -4,11 +4,15 @@ #include "chrome/browser/ui/webui/crashes_ui.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/crash_upload_list.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/crashes_ui.h b/chrome/browser/ui/webui/crashes_ui.h index 99a678c..7292218a 100644 --- a/chrome/browser/ui/webui/crashes_ui.h +++ b/chrome/browser/ui/webui/crashes_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CRASHES_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CRASHES_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/device_log_ui.cc b/chrome/browser/ui/webui/device_log_ui.cc index 49993b49f..04d325d 100644 --- a/chrome/browser/ui/webui/device_log_ui.cc +++ b/chrome/browser/ui/webui/device_log_ui.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h"
diff --git a/chrome/browser/ui/webui/device_log_ui.h b/chrome/browser/ui/webui/device_log_ui.h index e08a33d..cee91ebb 100644 --- a/chrome/browser/ui/webui/device_log_ui.h +++ b/chrome/browser/ui/webui/device_log_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_DEVICE_LOG_UI_H_ #define CHROME_BROWSER_UI_WEBUI_DEVICE_LOG_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc index 68ccc018..1c5f89a5 100644 --- a/chrome/browser/ui/webui/devtools_ui.cc +++ b/chrome/browser/ui/webui/devtools_ui.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/devtools_ui.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/webui/devtools_ui.h b/chrome/browser/ui/webui/devtools_ui.h index 90045f1..5ee6b80 100644 --- a/chrome/browser/ui/webui/devtools_ui.h +++ b/chrome/browser/ui/webui/devtools_ui.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_DEVTOOLS_UI_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/devtools/devtools_ui_bindings.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/domain_reliability_internals_ui.h b/chrome/browser/ui/webui/domain_reliability_internals_ui.h index 401f01b..9228ea51 100644 --- a/chrome/browser/ui/webui/domain_reliability_internals_ui.h +++ b/chrome/browser/ui/webui/domain_reliability_internals_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_DOMAIN_RELIABILITY_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_DOMAIN_RELIABILITY_INTERNALS_UI_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc index 6ea362e..36f0fbc 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler.cc
@@ -4,10 +4,11 @@ #include "chrome/browser/ui/webui/downloads_dom_handler.h" +#include <stddef.h> + #include <algorithm> #include <functional> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/rtl.h" @@ -505,7 +506,7 @@ if (removals_.empty()) return; - const std::set<uint32> last_removed_ids = removals_.back(); + const std::set<uint32_t> last_removed_ids = removals_.back(); removals_.pop_back(); for (auto id : last_removed_ids) { @@ -548,7 +549,7 @@ void DownloadsDOMHandler::RemoveDownloads( const std::vector<content::DownloadItem*>& to_remove) { - std::set<uint32> ids; + std::set<uint32_t> ids; for (auto* download : to_remove) { DownloadItemModel item_model(download); @@ -606,7 +607,7 @@ void DownloadsDOMHandler::FinalizeRemovals() { while (!removals_.empty()) { - const std::set<uint32> remove = removals_.back(); + const std::set<uint32_t> remove = removals_.back(); removals_.pop_back(); for (const auto id : remove) { @@ -690,16 +691,16 @@ return nullptr; } - uint64 id; + uint64_t id; if (!base::StringToUint64(download_id, &id)) { NOTREACHED(); return nullptr; } - return GetDownloadById(static_cast<uint32>(id)); + return GetDownloadById(static_cast<uint32_t>(id)); } -content::DownloadItem* DownloadsDOMHandler::GetDownloadById(uint32 id) { +content::DownloadItem* DownloadsDOMHandler::GetDownloadById(uint32_t id) { content::DownloadItem* item = NULL; if (GetMainNotifierManager()) item = GetMainNotifierManager()->GetDownload(id);
diff --git a/chrome/browser/ui/webui/downloads_dom_handler.h b/chrome/browser/ui/webui/downloads_dom_handler.h index bf30369..1324642 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.h +++ b/chrome/browser/ui/webui/downloads_dom_handler.h
@@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_UI_WEBUI_DOWNLOADS_DOM_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_DOWNLOADS_DOM_HANDLER_H_ +#include <stdint.h> + #include <set> #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/download/all_download_item_notifier.h" #include "chrome/browser/download/download_danger_prompt.h" @@ -139,7 +142,7 @@ content::DownloadItem* GetDownloadByValue(const base::ListValue* args); // Returns the download with |id| or NULL if it doesn't exist. - content::DownloadItem* GetDownloadById(uint32 id); + content::DownloadItem* GetDownloadById(uint32_t id); // Remove all downloads in |to_remove| with the ability to undo removal later. void RemoveDownloads(const std::vector<content::DownloadItem*>& to_remove); @@ -159,13 +162,13 @@ scoped_ptr<AllDownloadItemNotifier> original_notifier_; // IDs of downloads to remove when this handler gets deleted. - std::vector<std::set<uint32>> removals_; + std::vector<std::set<uint32_t>> removals_; // Whether a call to SendCurrentDownloads() is currently scheduled. bool update_scheduled_; // IDs of new downloads that the page doesn't know about yet. - std::set<uint32> new_downloads_; + std::set<uint32_t> new_downloads_; base::WeakPtrFactory<DownloadsDOMHandler> weak_ptr_factory_;
diff --git a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc index 1e0b1f1..52eadc4 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc
@@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/auto_reset.h" #include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/download/download_item_model.h"
diff --git a/chrome/browser/ui/webui/downloads_ui.h b/chrome/browser/ui/webui/downloads_ui.h index 3dd07442..7ac8707 100644 --- a/chrome/browser/ui/webui/downloads_ui.h +++ b/chrome/browser/ui/webui/downloads_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/downloads_ui_browsertest.h b/chrome/browser/ui/webui/downloads_ui_browsertest.h index ef39dd4..38e718a 100644 --- a/chrome/browser/ui/webui/downloads_ui_browsertest.h +++ b/chrome/browser/ui/webui/downloads_ui_browsertest.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_BROWSERTEST_H_ #define CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_BROWSERTEST_H_ +#include "base/macros.h" #include "chrome/test/base/web_ui_browser_test.h" // This is a helper class used by downloads_ui_browsertest.js.
diff --git a/chrome/browser/ui/webui/engagement/site_engagement_ui.cc b/chrome/browser/ui/webui/engagement/site_engagement_ui.cc index c6062162..f1c29e8 100644 --- a/chrome/browser/ui/webui/engagement/site_engagement_ui.cc +++ b/chrome/browser/ui/webui/engagement/site_engagement_ui.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/engagement/site_engagement_ui.h" +#include "base/macros.h" #include "chrome/browser/engagement/site_engagement_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc index 76a312b..ce6432f 100644 --- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc +++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h" +#include <stddef.h> + #include <algorithm> #include <set> #include <string>
diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h index 83fa88e..6bfb315 100644 --- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h +++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index a2218eb9..2230e3c4 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/ref_counted_memory.h"
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.h b/chrome/browser/ui/webui/extensions/extension_icon_source.h index ca50b4e..4e838f90 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.h +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/task/cancelable_task_tracker.h" #include "components/favicon/core/favicon_service.h"
diff --git a/chrome/browser/ui/webui/extensions/extension_loader_handler.h b/chrome/browser/ui/webui/extensions/extension_loader_handler.h index 02415d0..f3ce533 100644 --- a/chrome/browser/ui/webui/extensions/extension_loader_handler.h +++ b/chrome/browser/ui/webui/extensions/extension_loader_handler.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_LOADER_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_LOADER_HANDLER_H_ +#include <stddef.h> + #include <string> #include <vector>
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc index c74bbf6..c7a3a20b 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/extensions/extension_settings_browsertest.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h index f04fd35..6aa02f5c 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h +++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ +#include "base/macros.h" #include "chrome/browser/extensions/extension_test_notification_observer.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/test/base/web_ui_browser_test.h"
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.h b/chrome/browser/ui/webui/extensions/extension_settings_handler.h index c380ede6..6df7e5fb 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.h +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_ +#include "base/macros.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc index 77716c4..3d852f85 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/extensions/extensions_ui.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/extensions/extension_loader_handler.h" #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.h b/chrome/browser/ui/webui/extensions/extensions_ui.h index c2ca17c9..ebc86e4 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.h +++ b/chrome/browser/ui/webui/extensions/extensions_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSIONS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSIONS_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/extensions/install_extension_handler.h b/chrome/browser/ui/webui/extensions/install_extension_handler.h index e77d45d..265218b 100644 --- a/chrome/browser/ui/webui/extensions/install_extension_handler.h +++ b/chrome/browser/ui/webui/extensions/install_extension_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_INSTALL_EXTENSION_HANDLER_H_ #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/values.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/fallback_icon_source.h b/chrome/browser/ui/webui/fallback_icon_source.h index bba4972..1ed29a0 100644 --- a/chrome/browser/ui/webui/fallback_icon_source.h +++ b/chrome/browser/ui/webui/fallback_icon_source.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/url_data_source.h"
diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h index 199d00c..29234ce4 100644 --- a/chrome/browser/ui/webui/favicon_source.h +++ b/chrome/browser/ui/webui/favicon_source.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/task/cancelable_task_tracker.h" #include "components/favicon/core/favicon_service.h"
diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index 92365652..4b7305a6 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/ui/webui/fileicon_source.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" #include "base/files/file_path.h"
diff --git a/chrome/browser/ui/webui/fileicon_source.h b/chrome/browser/ui/webui/fileicon_source.h index 6666aa3..d9d1308 100644 --- a/chrome/browser/ui/webui/fileicon_source.h +++ b/chrome/browser/ui/webui/fileicon_source.h
@@ -8,6 +8,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/task/cancelable_task_tracker.h" #include "chrome/browser/icon_manager.h" #include "content/public/browser/url_data_source.h"
diff --git a/chrome/browser/ui/webui/fileicon_source_unittest.cc b/chrome/browser/ui/webui/fileicon_source_unittest.cc index aef04ed4..65fae98 100644 --- a/chrome/browser/ui/webui/fileicon_source_unittest.cc +++ b/chrome/browser/ui/webui/fileicon_source_unittest.cc
@@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "chrome/browser/icon_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/fileicon_source.h"
diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc index 48c7920..11a5a24 100644 --- a/chrome/browser/ui/webui/flags_ui.cc +++ b/chrome/browser/ui/webui/flags_ui.cc
@@ -8,11 +8,13 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h"
diff --git a/chrome/browser/ui/webui/flags_ui.h b/chrome/browser/ui/webui/flags_ui.h index 2bfb282..7741667 100644 --- a/chrome/browser/ui/webui/flags_ui.h +++ b/chrome/browser/ui/webui/flags_ui.h
@@ -5,7 +5,9 @@ #ifndef CHROME_BROWSER_UI_WEBUI_FLAGS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_FLAGS_UI_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index 91856855..fecd8ef 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/flash_ui.h" +#include <stddef.h> + #include <map> #include <string> #include <vector> @@ -11,6 +13,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/time_formatting.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" @@ -19,6 +22,7 @@ #include "base/threading/thread_restrictions.h" #include "base/timer/timer.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/crash_upload_list.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" #include "chrome/browser/plugins/plugin_prefs.h"
diff --git a/chrome/browser/ui/webui/flash_ui.h b/chrome/browser/ui/webui/flash_ui.h index 4493a6a6..c567069 100644 --- a/chrome/browser/ui/webui/flash_ui.h +++ b/chrome/browser/ui/webui/flash_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_FLASH_UI_H_ #define CHROME_BROWSER_UI_WEBUI_FLASH_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/foreign_session_handler.cc b/chrome/browser/ui/webui/foreign_session_handler.cc index ff18d1b..e731f6b4 100644 --- a/chrome/browser/ui/webui/foreign_session_handler.cc +++ b/chrome/browser/ui/webui/foreign_session_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/foreign_session_handler.h" +#include <stddef.h> + #include <algorithm> #include <string> #include <vector>
diff --git a/chrome/browser/ui/webui/foreign_session_handler.h b/chrome/browser/ui/webui/foreign_session_handler.h index 1306a8d..91c8314 100644 --- a/chrome/browser/ui/webui/foreign_session_handler.h +++ b/chrome/browser/ui/webui/foreign_session_handler.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/scoped_observer.h" #include "base/time/time.h" #include "chrome/browser/sessions/session_service.h"
diff --git a/chrome/browser/ui/webui/gcm_internals_ui.cc b/chrome/browser/ui/webui/gcm_internals_ui.cc index adcac41..a473df27 100644 --- a/chrome/browser/ui/webui/gcm_internals_ui.cc +++ b/chrome/browser/ui/webui/gcm_internals_ui.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/gcm_internals_ui.h b/chrome/browser/ui/webui/gcm_internals_ui.h index 0e2372f8..9a3b0e84 100644 --- a/chrome/browser/ui/webui/gcm_internals_ui.h +++ b/chrome/browser/ui/webui/gcm_internals_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_GCM_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_GCM_INTERNALS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The WebUI for chrome://gcm-internals.
diff --git a/chrome/browser/ui/webui/gesture_config_ui.h b/chrome/browser/ui/webui/gesture_config_ui.h index 48e2433..808be44d 100644 --- a/chrome/browser/ui/webui/gesture_config_ui.h +++ b/chrome/browser/ui/webui/gesture_config_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_GESTURE_CONFIG_UI_H_ #define CHROME_BROWSER_UI_WEBUI_GESTURE_CONFIG_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace base {
diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc index 2f78c34..a449b65b 100644 --- a/chrome/browser/ui/webui/help/help_handler.cc +++ b/chrome/browser/ui/webui/help/help_handler.cc
@@ -4,21 +4,24 @@ #include "chrome/browser/ui/webui/help/help_handler.h" +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/location.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/task_runner_util.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/obsolete_system/obsolete_system.h"
diff --git a/chrome/browser/ui/webui/help/help_handler.h b/chrome/browser/ui/webui/help/help_handler.h index 14bfa40..7679882 100644 --- a/chrome/browser/ui/webui/help/help_handler.h +++ b/chrome/browser/ui/webui/help/help_handler.h
@@ -8,8 +8,10 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "chrome/browser/ui/webui/help/version_updater.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/ui/webui/help/help_ui.h b/chrome/browser/ui/webui/help/help_ui.h index f066c668..c2b8aca 100644 --- a/chrome/browser/ui/webui/help/help_ui.h +++ b/chrome/browser/ui/webui/help/help_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_HELP_HELP_UI_H_ #define CHROME_BROWSER_UI_WEBUI_HELP_HELP_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class HelpUI : public content::WebUIController {
diff --git a/chrome/browser/ui/webui/help/help_utils_chromeos.cc b/chrome/browser/ui/webui/help/help_utils_chromeos.cc index 7896f0c6..d370f936 100644 --- a/chrome/browser/ui/webui/help/help_utils_chromeos.cc +++ b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/help/help_utils_chromeos.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h"
diff --git a/chrome/browser/ui/webui/help/version_updater.h b/chrome/browser/ui/webui/help/version_updater.h index cd2966c..ca978dc3 100644 --- a/chrome/browser/ui/webui/help/version_updater.h +++ b/chrome/browser/ui/webui/help/version_updater.h
@@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/strings/string16.h" +#include "build/build_config.h" namespace content { class WebContents;
diff --git a/chrome/browser/ui/webui/help/version_updater_basic.h b/chrome/browser/ui/webui/help/version_updater_basic.h index fab6793..4ba7d2f0d 100644 --- a/chrome/browser/ui/webui/help/version_updater_basic.h +++ b/chrome/browser/ui/webui/help/version_updater_basic.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_HELP_VERSION_UPDATER_BASIC_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/help/version_updater.h" // Bare bones implementation just checks if a new version is ready.
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.h b/chrome/browser/ui/webui/help/version_updater_chromeos.h index 307f512..426f700e 100644 --- a/chrome/browser/ui/webui/help/version_updater_chromeos.h +++ b/chrome/browser/ui/webui/help/version_updater_chromeos.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_HELP_VERSION_UPDATER_CHROMEOS_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/help/version_updater.h" #include "chromeos/dbus/update_engine_client.h"
diff --git a/chrome/browser/ui/webui/help/version_updater_mac.h b/chrome/browser/ui/webui/help/version_updater_mac.h index 3f5df5d..7b46b1e9 100644 --- a/chrome/browser/ui/webui/help/version_updater_mac.h +++ b/chrome/browser/ui/webui/help/version_updater_mac.h
@@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/help/version_updater.h" @class KeystoneObserver;
diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc index 7195f4c..fd14cc6 100644 --- a/chrome/browser/ui/webui/history_ui.cc +++ b/chrome/browser/ui/webui/history_ui.cc
@@ -9,6 +9,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/history/web_history_service_factory.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/history_ui.h b/chrome/browser/ui/webui/history_ui.h index 10f2554..0b576bc8 100644 --- a/chrome/browser/ui/webui/history_ui.h +++ b/chrome/browser/ui/webui/history_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_ #define CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/identity_internals_ui.cc b/chrome/browser/ui/webui/identity_internals_ui.cc index e83a27c..0d2aa2b 100644 --- a/chrome/browser/ui/webui/identity_internals_ui.cc +++ b/chrome/browser/ui/webui/identity_internals_ui.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/i18n/time_formatting.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/api/identity/identity_api.h"
diff --git a/chrome/browser/ui/webui/identity_internals_ui.h b/chrome/browser/ui/webui/identity_internals_ui.h index 600ea1e..58a4435c 100644 --- a/chrome/browser/ui/webui/identity_internals_ui.h +++ b/chrome/browser/ui/webui/identity_internals_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_IDENTITY_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_IDENTITY_INTERNALS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class IdentityInternalsUITest;
diff --git a/chrome/browser/ui/webui/identity_internals_ui_browsertest.h b/chrome/browser/ui/webui/identity_internals_ui_browsertest.h index c5cba66..ab9dd46 100644 --- a/chrome/browser/ui/webui/identity_internals_ui_browsertest.h +++ b/chrome/browser/ui/webui/identity_internals_ui_browsertest.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "chrome/test/base/web_ui_browser_test.h" class IdentityInternalsUIBrowserTest : public WebUIBrowserTest {
diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc index b10ce97..850b66ba 100644 --- a/chrome/browser/ui/webui/inspect_ui.cc +++ b/chrome/browser/ui/webui/inspect_ui.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/inspect_ui.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "chrome/browser/devtools/devtools_target_impl.h"
diff --git a/chrome/browser/ui/webui/inspect_ui.h b/chrome/browser/ui/webui/inspect_ui.h index 2d3fc8d..329e71c 100644 --- a/chrome/browser/ui/webui/inspect_ui.h +++ b/chrome/browser/ui/webui/inspect_ui.h
@@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/ui/webui/inspect_ui_browsertest.cc b/chrome/browser/ui/webui/inspect_ui_browsertest.cc index 1286acb..e2ae3c64 100644 --- a/chrome/browser/ui/webui/inspect_ui_browsertest.cc +++ b/chrome/browser/ui/webui/inspect_ui_browsertest.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 "base/macros.h" #include "chrome/browser/devtools/device/adb/adb_device_provider.h" #include "chrome/browser/devtools/device/adb/mock_adb_server.h" #include "chrome/browser/devtools/device/devtools_android_bridge.h"
diff --git a/chrome/browser/ui/webui/instant_ui.cc b/chrome/browser/ui/webui/instant_ui.cc index 162ac8c..c23ae88c 100644 --- a/chrome/browser/ui/webui/instant_ui.cc +++ b/chrome/browser/ui/webui/instant_ui.cc
@@ -4,10 +4,14 @@ #include "chrome/browser/ui/webui/instant_ui.h" +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" @@ -34,7 +38,7 @@ } #if !defined(OS_ANDROID) -std::string FormatTime(int64 time) { +std::string FormatTime(int64_t time) { base::Time::Exploded exploded; base::Time::FromInternalValue(time).UTCExplode(&exploded); return base::StringPrintf("%04d-%02d-%02d %02d:%02d:%02d.%03d", @@ -116,7 +120,7 @@ void InstantUIMessageHandler::GetDebugInfo(const base::ListValue* args) { #if !defined(OS_ANDROID) - typedef std::pair<int64, std::string> DebugEvent; + typedef std::pair<int64_t, std::string> DebugEvent; if (!web_ui()->GetWebContents()) return;
diff --git a/chrome/browser/ui/webui/instant_ui.h b/chrome/browser/ui/webui/instant_ui.h index 0a0bd0b..c0d543b 100644 --- a/chrome/browser/ui/webui/instant_ui.h +++ b/chrome/browser/ui/webui/instant_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_INSTANT_UI_H_ #define CHROME_BROWSER_UI_WEBUI_INSTANT_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc index 5fdc9a5..b71f6d2 100644 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/interstitials/interstitial_ui.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.h b/chrome/browser/ui/webui/interstitials/interstitial_ui.h index c474306..933a52e 100644 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.h +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/invalidations_message_handler.h b/chrome/browser/ui/webui/invalidations_message_handler.h index e5fe779f..78e1e2f 100644 --- a/chrome/browser/ui/webui/invalidations_message_handler.h +++ b/chrome/browser/ui/webui/invalidations_message_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_INVALIDATIONS_MESSAGE_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/invalidations_ui.h b/chrome/browser/ui/webui/invalidations_ui.h index 42a5d941..f4a9cf4 100644 --- a/chrome/browser/ui/webui/invalidations_ui.h +++ b/chrome/browser/ui/webui/invalidations_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_INVALIDATIONS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_INVALIDATIONS_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The implementation for the chrome://invalidations page.
diff --git a/chrome/browser/ui/webui/large_icon_source.h b/chrome/browser/ui/webui/large_icon_source.h index fb573ea..b01a6e5 100644 --- a/chrome/browser/ui/webui/large_icon_source.h +++ b/chrome/browser/ui/webui/large_icon_source.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/task/cancelable_task_tracker.h" #include "components/favicon/core/fallback_icon_service.h"
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc index b676af7..efc476a 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.h b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.h index 069030f..9abff5f 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.h +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_LOCAL_DISCOVERY_LOCAL_DISCOVERY_UI_H_ #define CHROME_BROWSER_UI_WEBUI_LOCAL_DISCOVERY_LOCAL_DISCOVERY_UI_H_ +#include "base/macros.h" #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc index 264c7c3..d097829 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc
@@ -2,14 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stdint.h> + #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "chrome/browser/local_discovery/test_service_discovery_client.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -53,7 +56,7 @@ namespace { -const uint8 kQueryData[] = { +const uint8_t kQueryData[] = { // Header 0x00, 0x00, 0x00, 0x00, // Flags not set. @@ -73,7 +76,7 @@ 0x00, 0x01, // QCLASS: IN class. Unicast bit not set. }; -const uint8 kAnnouncePacket[] = { +const uint8_t kAnnouncePacket[] = { // Header 0x00, 0x00, // ID is zeroed out 0x80, 0x00, // Standard query response, no error @@ -148,7 +151,7 @@ }; -const uint8 kGoodbyePacket[] = { +const uint8_t kGoodbyePacket[] = { // Header 0x00, 0x00, // ID is zeroed out 0x80, 0x00, // Standard query response, RA, no error @@ -185,7 +188,7 @@ 0x00, }; -const uint8 kAnnouncePacketRegistered[] = { +const uint8_t kAnnouncePacketRegistered[] = { // Header 0x00, 0x00, // ID is zeroed out 0x80, 0x00, // Standard query response, RA, no error
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc index 1568401..04a8a03 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
@@ -12,6 +12,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/local_discovery/cloud_device_list.h" #include "chrome/browser/local_discovery/privet_confirm_api_flow.h" #include "chrome/browser/local_discovery/privet_constants.h"
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h index fbe0d78..2873c45 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h
@@ -9,6 +9,8 @@ #include <string> #include <vector> +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/local_discovery/cloud_print_printer_list.h" #include "chrome/browser/local_discovery/privet_device_lister.h" #include "chrome/browser/local_discovery/privet_http.h"
diff --git a/chrome/browser/ui/webui/local_state/local_state_ui.cc b/chrome/browser/ui/webui/local_state/local_state_ui.cc index 13f4776fa..9b4a864 100644 --- a/chrome/browser/ui/webui/local_state/local_state_ui.cc +++ b/chrome/browser/ui/webui/local_state/local_state_ui.cc
@@ -7,7 +7,9 @@ #include <string> #include "base/json/json_string_value_serializer.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/webui/local_state/local_state_ui.h b/chrome/browser/ui/webui/local_state/local_state_ui.h index 4af8226..e845dae0 100644 --- a/chrome/browser/ui/webui/local_state/local_state_ui.h +++ b/chrome/browser/ui/webui/local_state/local_state_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_LOCAL_STATE_LOCAL_STATE_UI_H_ #define CHROME_BROWSER_UI_WEBUI_LOCAL_STATE_LOCAL_STATE_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // Controller for chrome://local-state/ page.
diff --git a/chrome/browser/ui/webui/log_web_ui_url.cc b/chrome/browser/ui/webui/log_web_ui_url.cc index 6f983ff..9679ab1 100644 --- a/chrome/browser/ui/webui/log_web_ui_url.cc +++ b/chrome/browser/ui/webui/log_web_ui_url.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/log_web_ui_url.h" +#include <stdint.h> + #include "base/hash.h" #include "base/metrics/histogram_base.h" #include "base/metrics/sparse_histogram.h" @@ -30,7 +32,7 @@ #endif if (should_log) { - uint32 hash = base::Hash(web_ui_url.GetOrigin().spec()); + uint32_t hash = base::Hash(web_ui_url.GetOrigin().spec()); UMA_HISTOGRAM_SPARSE_SLOWLY(kWebUICreatedForUrl, static_cast<base::HistogramBase::Sample>(hash)); }
diff --git a/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc b/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc index 60c8304..bdd37018 100644 --- a/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc +++ b/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/ui/webui/log_web_ui_url.h" +#include <stdint.h> + #include <vector> #include "base/hash.h" +#include "base/macros.h" #include "base/test/histogram_tester.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -46,7 +49,7 @@ ui_test_utils::NavigateToURL(browser(), history_frame_url); - uint32 history_frame_url_hash = base::Hash(history_frame_url.spec()); + uint32_t history_frame_url_hash = base::Hash(history_frame_url.spec()); EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 1))); chrome::Reload(browser(), CURRENT_TAB); @@ -69,13 +72,13 @@ std::string scheme(content::kChromeUIScheme); GURL uber_url(scheme + "://" + chrome::kChromeUIUberHost); - uint32 uber_url_hash = base::Hash(uber_url.spec()); + uint32_t uber_url_hash = base::Hash(uber_url.spec()); GURL uber_frame_url(chrome::kChromeUIUberFrameURL); - uint32 uber_frame_url_hash = base::Hash(uber_frame_url.spec()); + uint32_t uber_frame_url_hash = base::Hash(uber_frame_url.spec()); GURL history_frame_url(chrome::kChromeUIHistoryFrameURL); - uint32 history_frame_url_hash = base::Hash(history_frame_url.spec()); + uint32_t history_frame_url_hash = base::Hash(history_frame_url.spec()); EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 1), Bucket(uber_frame_url_hash, 1), @@ -103,7 +106,7 @@ } GURL extensions_frame_url(chrome::kChromeUIExtensionsFrameURL); - uint32 extensions_frame_url_hash = base::Hash(extensions_frame_url.spec()); + uint32_t extensions_frame_url_hash = base::Hash(extensions_frame_url.spec()); EXPECT_THAT(GetSamples(), ElementsAre(Bucket(extensions_frame_url_hash, 1), Bucket(history_frame_url_hash, 2),
diff --git a/chrome/browser/ui/webui/md_downloads/downloads_list_tracker.h b/chrome/browser/ui/webui/md_downloads/downloads_list_tracker.h index eced8d4..2b45bf19 100644 --- a/chrome/browser/ui/webui/md_downloads/downloads_list_tracker.h +++ b/chrome/browser/ui/webui/md_downloads/downloads_list_tracker.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_MD_DOWNLOADS_DOWNLOADS_LIST_TRACKER_H_ #define CHROME_BROWSER_UI_WEBUI_MD_DOWNLOADS_DOWNLOADS_LIST_TRACKER_H_ +#include <stddef.h> + #include <set> #include "base/callback_forward.h"
diff --git a/chrome/browser/ui/webui/md_downloads/downloads_list_tracker_unittest.cc b/chrome/browser/ui/webui/md_downloads/downloads_list_tracker_unittest.cc index 2d9c1ee..3e9d0a8e 100644 --- a/chrome/browser/ui/webui/md_downloads/downloads_list_tracker_unittest.cc +++ b/chrome/browser/ui/webui/md_downloads/downloads_list_tracker_unittest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/md_downloads/downloads_list_tracker.h" +#include <stdint.h> + #include <vector> #include "base/files/file_path.h" @@ -27,20 +29,20 @@ namespace { -uint64 GetId(const base::Value* value) { +uint64_t GetId(const base::Value* value) { const base::DictionaryValue* dict; CHECK(value->GetAsDictionary(&dict)); int id; CHECK(dict->GetInteger("id", &id)); CHECK_GE(id, 0); - return static_cast<uint64>(id); + return static_cast<uint64_t>(id); } -std::vector<uint64> GetIds(const base::Value* value) { +std::vector<uint64_t> GetIds(const base::Value* value) { CHECK(value); - std::vector<uint64> ids; + std::vector<uint64_t> ids; if (value->GetType() == base::Value::TYPE_LIST) { const base::ListValue* list; @@ -85,7 +87,7 @@ scoped_ptr<base::DictionaryValue> CreateDownloadItemValue( content::DownloadItem* item) const override { scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue); - CHECK_LE(item->GetId(), static_cast<uint64>(INT_MAX)); + CHECK_LE(item->GetId(), static_cast<uint64_t>(INT_MAX)); dict->SetInteger("id", item->GetId()); return dict.Pass(); } @@ -109,7 +111,7 @@ testing::Invoke(this, &DownloadsListTrackerTest::GetAllDownloads)); } - MockDownloadItem* CreateMock(uint64 id, const base::Time& started) { + MockDownloadItem* CreateMock(uint64_t id, const base::Time& started) { MockDownloadItem* new_item = new testing::NiceMock<MockDownloadItem>(); mock_items_.push_back(new_item); @@ -182,7 +184,7 @@ web_ui()->call_data()[0]->function_name()); EXPECT_EQ(0, GetIndex(web_ui()->call_data()[0]->arg1())); - std::vector<uint64> ids = GetIds(web_ui()->call_data()[0]->arg2()); + std::vector<uint64_t> ids = GetIds(web_ui()->call_data()[0]->arg2()); ASSERT_FALSE(ids.empty()); EXPECT_EQ(first_item->GetId(), ids[0]); } @@ -218,7 +220,7 @@ web_ui()->call_data()[0]->function_name()); EXPECT_EQ(0, GetIndex(web_ui()->call_data()[0]->arg1())); - std::vector<uint64> ids = GetIds(web_ui()->call_data()[0]->arg2()); + std::vector<uint64_t> ids = GetIds(web_ui()->call_data()[0]->arg2()); ASSERT_FALSE(ids.empty()); EXPECT_EQ(first_item->GetId(), ids[0]); }
diff --git a/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.cc b/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.cc index ce116d51..8a811f4 100644 --- a/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.cc
@@ -7,7 +7,6 @@ #include <algorithm> #include <functional> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/rtl.h" @@ -389,16 +388,16 @@ return nullptr; } - uint64 id; + uint64_t id; if (!base::StringToUint64(download_id, &id)) { NOTREACHED(); return nullptr; } - return GetDownloadById(static_cast<uint32>(id)); + return GetDownloadById(static_cast<uint32_t>(id)); } -content::DownloadItem* MdDownloadsDOMHandler::GetDownloadById(uint32 id) { +content::DownloadItem* MdDownloadsDOMHandler::GetDownloadById(uint32_t id) { content::DownloadItem* item = NULL; if (GetMainNotifierManager()) item = GetMainNotifierManager()->GetDownload(id);
diff --git a/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.h b/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.h index a724d6db..02577e8b 100644 --- a/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.h +++ b/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_MD_DOWNLOADS_MD_DOWNLOADS_DOM_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_MD_DOWNLOADS_MD_DOWNLOADS_DOM_HANDLER_H_ +#include <stdint.h> + #include <set> #include <vector> @@ -92,7 +94,7 @@ void FinalizeRemovals(); private: - using IdSet = std::set<uint32>; + using IdSet = std::set<uint32_t>; using DownloadVector = std::vector<content::DownloadItem*>; // Convenience method to call |main_notifier_->GetManager()| while @@ -123,7 +125,7 @@ content::DownloadItem* GetDownloadByValue(const base::ListValue* args); // Returns the download with |id| or NULL if it doesn't exist. - content::DownloadItem* GetDownloadById(uint32 id); + content::DownloadItem* GetDownloadById(uint32_t id); // Remove all downloads in |to_remove| with the ability to undo removal later. void RemoveDownloads(const DownloadVector& to_remove);
diff --git a/chrome/browser/ui/webui/md_history_ui.cc b/chrome/browser/ui/webui/md_history_ui.cc index 8b9100df..31c7ecd5 100644 --- a/chrome/browser/ui/webui/md_history_ui.cc +++ b/chrome/browser/ui/webui/md_history_ui.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/md_history_ui.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/browsing_history_handler.h" #include "chrome/browser/ui/webui/metrics_handler.h"
diff --git a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc index fab1fbe2..98125cb0 100644 --- a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc +++ b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
@@ -9,12 +9,14 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/time_formatting.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/media/webrtc_log_list.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/media/webrtc_logs_ui.h b/chrome/browser/ui/webui/media/webrtc_logs_ui.h index c2e7ee1..8cbc70d 100644 --- a/chrome/browser/ui/webui/media/webrtc_logs_ui.h +++ b/chrome/browser/ui/webui/media/webrtc_logs_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_MEDIA_WEBRTC_LOGS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_MEDIA_WEBRTC_LOGS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc index 138ae3e..f43aadb 100644 --- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc +++ b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc
@@ -7,7 +7,9 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "chrome/browser/media/router/presentation_service_delegate_impl.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/toolbar/media_router_action.h"
diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc index bb81b9a..620f34e 100644 --- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc +++ b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.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 "base/macros.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_unittest.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_unittest.cc index 617538f0..29c5c5b 100644 --- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_unittest.cc +++ b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_unittest.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 "base/macros.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/ui/webui/media_router/media_router_test.h b/chrome/browser/ui/webui/media_router/media_router_test.h index f63c5eba..512aa290 100644 --- a/chrome/browser/ui/webui/media_router/media_router_test.h +++ b/chrome/browser/ui/webui/media_router/media_router_test.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_TEST_H_ #define CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_TEST_H_ +#include "base/macros.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "extensions/common/feature_switch.h"
diff --git a/chrome/browser/ui/webui/media_router/media_router_ui.cc b/chrome/browser/ui/webui/media_router/media_router_ui.cc index cbb4eab..cda8494 100644 --- a/chrome/browser/ui/webui/media_router/media_router_ui.cc +++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc
@@ -9,6 +9,7 @@ #include "base/guid.h" #include "base/i18n/string_compare.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h"
diff --git a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc index 487e4d83..d721bbc 100644 --- a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc +++ b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.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 "base/macros.h" #include "base/strings/stringprintf.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/ui/webui/media_router/query_result_manager.h b/chrome/browser/ui/webui/media_router/query_result_manager.h index 93f1808..f355b07d 100644 --- a/chrome/browser/ui/webui/media_router/query_result_manager.h +++ b/chrome/browser/ui/webui/media_router/query_result_manager.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/threading/thread_checker.h"
diff --git a/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc b/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc index 0483852..2918454 100644 --- a/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc +++ b/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
@@ -5,6 +5,7 @@ #include "base/bind.h" #include "base/containers/hash_tables.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "chrome/browser/media/router/media_sinks_observer.h" #include "chrome/browser/media/router/media_source_helper.h"
diff --git a/chrome/browser/ui/webui/memory_internals/memory_internals_handler.h b/chrome/browser/ui/webui/memory_internals/memory_internals_handler.h index 9b7ef31..9324998f 100644 --- a/chrome/browser/ui/webui/memory_internals/memory_internals_handler.h +++ b/chrome/browser/ui/webui/memory_internals/memory_internals_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc b/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc index 5ce9a26e..08515fdd 100644 --- a/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc +++ b/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc
@@ -11,6 +11,7 @@ #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.h b/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.h index 56f835bf..af15813 100644 --- a/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.h +++ b/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.h
@@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_UI_WEBUI_MEMORY_INTERNALS_MEMORY_INTERNALS_PROXY_H_ #define CHROME_BROWSER_UI_WEBUI_MEMORY_INTERNALS_MEMORY_INTERNALS_PROXY_H_ +#include <stddef.h> + #include <set> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/webui/memory_internals/memory_internals_ui.h b/chrome/browser/ui/webui/memory_internals/memory_internals_ui.h index 3738a07..ba9c3de 100644 --- a/chrome/browser/ui/webui/memory_internals/memory_internals_ui.h +++ b/chrome/browser/ui/webui/memory_internals/memory_internals_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_MEMORY_INTERNALS_MEMORY_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_MEMORY_INTERNALS_MEMORY_INTERNALS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class MemoryInternalsUI : public content::WebUIController {
diff --git a/chrome/browser/ui/webui/metrics_handler.cc b/chrome/browser/ui/webui/metrics_handler.cc index 41a6c08..0efe7c9 100644 --- a/chrome/browser/ui/webui/metrics_handler.cc +++ b/chrome/browser/ui/webui/metrics_handler.cc
@@ -10,6 +10,7 @@ #include "base/metrics/histogram.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/ui/tab_contents/core_tab_helper.h" #include "chrome/browser/ui/webui/ntp/ntp_user_data_logger.h" #include "chrome/common/ntp_logging_events.h"
diff --git a/chrome/browser/ui/webui/metrics_handler.h b/chrome/browser/ui/webui/metrics_handler.h index 7fe8db08..07eb7d0 100644 --- a/chrome/browser/ui/webui/metrics_handler.h +++ b/chrome/browser/ui/webui/metrics_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_METRICS_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/web_ui_message_handler.h" ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/webui/mojo_web_ui_controller.h b/chrome/browser/ui/webui/mojo_web_ui_controller.h index 9b2e7cc..253971e1 100644 --- a/chrome/browser/ui/webui/mojo_web_ui_controller.h +++ b/chrome/browser/ui/webui/mojo_web_ui_controller.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/mojo_web_ui_handler.h"
diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc index 183cfa61..46171ff 100644 --- a/chrome/browser/ui/webui/nacl_ui.cc +++ b/chrome/browser/ui/webui/nacl_ui.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/nacl_ui.h" +#include <stddef.h> + #include <string> #include <vector> @@ -12,6 +14,7 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/json/json_file_value_serializer.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h" #include "base/strings/string16.h" @@ -19,6 +22,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/channel_info.h"
diff --git a/chrome/browser/ui/webui/nacl_ui.h b/chrome/browser/ui/webui/nacl_ui.h index 3971b4d..472b68c 100644 --- a/chrome/browser/ui/webui/nacl_ui.h +++ b/chrome/browser/ui/webui/nacl_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NACL_UI_H_ #define CHROME_BROWSER_UI_WEBUI_NACL_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The Web UI handler for about:nacl.
diff --git a/chrome/browser/ui/webui/net_export_ui.cc b/chrome/browser/ui/webui/net_export_ui.cc index f5de774..610d006 100644 --- a/chrome/browser/ui/webui/net_export_ui.cc +++ b/chrome/browser/ui/webui/net_export_ui.cc
@@ -7,6 +7,7 @@ #include <string> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/net_export_ui.h b/chrome/browser/ui/webui/net_export_ui.h index 862fd53..cb58382 100644 --- a/chrome/browser/ui/webui/net_export_ui.h +++ b/chrome/browser/ui/webui/net_export_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NET_EXPORT_UI_H_ #define CHROME_BROWSER_UI_WEBUI_NET_EXPORT_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The C++ back-end for the chrome://net-export webui page.
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index d27928a..de13575 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h" +#include <stddef.h> + #include <algorithm> #include <list> #include <string> @@ -17,6 +19,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_member.h" @@ -27,6 +30,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/browsing_data/browsing_data_remover.h"
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.h b/chrome/browser/ui/webui/net_internals/net_internals_ui.h index 59b0e9c..9349ef0c 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.h +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.h
@@ -4,6 +4,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_NET_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_NET_INTERNALS_UI_H_ + +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class NetInternalsUI : public content::WebUIController {
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index 852a7b0..4ff6414 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
@@ -10,6 +10,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h index 6c54e6d..791a0e2 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_NET_INTERNALS_UI_BROWSERTEST_H_ #define CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_NET_INTERNALS_UI_BROWSERTEST_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/test/base/web_ui_browser_test.h"
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index e4c3121..44be513a 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" +#include <stddef.h> + #include <vector> #include "apps/metrics_names.h"
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h index 493b8761..3ab612c 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
@@ -9,6 +9,7 @@ #include <string> #include "apps/metrics_names.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/task/cancelable_task_tracker.h"
diff --git a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h index 3db6cdb..584b239 100644 --- a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h +++ b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc index 27e71a4..4f40fdc 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/ntp/favicon_webui_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.h b/chrome/browser/ui/webui/ntp/favicon_webui_handler.h index 6d0e29d..2c5209b7 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.h +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/task/cancelable_task_tracker.h" #include "components/favicon_base/favicon_types.h"
diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_handler.h b/chrome/browser/ui/webui/ntp/new_tab_page_handler.h index ec2b2915..ce4a5b5 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_handler.h +++ b/chrome/browser/ui/webui/ntp/new_tab_page_handler.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_PAGE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_PAGE_HANDLER_H_ +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h index d3e8d853..7b04403 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "chrome/browser/sync/sync_ui_util.h" #include "components/browser_sync/browser/profile_sync_service.h"
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/ntp/new_tab_ui.h index 9bf5357..97886fe3 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.h +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc index b6af1376..37be5577 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/command_line.h" #include "base/logging.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index f9b70689..df78320 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -15,6 +15,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_util.h"
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h index 627e1f15..df898d62 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NTP_NTP_RESOURCE_CACHE_H_ #define CHROME_BROWSER_UI_WEBUI_NTP_NTP_RESOURCE_CACHE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_change_registrar.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/webui/ntp/ntp_user_data_logger.h b/chrome/browser/ui/webui/ntp/ntp_user_data_logger.h index af3c6f8..d3c38b4 100644 --- a/chrome/browser/ui/webui/ntp/ntp_user_data_logger.h +++ b/chrome/browser/ui/webui/ntp/ntp_user_data_logger.h
@@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NTP_NTP_USER_DATA_LOGGER_H_ #define CHROME_BROWSER_UI_WEBUI_NTP_NTP_USER_DATA_LOGGER_H_ +#include <stddef.h> + #include <string> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/time/time.h" #include "chrome/common/ntp_logging_events.h"
diff --git a/chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc b/chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc index e6493f1..8f9b9bca 100644 --- a/chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc +++ b/chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/ui/webui/ntp/ntp_user_data_logger.h" -#include "base/basictypes.h" #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui.h b/chrome/browser/ui/webui/omnibox/omnibox_ui.h index c91af32c..d853ba79 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui.h +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_H_ #define CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/mojo_web_ui_controller.h" #include "chrome/browser/ui/webui/omnibox/omnibox.mojom.h"
diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc index ec18ff9..6d2792f6 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h" +#include <stddef.h> + #include <string> #include "base/auto_reset.h" @@ -83,7 +85,7 @@ mojo::String::From(input.associated_keyword->keyword); } result->keyword = mojo::String::From(input.keyword); - result->duplicates = static_cast<int32>(input.duplicate_matches.size()); + result->duplicates = static_cast<int32_t>(input.duplicate_matches.size()); result->from_previous = input.from_previous; result->additional_info =
diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h index 15158da..e4e23909 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h
@@ -5,8 +5,10 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_HANDLER_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "chrome/browser/ui/webui/mojo_web_ui_handler.h"
diff --git a/chrome/browser/ui/webui/options/advanced_options_utils.h b/chrome/browser/ui/webui/options/advanced_options_utils.h index 1b77da7..654df0b 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils.h +++ b/chrome/browser/ui/webui/options/advanced_options_utils.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace content { class WebContents;
diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc b/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc index e509a130..cd54152 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc
@@ -6,6 +6,8 @@ #include "chrome/browser/ui/webui/options/advanced_options_utils.h" +#include <stddef.h> + #include "base/bind.h" #include "base/environment.h" #include "base/files/file_path.h" @@ -14,6 +16,7 @@ #include "base/process/launch.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "chrome/browser/tab_contents/tab_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h"
diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_win.cc b/chrome/browser/ui/webui/options/advanced_options_utils_win.cc index 4f0f8a0e..7c5c16c 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_win.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_win.cc
@@ -12,6 +12,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/threading/thread.h"
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc index 84540ad..f9d5531 100644 --- a/chrome/browser/ui/webui/options/autofill_options_handler.cc +++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/autofill_options_handler.h" +#include <stddef.h> + #include <vector> #include "base/bind.h" @@ -11,6 +13,7 @@ #include "base/command_line.h" #include "base/guid.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.h b/chrome/browser/ui/webui/options/autofill_options_handler.h index b569cb6..58d51e9 100644 --- a/chrome/browser/ui/webui/options/autofill_options_handler.h +++ b/chrome/browser/ui/webui/options/autofill_options_handler.h
@@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "components/autofill/core/browser/personal_data_manager_observer.h"
diff --git a/chrome/browser/ui/webui/options/automatic_settings_reset_handler.cc b/chrome/browser/ui/webui/options/automatic_settings_reset_handler.cc index 22a81c3..14d67bd 100644 --- a/chrome/browser/ui/webui/options/automatic_settings_reset_handler.cc +++ b/chrome/browser/ui/webui/options/automatic_settings_reset_handler.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/time/time.h" #include "chrome/browser/prefs/chrome_pref_service_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/options/automatic_settings_reset_handler.h b/chrome/browser/ui/webui/options/automatic_settings_reset_handler.h index ecbfee4..1b4baed 100644 --- a/chrome/browser/ui/webui/options/automatic_settings_reset_handler.h +++ b/chrome/browser/ui/webui/options/automatic_settings_reset_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_AUTOMATIC_SETTINGS_RESET_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_AUTOMATIC_SETTINGS_RESET_HANDLER_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/options/options_ui.h"
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index b93c86c5..b29ae74b 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/browser_options_handler.h" +#include <stddef.h> + #include <set> #include <string> #include <vector> @@ -12,6 +14,7 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/environment.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" @@ -22,6 +25,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/value_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/custom_home_pages_table_model.h"
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h index 3644e9e..31bc320 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.h +++ b/chrome/browser/ui/webui/options/browser_options_handler.h
@@ -7,14 +7,15 @@ #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_member.h" #include "base/scoped_observer.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" #include "chrome/browser/shell_integration.h"
diff --git a/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc b/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc index 881eec7..d68ae7f 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/webui/options/options_ui_browsertest.h" #include "components/policy/core/browser/browser_policy_connector.h"
diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc index 02ff4775..5138a67 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
@@ -5,6 +5,8 @@ #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" #include <errno.h> +#include <stddef.h> +#include <stdint.h> #include <algorithm> #include <map> @@ -14,11 +16,13 @@ #include "base/files/file_util.h" // for FileAccessProvider #include "base/i18n/string_compare.h" #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/posix/safe_strerror.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/profiles/profile.h" @@ -157,7 +161,7 @@ net::X509Certificate* CallbackArgsToCert(const base::ListValue* args); private: - typedef std::map<net::X509Certificate*, int32> CertMap; + typedef std::map<net::X509Certificate*, int32_t> CertMap; // Creates an ID for cert and looks up the cert for an ID. IDMap<net::X509Certificate>id_map_; @@ -173,13 +177,13 @@ if (iter != cert_map_.end()) return base::IntToString(iter->second); - int32 new_id = id_map_.Add(cert); + int32_t new_id = id_map_.Add(cert); cert_map_[cert] = new_id; return base::IntToString(new_id); } net::X509Certificate* CertIdMap::IdToCert(const std::string& id) { - int32 cert_id = 0; + int32_t cert_id = 0; if (!base::StringToInt(id, &cert_id)) return NULL;
diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.h b/chrome/browser/ui/webui/options/certificate_manager_handler.h index 948c3bb..bf60244 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.h +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/cancelable_task_tracker.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc index 3dcb20f..446ff3d 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
@@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/login/login_manager_test.h" #include "chrome/browser/chromeos/login/startup_utils.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc index ada7049..140c31d 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" +#include <stddef.h> + #include <string> #include "base/bind.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h index 8b814d2..83212bb 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_ACCOUNTS_OPTIONS_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc index 1defd65..ddff2c1 100644 --- a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc
@@ -8,6 +8,7 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h index cd17609..6042abb 100644 --- a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.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 "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/options/options_ui.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h index 80ca836..a7814e9 100644 --- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_ +#include "base/macros.h" #include "chrome/browser/chromeos/camera_presence_notifier.h" #include "chrome/browser/image_decoder.h" #include "chrome/browser/ui/webui/options/options_ui.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc index daed4a8..6b0b6f8f 100644 --- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
@@ -4,11 +4,14 @@ #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h" +#include <stddef.h> + #include <string> #include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "base/bind.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc index c968cf4..3a05c24 100644 --- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h b/chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h index f0cfefb..8313d8a 100644 --- a/chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DATE_TIME_OPTIONS_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "chromeos/dbus/system_clock_client.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc index 61de2c1..0ece958 100644 --- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include "ash/display/display_configurator_animation.h" @@ -38,7 +41,7 @@ return ash::Shell::GetInstance()->display_manager(); } -int64 GetDisplayId(const base::ListValue* args) { +int64_t GetDisplayId(const base::ListValue* args) { // Assumes the display ID is specified as the first argument. std::string id_value; if (!args->GetString(0, &id_value)) { @@ -46,7 +49,7 @@ return gfx::Display::kInvalidDisplayID; } - int64 display_id = gfx::Display::kInvalidDisplayID; + int64_t display_id = gfx::Display::kInvalidDisplayID; if (!base::StringToInt64(id_value, &display_id)) { LOG(ERROR) << "Invalid display id: " << id_value; return gfx::Display::kInvalidDisplayID; @@ -122,7 +125,7 @@ return true; } -base::DictionaryValue* ConvertDisplayModeToValue(int64 display_id, +base::DictionaryValue* ConvertDisplayModeToValue(int64_t display_id, const ash::DisplayMode& mode) { bool is_internal = gfx::Display::HasInternalDisplay() && gfx::Display::InternalDisplayId() == display_id; @@ -273,7 +276,7 @@ (display_manager->IsInUnifiedMode() ? DisplayManager::UNIFIED : DisplayManager::EXTENDED)); - int64 primary_id = ash::Shell::GetScreen()->GetPrimaryDisplay().id(); + int64_t primary_id = ash::Shell::GetScreen()->GetPrimaryDisplay().id(); base::ListValue js_displays; for (const gfx::Display& display : displays) { const ash::DisplayInfo& display_info = @@ -371,7 +374,7 @@ void DisplayOptionsHandler::HandleSetPrimary(const base::ListValue* args) { DCHECK(!args->empty()); - int64 display_id = GetDisplayId(args); + int64_t display_id = GetDisplayId(args); if (display_id == gfx::Display::kInvalidDisplayID) return; @@ -402,7 +405,7 @@ void DisplayOptionsHandler::HandleSetDisplayMode(const base::ListValue* args) { DCHECK(!args->empty()); - int64 display_id = GetDisplayId(args); + int64_t display_id = GetDisplayId(args); if (display_id == gfx::Display::kInvalidDisplayID) return; @@ -432,7 +435,7 @@ void DisplayOptionsHandler::HandleSetOrientation(const base::ListValue* args) { DCHECK(!args->empty()); - int64 display_id = GetDisplayId(args); + int64_t display_id = GetDisplayId(args); if (display_id == gfx::Display::kInvalidDisplayID) return; @@ -459,7 +462,7 @@ void DisplayOptionsHandler::HandleSetColorProfile(const base::ListValue* args) { DCHECK(!args->empty()); - int64 display_id = GetDisplayId(args); + int64_t display_id = GetDisplayId(args); if (display_id == gfx::Display::kInvalidDisplayID) return;
diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.h b/chrome/browser/ui/webui/options/chromeos/display_options_handler.h index 4dc3f4b..33c4df7 100644 --- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.h
@@ -8,6 +8,7 @@ #include <vector> #include "ash/display/window_tree_host_manager.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace base {
diff --git a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc index c223168..57e12a7 100644 --- a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc
@@ -102,7 +102,7 @@ } void DisplayOverscanHandler::HandleStart(const base::ListValue* args) { - int64 display_id = gfx::Display::kInvalidDisplayID; + int64_t display_id = gfx::Display::kInvalidDisplayID; std::string id_value; if (!args->GetString(0, &id_value)) { LOG(ERROR) << "Can't find ID";
diff --git a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h index 2f1cc517..f3f60c7 100644 --- a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h
@@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OVERSCAN_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OVERSCAN_HANDLER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/gfx/display_observer.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc index c5d39f00..1bf90c7 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -10,7 +10,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h index d3c7da2..19dba2a 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc index 8d788cc..69e179b0 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.h" +#include <stddef.h> + #include "base/macros.h" #include "base/values.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc index 563342e..0a4594e 100644 --- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
@@ -4,11 +4,14 @@ #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" +#include <stddef.h> + #include "ash/new_window_delegate.h" #include "ash/shell.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/grit/generated_resources.h" #include "chromeos/chromeos_switches.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h index eeb2ffdb..2ae8c5f 100644 --- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_KEYBOARD_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_member.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/events/devices/input_device_event_observer.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc b/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc index 4390f78c..5d85ee4 100644 --- a/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/pointer_handler.h b/chrome/browser/ui/webui/options/chromeos/pointer_handler.h index 091c9cd1..0dc6e93f 100644 --- a/chrome/browser/ui/webui/options/chromeos/pointer_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/pointer_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_POINTER_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_member.h" #include "chrome/browser/chromeos/system/pointer_device_observer.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc index cab3591..8b05e34d 100644 --- a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h" -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/proxy_handler.h b/chrome/browser/ui/webui/options/chromeos/proxy_handler.h index bc3e62ed..4280207 100644 --- a/chrome/browser/ui/webui/options/chromeos/proxy_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/proxy_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_PROXY_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc index 1055a8d..af5da3e 100644 --- a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc
@@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stddef.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h" #include "chrome/browser/chromeos/login/login_manager_test.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h b/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h index be2a719..8c95f11 100644 --- a/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_STATS_OPTIONS_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace chromeos {
diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.h b/chrome/browser/ui/webui/options/chromeos/user_image_source.h index b83a3c76..5bc156c6 100644 --- a/chrome/browser/ui/webui/options/chromeos/user_image_source.h +++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/browser/url_data_source.h" #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc b/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc index a97cb827..9e0973b 100644 --- a/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc +++ b/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc
@@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc index b14ec95..df0e6075 100644 --- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc +++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -4,10 +4,12 @@ #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h" -#include "base/basictypes.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.h b/chrome/browser/ui/webui/options/clear_browser_data_handler.h index ea1e7dc..6a09ab6 100644 --- a/chrome/browser/ui/webui/options/clear_browser_data_handler.h +++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_ +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/prefs/pref_member.h" #include "chrome/browser/browsing_data/browsing_data_counter.h"
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 278f49306..f26c435d 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/content_settings_handler.h" +#include <stddef.h> + #include <algorithm> #include <map> #include <vector> @@ -12,11 +14,13 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" @@ -817,7 +821,7 @@ } void ContentSettingsHandler::OnGetPermissionSettingsCompleted( - uint32 request_id, + uint32_t request_id, bool success, PP_Flash_BrowserOperations_Permission default_permission, const ppapi::FlashSiteSettings& sites) {
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h index 0b2c38c..01ae9d78 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.h +++ b/chrome/browser/ui/webui/options/content_settings_handler.h
@@ -5,8 +5,11 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/scoped_observer.h" @@ -55,7 +58,7 @@ // PepperFlashSettingsManager::Client implementation. void OnGetPermissionSettingsCompleted( - uint32 request_id, + uint32_t request_id, bool success, PP_Flash_BrowserOperations_Permission default_permission, const ppapi::FlashSiteSettings& sites) override;
diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.cc b/chrome/browser/ui/webui/options/cookies_view_handler.cc index 9567b422..17ea9d782 100644 --- a/chrome/browser/ui/webui/options/cookies_view_handler.cc +++ b/chrome/browser/ui/webui/options/cookies_view_handler.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.h b/chrome/browser/ui/webui/options/cookies_view_handler.h index 319abca..fcfefd4 100644 --- a/chrome/browser/ui/webui/options/cookies_view_handler.h +++ b/chrome/browser/ui/webui/options/cookies_view_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_COOKIES_VIEW_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/browsing_data/cookies_tree_model.h" #include "chrome/browser/ui/webui/options/options_ui.h"
diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc index a54bd13..b15d207 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.cc +++ b/chrome/browser/ui/webui/options/core_options_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/core_options_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/json/json_reader.h" @@ -12,6 +14,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/ui/webui/options/core_options_handler.h b/chrome/browser/ui/webui/options/core_options_handler.h index e5e5bc2..5b49bfa 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.h +++ b/chrome/browser/ui/webui/options/core_options_handler.h
@@ -9,6 +9,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/options/create_profile_handler.cc b/chrome/browser/ui/webui/options/create_profile_handler.cc index 21d6a535..a85a4f4 100644 --- a/chrome/browser/ui/webui/options/create_profile_handler.cc +++ b/chrome/browser/ui/webui/options/create_profile_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/create_profile_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/file_path.h" #include "base/metrics/histogram.h"
diff --git a/chrome/browser/ui/webui/options/create_profile_handler.h b/chrome/browser/ui/webui/options/create_profile_handler.h index 6ee91ba..cb017faf97 100644 --- a/chrome/browser/ui/webui/options/create_profile_handler.h +++ b/chrome/browser/ui/webui/options/create_profile_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CREATE_PROFILE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CREATE_PROFILE_HANDLER_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/options/easy_unlock_handler.cc b/chrome/browser/ui/webui/options/easy_unlock_handler.cc index ccde01b..c352b23 100644 --- a/chrome/browser/ui/webui/options/easy_unlock_handler.cc +++ b/chrome/browser/ui/webui/options/easy_unlock_handler.cc
@@ -7,6 +7,7 @@ #include <string> #include "base/bind.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/easy_unlock_service.h"
diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc index 690e053..d6d86a2 100644 --- a/chrome/browser/ui/webui/options/font_settings_handler.cc +++ b/chrome/browser/ui/webui/options/font_settings_handler.cc
@@ -4,17 +4,20 @@ #include "chrome/browser/ui/webui/options/font_settings_handler.h" +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/ui/webui/options/font_settings_utils.h b/chrome/browser/ui/webui/options/font_settings_utils.h index 032aaca..b800f25 100644 --- a/chrome/browser/ui/webui/options/font_settings_utils.h +++ b/chrome/browser/ui/webui/options/font_settings_utils.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_UTILS_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_UTILS_H_ -#include "base/basictypes.h" +#include "base/macros.h" class PrefService;
diff --git a/chrome/browser/ui/webui/options/geolocation_options_handler.h b/chrome/browser/ui/webui/options/geolocation_options_handler.h index 7f0993de..f3ce970 100644 --- a/chrome/browser/ui/webui/options/geolocation_options_handler.h +++ b/chrome/browser/ui/webui/options/geolocation_options_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_GEOLOCATION_OPTIONS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_GEOLOCATION_OPTIONS_HANDLER_H_ +#include "base/macros.h" #include "base/prefs/pref_member.h" #include "chrome/browser/ui/webui/options/options_ui.h"
diff --git a/chrome/browser/ui/webui/options/handler_options_handler.cc b/chrome/browser/ui/webui/options/handler_options_handler.cc index 8b11fe87..7958f35 100644 --- a/chrome/browser/ui/webui/options/handler_options_handler.cc +++ b/chrome/browser/ui/webui/options/handler_options_handler.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/options/handler_options_handler.h b/chrome/browser/ui/webui/options/handler_options_handler.h index aa331280..f1b49ac 100644 --- a/chrome/browser/ui/webui/options/handler_options_handler.h +++ b/chrome/browser/ui/webui/options/handler_options_handler.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "chrome/common/custom_handlers/protocol_handler.h"
diff --git a/chrome/browser/ui/webui/options/help_overlay_handler.h b/chrome/browser/ui/webui/options/help_overlay_handler.h index b216132..08b9973 100644 --- a/chrome/browser/ui/webui/options/help_overlay_handler.h +++ b/chrome/browser/ui/webui/options/help_overlay_handler.h
@@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_HELP_OVERLAY_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_HELP_OVERLAY_HANDLER_H_ -#include "base/basictypes.h" #include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h"
diff --git a/chrome/browser/ui/webui/options/home_page_overlay_handler.h b/chrome/browser/ui/webui/options/home_page_overlay_handler.h index 36fce27..f359750 100644 --- a/chrome/browser/ui/webui/options/home_page_overlay_handler.h +++ b/chrome/browser/ui/webui/options/home_page_overlay_handler.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_HOME_PAGE_OVERLAY_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_HOME_PAGE_OVERLAY_HANDLER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "components/omnibox/browser/autocomplete_controller_delegate.h"
diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc index e0df0069..481b323e 100644 --- a/chrome/browser/ui/webui/options/import_data_handler.cc +++ b/chrome/browser/ui/webui/options/import_data_handler.cc
@@ -4,11 +4,13 @@ #include "chrome/browser/ui/webui/options/import_data_handler.h" +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" @@ -99,7 +101,7 @@ void ImportDataHandler::StartImport( const importer::SourceProfile& source_profile, - uint16 imported_items) { + uint16_t imported_items) { DCHECK_CURRENTLY_ON(BrowserThread::UI); if (!imported_items) @@ -137,7 +139,7 @@ return; } - uint16 selected_items = importer::NONE; + uint16_t selected_items = importer::NONE; if (args->GetString(1, &string_value) && string_value == "true") { selected_items |= importer::HISTORY; } @@ -156,9 +158,9 @@ const importer::SourceProfile& source_profile = importer_list_->GetSourceProfileAt(browser_index); - uint16 supported_items = source_profile.services_supported; + uint16_t supported_items = source_profile.services_supported; - uint16 imported_items = (selected_items & supported_items); + uint16_t imported_items = (selected_items & supported_items); if (imported_items) { StartImport(source_profile, imported_items); } else { @@ -174,7 +176,7 @@ for (size_t i = 0; i < importer_list_->count(); ++i) { const importer::SourceProfile& source_profile = importer_list_->GetSourceProfileAt(i); - uint16 browser_services = source_profile.services_supported; + uint16_t browser_services = source_profile.services_supported; base::DictionaryValue* browser_profile = new base::DictionaryValue(); browser_profile->SetString("name", source_profile.importer_name);
diff --git a/chrome/browser/ui/webui/options/import_data_handler.h b/chrome/browser/ui/webui/options/import_data_handler.h index ec9da8d..99c9902 100644 --- a/chrome/browser/ui/webui/options/import_data_handler.h +++ b/chrome/browser/ui/webui/options/import_data_handler.h
@@ -5,8 +5,10 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/importer/importer_progress_observer.h" #include "chrome/browser/ui/webui/options/options_ui.h" @@ -36,7 +38,7 @@ private: void StartImport(const importer::SourceProfile& source_profile, - uint16 imported_items); + uint16_t imported_items); void ImportData(const base::ListValue* args);
diff --git a/chrome/browser/ui/webui/options/language_dictionary_interactive_uitest.cc b/chrome/browser/ui/webui/options/language_dictionary_interactive_uitest.cc index 04cbf0a..7a6a5cb9 100644 --- a/chrome/browser/ui/webui/options/language_dictionary_interactive_uitest.cc +++ b/chrome/browser/ui/webui/options/language_dictionary_interactive_uitest.cc
@@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h"
diff --git a/chrome/browser/ui/webui/options/language_options_handler.cc b/chrome/browser/ui/webui/options/language_options_handler.cc index 2c0e835..0b45d66 100644 --- a/chrome/browser/ui/webui/options/language_options_handler.cc +++ b/chrome/browser/ui/webui/options/language_options_handler.cc
@@ -4,12 +4,13 @@ #include "chrome/browser/ui/webui/options/language_options_handler.h" +#include <stddef.h> + #include <map> #include <string> #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" #include "base/i18n/rtl.h"
diff --git a/chrome/browser/ui/webui/options/language_options_handler.h b/chrome/browser/ui/webui/options/language_options_handler.h index 567e8f64..4172579 100644 --- a/chrome/browser/ui/webui/options/language_options_handler.h +++ b/chrome/browser/ui/webui/options/language_options_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/options/language_options_handler_common.h" namespace options {
diff --git a/chrome/browser/ui/webui/options/language_options_handler_common.cc b/chrome/browser/ui/webui/options/language_options_handler_common.cc index 3764687..680df95 100644 --- a/chrome/browser/ui/webui/options/language_options_handler_common.cc +++ b/chrome/browser/ui/webui/options/language_options_handler_common.cc
@@ -4,20 +4,23 @@ #include "chrome/browser/ui/webui/options/language_options_handler_common.h" +#include <stddef.h> + #include <map> #include <string> #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/spellchecker/spellcheck_factory.h"
diff --git a/chrome/browser/ui/webui/options/language_options_handler_common.h b/chrome/browser/ui/webui/options/language_options_handler_common.h index a0ba10e..1b94a67 100644 --- a/chrome/browser/ui/webui/options/language_options_handler_common.h +++ b/chrome/browser/ui/webui/options/language_options_handler_common.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h" #include "chrome/browser/ui/webui/options/options_ui.h"
diff --git a/chrome/browser/ui/webui/options/language_options_handler_unittest.cc b/chrome/browser/ui/webui/options/language_options_handler_unittest.cc index a67121f..5a4ed59 100644 --- a/chrome/browser/ui/webui/options/language_options_handler_unittest.cc +++ b/chrome/browser/ui/webui/options/language_options_handler_unittest.cc
@@ -7,6 +7,7 @@ #include <string> #include "base/values.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #if !defined(OS_MACOSX)
diff --git a/chrome/browser/ui/webui/options/language_options_interactive_uitest.cc b/chrome/browser/ui/webui/options/language_options_interactive_uitest.cc index e12ad8c..051fe12 100644 --- a/chrome/browser/ui/webui/options/language_options_interactive_uitest.cc +++ b/chrome/browser/ui/webui/options/language_options_interactive_uitest.cc
@@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h"
diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc index f2aa14c7..6e4464a 100644 --- a/chrome/browser/ui/webui/options/manage_profile_handler.cc +++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/ui/webui/options/manage_profile_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_number_conversions.h" @@ -13,6 +16,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/value_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/gaia_info_update_service.h"
diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.h b/chrome/browser/ui/webui/options/manage_profile_handler.h index 5c10187..49d99a8 100644 --- a/chrome/browser/ui/webui/options/manage_profile_handler.h +++ b/chrome/browser/ui/webui/options/manage_profile_handler.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "chrome/browser/profiles/profile_info_cache_observer.h"
diff --git a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc index 3d37cc6..f574933 100644 --- a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc +++ b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc
@@ -4,7 +4,10 @@ #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h" +#include <stddef.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ui/webui/options/media_devices_selection_handler.h b/chrome/browser/ui/webui/options/media_devices_selection_handler.h index 4983e6c..d9478367 100644 --- a/chrome/browser/ui/webui/options/media_devices_selection_handler.h +++ b/chrome/browser/ui/webui/options/media_devices_selection_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_MEDIA_DEVICES_SELECTION_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_MEDIA_DEVICES_SELECTION_HANDLER_H_ +#include "base/macros.h" #include "chrome/browser/media/media_capture_devices_dispatcher.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/webui/options/multilanguage_options_browsertest.cc b/chrome/browser/ui/webui/options/multilanguage_options_browsertest.cc index 2ce5747..e1a589e3 100644 --- a/chrome/browser/ui/webui/options/multilanguage_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/multilanguage_options_browsertest.cc
@@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ui/webui/options/options_browsertest.h b/chrome/browser/ui/webui/options/options_browsertest.h index 9dd0aec..d8135a8 100644 --- a/chrome/browser/ui/webui/options/options_browsertest.h +++ b/chrome/browser/ui/webui/options/options_browsertest.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_BROWSERTEST_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_BROWSERTEST_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/test/base/web_ui_browser_test.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index 1ec0ded..33a376c 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/singleton.h" #include "base/message_loop/message_loop.h" @@ -18,6 +18,7 @@ #include "base/threading/thread.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_about_handler.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/tab_helper.h"
diff --git a/chrome/browser/ui/webui/options/options_ui.h b/chrome/browser/ui/webui/options/options_ui.h index b14a89d..40d84f6 100644 --- a/chrome/browser/ui/webui/options/options_ui.h +++ b/chrome/browser/ui/webui/options/options_ui.h
@@ -5,12 +5,16 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_ +#include <stddef.h> + #include <string> #include <vector> #include "base/callback_list.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/options/options_ui_browsertest.cc b/chrome/browser/ui/webui/options/options_ui_browsertest.cc index 71db625..b42883e4 100644 --- a/chrome/browser/ui/webui/options/options_ui_browsertest.cc +++ b/chrome/browser/ui/webui/options/options_ui_browsertest.cc
@@ -8,6 +8,7 @@ #include "base/scoped_observer.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/signin/account_tracker_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -32,7 +33,6 @@ #if !defined(OS_CHROMEOS) #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" #include "base/files/file_path.h"
diff --git a/chrome/browser/ui/webui/options/options_ui_browsertest.h b/chrome/browser/ui/webui/options/options_ui_browsertest.h index eafcfb1..aa75e2b 100644 --- a/chrome/browser/ui/webui/options/options_ui_browsertest.h +++ b/chrome/browser/ui/webui/options/options_ui_browsertest.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/test/base/in_process_browser_test.h" namespace content {
diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc index dc51759..645eacf9 100644 --- a/chrome/browser/ui/webui/options/password_manager_handler.cc +++ b/chrome/browser/ui/webui/options/password_manager_handler.cc
@@ -6,11 +6,13 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service_factory.h"
diff --git a/chrome/browser/ui/webui/options/password_manager_handler.h b/chrome/browser/ui/webui/options/password_manager_handler.h index 5befa1b..fc09064 100644 --- a/chrome/browser/ui/webui/options/password_manager_handler.h +++ b/chrome/browser/ui/webui/options/password_manager_handler.h
@@ -5,10 +5,14 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_ +#include <stddef.h> + #include <string> #include <vector> +#include "base/macros.h" #include "base/prefs/pref_member.h" +#include "build/build_config.h" #include "chrome/browser/ui/passwords/password_manager_presenter.h" #include "chrome/browser/ui/passwords/password_ui_view.h" #include "chrome/browser/ui/webui/options/options_ui.h"
diff --git a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc b/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc index 4bfcd21..dd1317c 100644 --- a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc +++ b/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc
@@ -4,7 +4,9 @@ #include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h" -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" using options::MediaException;
diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc index 2f2cee9..4d57e9c 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.cc +++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/preferences_browsertest.h" +#include <stddef.h> + #include <iostream> #include <sstream> @@ -13,6 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.h b/chrome/browser/ui/webui/options/preferences_browsertest.h index eeb13b58a..8a00055c 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.h +++ b/chrome/browser/ui/webui/options/preferences_browsertest.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc index b3ef573..ff78249 100644 --- a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc +++ b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc
@@ -6,10 +6,12 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/google/google_brand.h" #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
diff --git a/chrome/browser/ui/webui/options/reset_profile_settings_handler.h b/chrome/browser/ui/webui/options/reset_profile_settings_handler.h index 5c1bf2d..3c19074e 100644 --- a/chrome/browser/ui/webui/options/reset_profile_settings_handler.h +++ b/chrome/browser/ui/webui/options/reset_profile_settings_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/options/options_ui.h"
diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.h b/chrome/browser/ui/webui/options/search_engine_manager_handler.h index 5fdc1f6..9ea83ff 100644 --- a/chrome/browser/ui/webui/options/search_engine_manager_handler.h +++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_ +#include "base/macros.h" #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/base/models/table_model_observer.h"
diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.cc b/chrome/browser/ui/webui/options/startup_pages_handler.cc index 6f9946c..c7718f0 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.cc +++ b/chrome/browser/ui/webui/options/startup_pages_handler.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/ui/webui/options/startup_pages_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.h b/chrome/browser/ui/webui/options/startup_pages_handler.h index 67810a2..7c1b82f6 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.h +++ b/chrome/browser/ui/webui/options/startup_pages_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_STARTUP_PAGES_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_STARTUP_PAGES_HANDLER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc index 9c889a9..9c44f68 100644 --- a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc +++ b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "base/strings/utf_string_conversions.h" #include "base/value_conversions.h"
diff --git a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.h b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.h index 7a281dc..980728c2 100644 --- a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.h +++ b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_SUPERVISED_USER_CREATE_CONFIRM_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_SUPERVISED_USER_CREATE_CONFIRM_HANDLER_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace base {
diff --git a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc index 548d441..1721606 100644 --- a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc +++ b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc
@@ -4,9 +4,12 @@ #include "chrome/browser/ui/webui/options/supervised_user_import_handler.h" +#include <stddef.h> + #include <set> #include "base/bind.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/options/supervised_user_import_handler.h b/chrome/browser/ui/webui/options/supervised_user_import_handler.h index 46e93a2..0a5ff83 100644 --- a/chrome/browser/ui/webui/options/supervised_user_import_handler.h +++ b/chrome/browser/ui/webui/options/supervised_user_import_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback_list.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" #include "base/strings/string16.h"
diff --git a/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.cc b/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.cc index 19e2fc9c..f7707e89 100644 --- a/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.cc +++ b/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h b/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h index a8e2662..4d17286 100644 --- a/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h +++ b/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_SUPERVISED_USER_LEARN_MORE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_SUPERVISED_USER_LEARN_MORE_HANDLER_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace base {
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc index 67ecc43..6c7dac3b 100644 --- a/chrome/browser/ui/webui/options/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/ui/webui/options/sync_setup_handler.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" @@ -12,10 +11,12 @@ #include "base/i18n/time_formatting.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h"
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.h b/chrome/browser/ui/webui/options/sync_setup_handler.h index 86ac6bcc..7779510 100644 --- a/chrome/browser/ui/webui/options/sync_setup_handler.h +++ b/chrome/browser/ui/webui/options/sync_setup_handler.h
@@ -6,8 +6,10 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" +#include "build/build_config.h" #include "chrome/browser/sync/sync_startup_tracker.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h"
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc index 91433b68..7b92e33e 100644 --- a/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc +++ b/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc
@@ -9,10 +9,12 @@ #include "base/command_line.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/signin/fake_signin_manager_builder.h" #include "chrome/browser/signin/signin_error_controller_factory.h" #include "chrome/browser/signin/signin_manager_factory.h"
diff --git a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h index 459a4b0..7bf268d 100644 --- a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h +++ b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_PASSWORD_MANAGER_INTERNALS_PASSWORD_MANAGER_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_PASSWORD_MANAGER_INTERNALS_PASSWORD_MANAGER_INTERNALS_UI_H_ +#include "base/macros.h" #include "components/password_manager/core/browser/log_receiver.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc index 46b10da..678c0e6 100644 --- a/chrome/browser/ui/webui/plugins_ui.cc +++ b/chrome/browser/ui/webui/plugins_ui.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/plugins_ui.h" +#include <stddef.h> + #include <algorithm> #include <string> #include <vector> @@ -11,6 +13,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" @@ -22,6 +25,7 @@ #include "base/prefs/scoped_user_pref_update.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/plugins/plugin_finder.h"
diff --git a/chrome/browser/ui/webui/plugins_ui.h b/chrome/browser/ui/webui/plugins_ui.h index d97e5d37..0d462f5 100644 --- a/chrome/browser/ui/webui/plugins_ui.h +++ b/chrome/browser/ui/webui/plugins_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_PLUGINS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_PLUGINS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h"
diff --git a/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc b/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc index 5614f46..5872b3f 100644 --- a/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/policy_indicator_localized_strings_provider.h" +#include "build/build_config.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/web_ui_data_source.h"
diff --git a/chrome/browser/ui/webui/policy_material_design_ui.cc b/chrome/browser/ui/webui/policy_material_design_ui.cc index e81dafd..39376ac9 100644 --- a/chrome/browser/ui/webui/policy_material_design_ui.cc +++ b/chrome/browser/ui/webui/policy_material_design_ui.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/ui/webui/policy_material_design_ui.h" +#include <stddef.h> + +#include "base/macros.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/policy_ui_handler.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/webui/policy_ui.h b/chrome/browser/ui/webui/policy_ui.h index bbad641b..d8b58392 100644 --- a/chrome/browser/ui/webui/policy_ui.h +++ b/chrome/browser/ui/webui/policy_ui.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace content {
diff --git a/chrome/browser/ui/webui/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy_ui_browsertest.cc index 3830cdc..2a4af9d 100644 --- a/chrome/browser/ui/webui/policy_ui_browsertest.cc +++ b/chrome/browser/ui/webui/policy_ui_browsertest.cc
@@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <vector> #include "base/callback.h" #include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/ui/webui/policy_ui_handler.cc b/chrome/browser/ui/webui/policy_ui_handler.cc index d22cf51..602d5111 100644 --- a/chrome/browser/ui/webui/policy_ui_handler.cc +++ b/chrome/browser/ui/webui/policy_ui_handler.cc
@@ -17,6 +17,7 @@ #include "base/strings/string16.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/policy/profile_policy_connector_factory.h"
diff --git a/chrome/browser/ui/webui/policy_ui_handler.h b/chrome/browser/ui/webui/policy_ui_handler.h index f2b04460..b6c4a98 100644 --- a/chrome/browser/ui/webui/policy_ui_handler.h +++ b/chrome/browser/ui/webui/policy_ui_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_POLICY_UI_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_POLICY_UI_HANDLER_H_ +#include <stddef.h> #include <string.h> #include "base/macros.h"
diff --git a/chrome/browser/ui/webui/predictors/predictors_handler.h b/chrome/browser/ui/webui/predictors/predictors_handler.h index 4089ed9..e2baee33 100644 --- a/chrome/browser/ui/webui/predictors/predictors_handler.h +++ b/chrome/browser/ui/webui/predictors/predictors_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_PREDICTORS_PREDICTORS_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/predictors/resource_prefetch_predictor.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/predictors/predictors_ui.h b/chrome/browser/ui/webui/predictors/predictors_ui.h index e8b8d25..0f37e349 100644 --- a/chrome/browser/ui/webui/predictors/predictors_ui.h +++ b/chrome/browser/ui/webui/predictors/predictors_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_PREDICTORS_PREDICTORS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_PREDICTORS_PREDICTORS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class PredictorsUI : public content::WebUIController {
diff --git a/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc index 8438446..de4cff4a 100644 --- a/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <queue> #include <string>
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_distiller.cc b/chrome/browser/ui/webui/print_preview/print_preview_distiller.cc index 85c29539..4b2d235 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_distiller.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_distiller.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/print_preview/print_preview_distiller.h" +#include <stdint.h> + #include <string> #include "base/command_line.h"
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_distiller.h b/chrome/browser/ui/webui/print_preview/print_preview_distiller.h index ed2a7cc..aef2cea 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_distiller.h +++ b/chrome/browser/ui/webui/print_preview/print_preview_distiller.h
@@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/feature_list.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index 252f0efd2..4e43db2 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/print_preview/print_preview_handler.h" #include <ctype.h> +#include <stddef.h> #include <map> #include <string> @@ -17,6 +18,7 @@ #include "base/i18n/number_formatting.h" #include "base/json/json_reader.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" @@ -28,6 +30,7 @@ #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/dom_distiller/tab_utils.h"
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.h b/chrome/browser/ui/webui/print_preview/print_preview_handler.h index 7bc8bc12..5d19a46 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.h +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.h
@@ -9,6 +9,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc index f075900..1c2c19e2 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -9,6 +9,7 @@ #include "base/id_map.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" @@ -17,6 +18,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/printing/background_printing_manager.h" #include "chrome/browser/printing/print_preview_data_service.h" @@ -63,7 +65,7 @@ // Gets the value for |preview_id|. // Returns true and sets |out_value| on success. - bool Get(int32 preview_id, int* out_value) { + bool Get(int32_t preview_id, int* out_value) { base::AutoLock lock(lock_); PrintPreviewRequestIdMap::const_iterator it = map_.find(preview_id); if (it == map_.end()) @@ -73,13 +75,13 @@ } // Sets the |value| for |preview_id|. - void Set(int32 preview_id, int value) { + void Set(int32_t preview_id, int value) { base::AutoLock lock(lock_); map_[preview_id] = value; } // Erases the entry for |preview_id|. - void Erase(int32 preview_id) { + void Erase(int32_t preview_id) { base::AutoLock lock(lock_); map_.erase(preview_id); } @@ -461,7 +463,7 @@ } // static -void PrintPreviewUI::GetCurrentPrintPreviewStatus(int32 preview_ui_id, +void PrintPreviewUI::GetCurrentPrintPreviewStatus(int32_t preview_ui_id, int request_id, bool* cancel) { int current_id = -1; @@ -472,7 +474,7 @@ *cancel = (request_id != current_id); } -int32 PrintPreviewUI::GetIDForPrintPreviewUI() const { +int32_t PrintPreviewUI::GetIDForPrintPreviewUI() const { return id_; }
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.h b/chrome/browser/ui/webui/print_preview/print_preview_ui.h index cf3a3bc0..fbcd8724 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.h +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.h
@@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_UI_H_ #define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_UI_H_ +#include <stdint.h> + #include <string> #include "base/callback_forward.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" @@ -75,12 +78,12 @@ // Determines whether to cancel a print preview request based on // |preview_ui_id| and |request_id|. // Can be called from any thread. - static void GetCurrentPrintPreviewStatus(int32 preview_ui_id, + static void GetCurrentPrintPreviewStatus(int32_t preview_ui_id, int request_id, bool* cancel); // Returns an id to uniquely identify this PrintPreviewUI. - int32 GetIDForPrintPreviewUI() const; + int32_t GetIDForPrintPreviewUI() const; // Notifies the Web UI of a print preview request with |request_id|. void OnPrintPreviewRequest(int request_id); @@ -180,7 +183,7 @@ // The unique ID for this class instance. Stored here to avoid calling // GetIDForPrintPreviewUI() everywhere. - const int32 id_; + const int32_t id_; // Weak pointer to the WebUI handler. PrintPreviewHandler* handler_;
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc index b4cee6a8..f2604fc8 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
@@ -4,6 +4,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc index 85b80f7..7adf85e 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/prefs/pref_service.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" @@ -198,13 +201,13 @@ // Test with invalid |preview_ui_addr|. bool cancel = false; - const int32 kInvalidId = -5; + const int32_t kInvalidId = -5; preview_ui->GetCurrentPrintPreviewStatus(kInvalidId, 0, &cancel); EXPECT_TRUE(cancel); const int kFirstRequestId = 1000; const int kSecondRequestId = 1001; - const int32 preview_ui_addr = preview_ui->GetIDForPrintPreviewUI(); + const int32_t preview_ui_addr = preview_ui->GetIDForPrintPreviewUI(); // Test with kFirstRequestId. preview_ui->OnPrintPreviewRequest(kFirstRequestId);
diff --git a/chrome/browser/ui/webui/profiler_ui.cc b/chrome/browser/ui/webui/profiler_ui.cc index 97629121..2e12de24 100644 --- a/chrome/browser/ui/webui/profiler_ui.cc +++ b/chrome/browser/ui/webui/profiler_ui.cc
@@ -14,6 +14,7 @@ // #define USE_SOURCE_FILES_DIRECTLY #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/tracked_objects.h"
diff --git a/chrome/browser/ui/webui/profiler_ui.h b/chrome/browser/ui/webui/profiler_ui.h index 4a490c83..350fe7e 100644 --- a/chrome/browser/ui/webui/profiler_ui.h +++ b/chrome/browser/ui/webui/profiler_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_PROFILER_UI_H_ #define CHROME_BROWSER_UI_WEBUI_PROFILER_UI_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "components/metrics/profiler/tracking_synchronizer_observer.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc index 23c164a..4012583 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc
@@ -33,7 +33,7 @@ base::Unretained(this))); } -void QuotaInternalsHandler::ReportAvailableSpace(int64 available_space) { +void QuotaInternalsHandler::ReportAvailableSpace(int64_t available_space) { SendMessage("AvailableSpaceUpdated", base::FundamentalValue(static_cast<double>(available_space))); }
diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.h b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.h index 1ddfce8..b3a7eb7 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.h +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.h
@@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_HANDLER_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/browser/web_ui_message_handler.h" #include "storage/common/quota/quota_types.h" @@ -35,7 +38,7 @@ void RegisterMessages() override; // Called by QuotaInternalsProxy to report information to WebUI page. - void ReportAvailableSpace(int64 available_space); + void ReportAvailableSpace(int64_t available_space); void ReportGlobalInfo(const GlobalStorageInfo& data); void ReportPerHostInfo(const std::vector<PerHostStorageInfo>& hosts); void ReportPerOriginInfo(const std::vector<PerOriginStorageInfo>& origins);
diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.cc b/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.cc index 8dfe2e8..b7ceb921 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.cc +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.cc
@@ -93,7 +93,7 @@ handler_->func(arg); \ } -RELAY_TO_HANDLER(ReportAvailableSpace, int64) +RELAY_TO_HANDLER(ReportAvailableSpace, int64_t) RELAY_TO_HANDLER(ReportGlobalInfo, const GlobalStorageInfo&) RELAY_TO_HANDLER(ReportPerHostInfo, const std::vector<PerHostStorageInfo>&) RELAY_TO_HANDLER(ReportPerOriginInfo, const std::vector<PerOriginStorageInfo>&) @@ -102,7 +102,7 @@ #undef RELAY_TO_HANDLER void QuotaInternalsProxy::DidGetAvailableSpace(storage::QuotaStatusCode status, - int64 space) { + int64_t space) { // crbug.com/349708 TRACE_EVENT0("io", "QuotaInternalsProxy::DidGetAvailableSpace"); @@ -112,7 +112,7 @@ void QuotaInternalsProxy::DidGetGlobalQuota(storage::StorageType type, storage::QuotaStatusCode status, - int64 quota) { + int64_t quota) { if (status == storage::kQuotaStatusOk) { GlobalStorageInfo info(type); info.set_quota(quota); @@ -121,8 +121,8 @@ } void QuotaInternalsProxy::DidGetGlobalUsage(storage::StorageType type, - int64 usage, - int64 unlimited_usage) { + int64_t usage, + int64_t unlimited_usage) { GlobalStorageInfo info(type); info.set_usage(usage); info.set_unlimited_usage(unlimited_usage); @@ -165,7 +165,7 @@ void QuotaInternalsProxy::DidGetHostUsage(const std::string& host, storage::StorageType type, - int64 usage) { + int64_t usage) { DCHECK(type == storage::kStorageTypeTemporary || type == storage::kStorageTypePersistent || type == storage::kStorageTypeSyncable);
diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.h b/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.h index 010b3b16..b3e3d661 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.h +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.h
@@ -5,11 +5,14 @@ #ifndef CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_PROXY_H_ #define CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_PROXY_H_ +#include <stdint.h> + #include <map> #include <set> #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner_helpers.h" @@ -48,25 +51,25 @@ virtual ~QuotaInternalsProxy(); - void ReportAvailableSpace(int64 available_space); + void ReportAvailableSpace(int64_t available_space); void ReportGlobalInfo(const GlobalStorageInfo& data); void ReportPerHostInfo(const std::vector<PerHostStorageInfo>& hosts); void ReportPerOriginInfo(const std::vector<PerOriginStorageInfo>& origins); void ReportStatistics(const Statistics& stats); // Called on IO Thread by QuotaManager as callback. - void DidGetAvailableSpace(storage::QuotaStatusCode status, int64 space); + void DidGetAvailableSpace(storage::QuotaStatusCode status, int64_t space); void DidGetGlobalQuota(storage::StorageType type, storage::QuotaStatusCode status, - int64 quota); + int64_t quota); void DidGetGlobalUsage(storage::StorageType type, - int64 usage, - int64 unlimited_usage); + int64_t usage, + int64_t unlimited_usage); void DidDumpQuotaTable(const QuotaTableEntries& entries); void DidDumpOriginInfoTable(const OriginInfoTableEntries& entries); void DidGetHostUsage(const std::string& host, storage::StorageType type, - int64 usage); + int64_t usage); // Helper. Called on IO Thread. void RequestPerOriginInfo(storage::StorageType type);
diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_types.h b/chrome/browser/ui/webui/quota_internals/quota_internals_types.h index 8ddca4a..eeea477 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_types.h +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_types.h
@@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_TYPES_H_ #define CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_TYPES_H_ +#include <stdint.h> + #include <map> #include <string> @@ -24,17 +26,13 @@ explicit GlobalStorageInfo(storage::StorageType type); ~GlobalStorageInfo(); - void set_usage(int64 usage) { - usage_ = usage; - } + void set_usage(int64_t usage) { usage_ = usage; } - void set_unlimited_usage(int64 unlimited_usage) { + void set_unlimited_usage(int64_t unlimited_usage) { unlimited_usage_ = unlimited_usage; } - void set_quota(int64 quota) { - quota_ = quota; - } + void set_quota(int64_t quota) { quota_ = quota; } // Create new Value for passing to WebUI page. Caller is responsible for // deleting the returned pointer. @@ -42,9 +40,9 @@ private: storage::StorageType type_; - int64 usage_; - int64 unlimited_usage_; - int64 quota_; + int64_t usage_; + int64_t unlimited_usage_; + int64_t quota_; }; // Represents per host usage and quota information for the storage. @@ -53,13 +51,9 @@ PerHostStorageInfo(const std::string& host, storage::StorageType type); ~PerHostStorageInfo(); - void set_usage(int64 usage) { - usage_ = usage; - } + void set_usage(int64_t usage) { usage_ = usage; } - void set_quota(int64 quota) { - quota_ = quota; - } + void set_quota(int64_t quota) { quota_ = quota; } // Create new Value for passing to WebUI page. Caller is responsible for // deleting the returned pointer. @@ -68,8 +62,8 @@ std::string host_; storage::StorageType type_; - int64 usage_; - int64 quota_; + int64_t usage_; + int64_t quota_; }; // Represendts per origin usage and access time information.
diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_ui.h b/chrome/browser/ui/webui/quota_internals/quota_internals_ui.h index e4d9cc74..9dc78b07 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_ui.h +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_ui.h
@@ -4,6 +4,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_UI_H_ + +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class QuotaInternalsUI : public content::WebUIController {
diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.cc b/chrome/browser/ui/webui/set_as_default_browser_ui.cc index 7bc7540..0512b99 100644 --- a/chrome/browser/ui/webui/set_as_default_browser_ui.cc +++ b/chrome/browser/ui/webui/set_as_default_browser_ui.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.h b/chrome/browser/ui/webui/set_as_default_browser_ui.h index 2223675..9b9009d3 100644 --- a/chrome/browser/ui/webui/set_as_default_browser_ui.h +++ b/chrome/browser/ui/webui/set_as_default_browser_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SET_AS_DEFAULT_BROWSER_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SET_AS_DEFAULT_BROWSER_UI_H_ +#include "base/macros.h" #include "ui/web_dialogs/web_dialog_ui.h" class Browser;
diff --git a/chrome/browser/ui/webui/settings/downloads_handler.h b/chrome/browser/ui/webui/settings/downloads_handler.h index d4b0aff..7da67fed 100644 --- a/chrome/browser/ui/webui/settings/downloads_handler.h +++ b/chrome/browser/ui/webui/settings/downloads_handler.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/settings/md_settings_ui.h" #include "ui/shell_dialogs/select_file_dialog.h"
diff --git a/chrome/browser/ui/webui/settings/font_handler.cc b/chrome/browser/ui/webui/settings/font_handler.cc index 5fb93cc..4aee410 100644 --- a/chrome/browser/ui/webui/settings/font_handler.cc +++ b/chrome/browser/ui/webui/settings/font_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/settings/font_handler.h" +#include <stddef.h> + #include "base/bind_helpers.h" #include "base/i18n/rtl.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/ui/webui/settings/languages_handler.cc b/chrome/browser/ui/webui/settings/languages_handler.cc index 69dd582..80dd727 100644 --- a/chrome/browser/ui/webui/settings/languages_handler.cc +++ b/chrome/browser/ui/webui/settings/languages_handler.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc index 10e0888..a9d43ef 100644 --- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/policy_indicator_localized_strings_provider.h"
diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc index 1fd56bf..b1de9faa 100644 --- a/chrome/browser/ui/webui/settings/md_settings_ui.cc +++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/settings/md_settings_ui.h" +#include <stddef.h> + #include <string> #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.h b/chrome/browser/ui/webui/settings/md_settings_ui.h index 5623dc3..55cede3f 100644 --- a/chrome/browser/ui/webui/settings/md_settings_ui.h +++ b/chrome/browser/ui/webui/settings/md_settings_ui.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc index 75be9f4..c425b38a 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/ui/webui/settings/people_handler.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" @@ -15,6 +14,7 @@ #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/settings/people_handler.h b/chrome/browser/ui/webui/settings/people_handler.h index 4a05c08..ac1ec58 100644 --- a/chrome/browser/ui/webui/settings/people_handler.h +++ b/chrome/browser/ui/webui/settings/people_handler.h
@@ -12,6 +12,7 @@ #include "base/scoped_observer.h" #include "base/strings/utf_string_conversions.h" #include "base/timer/timer.h" +#include "build/build_config.h" #include "chrome/browser/sync/sync_startup_tracker.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "components/signin/core/browser/signin_manager_base.h"
diff --git a/chrome/browser/ui/webui/settings/people_handler_unittest.cc b/chrome/browser/ui/webui/settings/people_handler_unittest.cc index 7a8d1ee..930005d3 100644 --- a/chrome/browser/ui/webui/settings/people_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/people_handler_unittest.cc
@@ -9,10 +9,12 @@ #include "base/command_line.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/signin/fake_signin_manager_builder.h" #include "chrome/browser/signin/signin_error_controller_factory.h" #include "chrome/browser/signin/signin_manager_factory.h"
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome/browser/ui/webui/settings/reset_settings_handler.cc index b3eda6e..38c7fef4 100644 --- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc +++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
@@ -11,6 +11,7 @@ #include "base/strings/string16.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/google/google_brand.h" #include "chrome/browser/prefs/chrome_pref_service_factory.h" #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h"
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.h b/chrome/browser/ui/webui/settings/reset_settings_handler.h index 6c8215ac..a6e39e1a 100644 --- a/chrome/browser/ui/webui/settings/reset_settings_handler.h +++ b/chrome/browser/ui/webui/settings/reset_settings_handler.h
@@ -11,6 +11,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "chrome/browser/ui/webui/settings/md_settings_ui.h" namespace base {
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc b/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc index ea3ee74..b87e8cfc 100644 --- a/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/profile_resetter/profile_resetter.h" #include "chrome/browser/ui/webui/settings/reset_settings_handler.h"
diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc index ea5795ef..559be10 100644 --- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
@@ -4,6 +4,9 @@ #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler.h b/chrome/browser/ui/webui/signin/inline_login_handler.h index 440ee557..e16f4b9 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler.h +++ b/chrome/browser/ui/webui/signin/inline_login_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_INLINE_LOGIN_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_INLINE_LOGIN_HANDLER_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc index 60ebf5d8..0a9c4b1 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
@@ -4,11 +4,14 @@ #include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h" +#include <stddef.h> + #include <string> #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/metrics/user_metrics_action.h" #include "base/prefs/pref_service.h"
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.h b/chrome/browser/ui/webui/signin/inline_login_handler_impl.h index f20256b..3d0adfe 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.h +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.h
@@ -9,6 +9,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h"
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc index 0894088..06806cb 100644 --- a/chrome/browser/ui/webui/signin/inline_login_ui.cc +++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
@@ -8,6 +8,7 @@ #include "base/files/file_util.h" #include "base/path_service.h" #include "base/strings/string_split.h" +#include "build/build_config.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.h b/chrome/browser/ui/webui/signin/inline_login_ui.h index 20a9f23f..e4417fe 100644 --- a/chrome/browser/ui/webui/signin/inline_login_ui.h +++ b/chrome/browser/ui/webui/signin/inline_login_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_INLINE_LOGIN_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_INLINE_LOGIN_UI_H_ +#include "base/macros.h" #include "chrome/browser/extensions/signin/scoped_gaia_auth_extension.h" #include "ui/web_dialogs/web_dialog_ui.h"
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc index ed7bbed8..03b1cce 100644 --- a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc +++ b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
@@ -3,9 +3,11 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" #include "chrome/browser/signin/fake_signin_manager_builder.h"
diff --git a/chrome/browser/ui/webui/signin/login_ui_service.cc b/chrome/browser/ui/webui/signin/login_ui_service.cc index 0fcc5d3..d6a2c6e 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service.cc +++ b/chrome/browser/ui/webui/signin/login_ui_service.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/signin/login_ui_service.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/signin_promo.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/webui/signin/login_ui_service.h b/chrome/browser/ui/webui/signin/login_ui_service.h index d15efe7d..23a9d11 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service.h +++ b/chrome/browser/ui/webui/signin/login_ui_service.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_LOGIN_UI_SERVICE_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_LOGIN_UI_SERVICE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/observer_list.h" #include "base/strings/string16.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/ui/webui/signin/login_ui_service_factory.h b/chrome/browser/ui/webui/signin/login_ui_service_factory.h index 434dbbae..d940d34 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service_factory.h +++ b/chrome/browser/ui/webui/signin/login_ui_service_factory.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_LOGIN_UI_SERVICE_FACTORY_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_LOGIN_UI_SERVICE_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc b/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc index 3568802..2a2585c 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc +++ b/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc
@@ -6,6 +6,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" class TestLoginUI : public LoginUIService::LoginUI {
diff --git a/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.cc b/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.cc index 5ad9d87..23ebfb2 100644 --- a/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.cc +++ b/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h" -#include "base/basictypes.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h b/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h index cada63e..8c54080 100644 --- a/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h +++ b/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h" #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
diff --git a/chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h b/chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h index ebc6754..ef4406e3 100644 --- a/chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h +++ b/chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_SIGNIN_CONFIRMATION_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_SIGNIN_CONFIRMATION_UI_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" // A WebUI tab-modal dialog to confirm signin with a managed account.
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc index 66c7d21..441afca 100644 --- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc +++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
@@ -4,8 +4,11 @@ #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/location.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "base/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h index b26d916d..570baff 100644 --- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h +++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/cancelable_task_tracker.h"
diff --git a/chrome/browser/ui/webui/signin/user_manager_ui.h b/chrome/browser/ui/webui/signin/user_manager_ui.h index ad00e33..a025871 100644 --- a/chrome/browser/ui/webui/signin/user_manager_ui.h +++ b/chrome/browser/ui/webui/signin/user_manager_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_USER_MANAGER_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_USER_MANAGER_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class UserManagerScreenHandler;
diff --git a/chrome/browser/ui/webui/signin_internals_ui.h b/chrome/browser/ui/webui/signin_internals_ui.h index 21781bb..217a722 100644 --- a/chrome/browser/ui/webui/signin_internals_ui.h +++ b/chrome/browser/ui/webui/signin_internals_ui.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_INTERNALS_UI_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/values.h" #include "components/signin/core/browser/about_signin_internals.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc b/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc index 3147aca..adc3c67 100644 --- a/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc +++ b/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/supervised_user_internals_message_handler.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.h b/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.h index 56ceb1b9..d590913 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.h +++ b/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_SYNC_FILE_SYSTEM_INTERNALS_DUMP_DATABASE_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/web_ui_message_handler.h" class Profile;
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h index 69225fc3..26fef71 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h +++ b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_SYNC_FILE_SYSTEM_INTERNALS_EXTENSION_STATUSES_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.h b/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.h index 4b57670..6849624f 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.h +++ b/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_SYNC_FILE_SYSTEM_INTERNALS_FILE_METADATA_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/sync_file_system/remote_file_sync_service.h"
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc index bfe466a8..126301d 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h" +#include <stdint.h> + #include <vector> #include "base/bind.h" @@ -96,7 +98,7 @@ void SyncFileSystemInternalsHandler::OnLogRecorded( const sync_file_system::TaskLogger::TaskLog& task_log) { base::DictionaryValue dict; - int64 duration = (task_log.end_time - task_log.start_time).InMilliseconds(); + int64_t duration = (task_log.end_time - task_log.start_time).InMilliseconds(); dict.SetInteger("duration", duration); dict.SetString("task_description", task_log.task_description); dict.SetString("result_description", task_log.result_description);
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h index 22b0cdbe..bbfe610 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h +++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/sync_file_system/sync_event_observer.h" #include "chrome/browser/sync_file_system/task_logger.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h index 3b96d1c1..f8d8b45 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h +++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SYNC_FILE_SYSTEM_INTERNALS_SYNC_FILE_SYSTEM_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SYNC_FILE_SYSTEM_INTERNALS_SYNC_FILE_SYSTEM_INTERNALS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class SyncFileSystemInternalsUI : public content::WebUIController {
diff --git a/chrome/browser/ui/webui/sync_internals_message_handler.h b/chrome/browser/ui/webui/sync_internals_message_handler.h index 4d93bbd..8020316c 100644 --- a/chrome/browser/ui/webui/sync_internals_message_handler.h +++ b/chrome/browser/ui/webui/sync_internals_message_handler.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h"
diff --git a/chrome/browser/ui/webui/sync_internals_ui.h b/chrome/browser/ui/webui/sync_internals_ui.h index 2268ffb..e1a773d53 100644 --- a/chrome/browser/ui/webui/sync_internals_ui.h +++ b/chrome/browser/ui/webui/sync_internals_ui.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_UI_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The implementation for the chrome://sync-internals page.
diff --git a/chrome/browser/ui/webui/system_info_ui.cc b/chrome/browser/ui/webui/system_info_ui.cc index cb840cb5..3253a65 100644 --- a/chrome/browser/ui/webui/system_info_ui.cc +++ b/chrome/browser/ui/webui/system_info_ui.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/webui/system_info_ui.h b/chrome/browser/ui/webui/system_info_ui.h index 6380329..5671021 100644 --- a/chrome/browser/ui/webui/system_info_ui.h +++ b/chrome/browser/ui/webui/system_info_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SYSTEM_INFO_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SYSTEM_INFO_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class SystemInfoUI : public content::WebUIController {
diff --git a/chrome/browser/ui/webui/theme_handler.h b/chrome/browser/ui/webui/theme_handler.h index 692f394..a0c5562 100644 --- a/chrome/browser/ui/webui/theme_handler.h +++ b/chrome/browser/ui/webui/theme_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_THEME_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_THEME_HANDLER_H_ +#include "base/macros.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/theme_source.h b/chrome/browser/ui/webui/theme_source.h index d6d0d1f..6c0b4fc 100644 --- a/chrome/browser/ui/webui/theme_source.h +++ b/chrome/browser/ui/webui/theme_source.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/browser/url_data_source.h"
diff --git a/chrome/browser/ui/webui/theme_source_unittest.cc b/chrome/browser/ui/webui/theme_source_unittest.cc index 0c8682e..60ce508 100644 --- a/chrome/browser/ui/webui/theme_source_unittest.cc +++ b/chrome/browser/ui/webui/theme_source_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.h b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.h index deb38cd..12a25c845 100644 --- a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.h +++ b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback_list.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/translate/core/browser/translate_language_list.h" #include "components/translate/core/browser/translate_manager.h"
diff --git a/chrome/browser/ui/webui/translate_internals/translate_internals_ui.h b/chrome/browser/ui/webui/translate_internals/translate_internals_ui.h index 22936e39..e2e134a1 100644 --- a/chrome/browser/ui/webui/translate_internals/translate_internals_ui.h +++ b/chrome/browser/ui/webui/translate_internals/translate_internals_ui.h
@@ -4,6 +4,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_TRANSLATE_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_TRANSLATE_INTERNALS_UI_H_ + +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The implementation for the chrome://translate-internals page.
diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc index 80fed92..0164799 100644 --- a/chrome/browser/ui/webui/uber/uber_ui.cc +++ b/chrome/browser/ui/webui/uber/uber_ui.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/uber/uber_ui.h" #include "base/stl_util.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
diff --git a/chrome/browser/ui/webui/user_actions/user_actions_ui.h b/chrome/browser/ui/webui/user_actions/user_actions_ui.h index 97c8cf9..cc25fef 100644 --- a/chrome/browser/ui/webui/user_actions/user_actions_ui.h +++ b/chrome/browser/ui/webui/user_actions/user_actions_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_USER_ACTIONS_USER_ACTIONS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_USER_ACTIONS_USER_ACTIONS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The UI for chrome://user-actions/
diff --git a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h index 284d0d27..9423ff2 100644 --- a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h +++ b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_USER_ACTIONS_USER_ACTIONS_UI_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_USER_ACTIONS_USER_ACTIONS_UI_HANDLER_H_ +#include "base/macros.h" #include "base/metrics/user_metrics.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/version_handler.cc b/chrome/browser/ui/webui/version_handler.cc index adef9f8..d97890f 100644 --- a/chrome/browser/ui/webui/version_handler.cc +++ b/chrome/browser/ui/webui/version_handler.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/version_handler.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/files/file_util.h" #include "base/metrics/field_trial.h"
diff --git a/chrome/browser/ui/webui/version_handler.h b/chrome/browser/ui/webui/version_handler.h index b7f272a..d121739 100644 --- a/chrome/browser/ui/webui/version_handler.h +++ b/chrome/browser/ui/webui/version_handler.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/version_handler_chromeos.h b/chrome/browser/ui/webui/version_handler_chromeos.h index f8977a5..b12b7a8 100644 --- a/chrome/browser/ui/webui/version_handler_chromeos.h +++ b/chrome/browser/ui/webui/version_handler_chromeos.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/version_handler.h" #include "chromeos/system/version_loader.h"
diff --git a/chrome/browser/ui/webui/version_ui.cc b/chrome/browser/ui/webui/version_ui.cc index 4fc5a9cc..f9c70a1 100644 --- a/chrome/browser/ui/webui/version_ui.cc +++ b/chrome/browser/ui/webui/version_ui.cc
@@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/strings/string_number_conversions.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/version_handler.h" #include "chrome/common/channel_info.h"
diff --git a/chrome/browser/ui/webui/version_ui.h b/chrome/browser/ui/webui/version_ui.h index 32e0de5..9de2301 100644 --- a/chrome/browser/ui/webui/version_ui.h +++ b/chrome/browser/ui/webui/version_ui.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_VERSION_UI_H_ #define CHROME_BROWSER_UI_WEBUI_VERSION_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The WebUI handler for chrome://version.
diff --git a/chrome/browser/ui/webui/voice_search_ui.cc b/chrome/browser/ui/webui/voice_search_ui.cc index 90ea550..08c27ca 100644 --- a/chrome/browser/ui/webui/voice_search_ui.cc +++ b/chrome/browser/ui/webui/voice_search_ui.cc
@@ -8,12 +8,14 @@ #include "base/command_line.h" #include "base/files/file_enumerator.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/metrics/field_trial.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/plugins/plugin_prefs.h"
diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc index 0cd677a0..e63f6d04 100644 --- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc +++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
@@ -7,6 +7,7 @@ #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/ui/webui/web_ui_test_handler.h b/chrome/browser/ui/webui/web_ui_test_handler.h index 11f3a3b..cb95c2f 100644 --- a/chrome/browser/ui/webui/web_ui_test_handler.h +++ b/chrome/browser/ui/webui/web_ui_test_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_WEB_UI_TEST_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/webui_webview_browsertest.cc b/chrome/browser/ui/webui/webui_webview_browsertest.cc index 7329d0f4..da0bf0d 100644 --- a/chrome/browser/ui/webui/webui_webview_browsertest.cc +++ b/chrome/browser/ui/webui/webui_webview_browsertest.cc
@@ -4,6 +4,7 @@ #include "base/macros.h" #include "base/path_service.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h" #include "chrome/browser/signin/signin_promo.h"
diff --git a/components/offline_pages/offline_page_metadata_store.h b/components/offline_pages/offline_page_metadata_store.h index 242b268f..0f2b444 100644 --- a/components/offline_pages/offline_page_metadata_store.h +++ b/components/offline_pages/offline_page_metadata_store.h
@@ -52,7 +52,7 @@ // Asynchronously removes offline page metadata from the store. // Result of the update is passed in callback. - virtual void RemoveOfflinePages(const std::vector<int64>& bookmark_ids, + virtual void RemoveOfflinePages(const std::vector<int64_t>& bookmark_ids, const UpdateCallback& callback) = 0; // Resets the store.
diff --git a/components/offline_pages/offline_page_metadata_store_impl.cc b/components/offline_pages/offline_page_metadata_store_impl.cc index ee2fb85..1b98fb1 100644 --- a/components/offline_pages/offline_page_metadata_store_impl.cc +++ b/components/offline_pages/offline_page_metadata_store_impl.cc
@@ -192,14 +192,14 @@ } void OfflinePageMetadataStoreImpl::RemoveOfflinePages( - const std::vector<int64>& bookmark_ids, + const std::vector<int64_t>& bookmark_ids, const UpdateCallback& callback) { scoped_ptr<ProtoDatabase<OfflinePageEntry>::KeyEntryVector> entries_to_save( new ProtoDatabase<OfflinePageEntry>::KeyEntryVector()); scoped_ptr<std::vector<std::string>> keys_to_remove( new std::vector<std::string>()); - for (int64 id : bookmark_ids) + for (int64_t id : bookmark_ids) keys_to_remove->push_back(base::Int64ToString(id)); UpdateEntries(entries_to_save.Pass(), keys_to_remove.Pass(), callback);
diff --git a/components/offline_pages/offline_page_metadata_store_impl.h b/components/offline_pages/offline_page_metadata_store_impl.h index d1e15b0..e10fc339 100644 --- a/components/offline_pages/offline_page_metadata_store_impl.h +++ b/components/offline_pages/offline_page_metadata_store_impl.h
@@ -38,7 +38,7 @@ void Load(const LoadCallback& callback) override; void AddOrUpdateOfflinePage(const OfflinePageItem& offline_page_record, const UpdateCallback& callback) override; - void RemoveOfflinePages(const std::vector<int64>& bookmark_ids, + void RemoveOfflinePages(const std::vector<int64_t>& bookmark_ids, const UpdateCallback& callback) override; void Reset(const ResetCallback& callback) override;
diff --git a/components/storage_monitor/test_media_transfer_protocol_manager_linux.cc b/components/storage_monitor/test_media_transfer_protocol_manager_linux.cc index 9e78208..addfd872 100644 --- a/components/storage_monitor/test_media_transfer_protocol_manager_linux.cc +++ b/components/storage_monitor/test_media_transfer_protocol_manager_linux.cc
@@ -51,7 +51,7 @@ void TestMediaTransferProtocolManagerLinux::CreateDirectory( const std::string& storage_handle, - const uint32 parent_id, + const uint32_t parent_id, const std::string& directory_name, const CreateDirectoryCallback& callback) { callback.Run(true /* error */); @@ -59,7 +59,7 @@ void TestMediaTransferProtocolManagerLinux::ReadDirectory( const std::string& storage_handle, - const uint32 file_id, + const uint32_t file_id, const size_t max_size, const ReadDirectoryCallback& callback) { callback.Run(std::vector<MtpFileEntry>(), @@ -69,23 +69,23 @@ void TestMediaTransferProtocolManagerLinux::ReadFileChunk( const std::string& storage_handle, - uint32 file_id, - uint32 offset, - uint32 count, + uint32_t file_id, + uint32_t offset, + uint32_t count, const ReadFileCallback& callback) { callback.Run(std::string(), true); } void TestMediaTransferProtocolManagerLinux::GetFileInfo( const std::string& storage_handle, - uint32 file_id, + uint32_t file_id, const GetFileInfoCallback& callback) { callback.Run(MtpFileEntry(), true); } void TestMediaTransferProtocolManagerLinux::RenameObject( const std::string& storage_handle, - const uint32 object_id, + const uint32_t object_id, const std::string& new_name, const RenameObjectCallback& callback) { callback.Run(true /* error */); @@ -94,7 +94,7 @@ void TestMediaTransferProtocolManagerLinux::CopyFileFromLocal( const std::string& storage_handle, const int source_file_descriptor, - const uint32 parent_id, + const uint32_t parent_id, const std::string& file_name, const CopyFileFromLocalCallback& callback) { callback.Run(true /* error */); @@ -102,7 +102,7 @@ void TestMediaTransferProtocolManagerLinux::DeleteObject( const std::string& storage_handle, - const uint32 object_id, + const uint32_t object_id, const DeleteObjectCallback& callback) { callback.Run(true /* error */); }
diff --git a/components/storage_monitor/test_media_transfer_protocol_manager_linux.h b/components/storage_monitor/test_media_transfer_protocol_manager_linux.h index 0a2bb4f8..a391639 100644 --- a/components/storage_monitor/test_media_transfer_protocol_manager_linux.h +++ b/components/storage_monitor/test_media_transfer_protocol_manager_linux.h
@@ -5,6 +5,8 @@ #ifndef COMPONENTS_STORAGE_MONITOR_TEST_MEDIA_TRANSFER_PROTOCOL_MANAGER_LINUX_H_ #define COMPONENTS_STORAGE_MONITOR_TEST_MEDIA_TRANSFER_PROTOCOL_MANAGER_LINUX_H_ +#include <stdint.h> + #include "device/media_transfer_protocol/media_transfer_protocol_manager.h" namespace storage_monitor { @@ -32,32 +34,32 @@ void CloseStorage(const std::string& storage_handle, const CloseStorageCallback& callback) override; void CreateDirectory(const std::string& storage_handle, - const uint32 parent_id, + const uint32_t parent_id, const std::string& directory_name, const CreateDirectoryCallback& callback) override; void ReadDirectory(const std::string& storage_handle, - const uint32 file_id, + const uint32_t file_id, const size_t max_size, const ReadDirectoryCallback& callback) override; void ReadFileChunk(const std::string& storage_handle, - uint32 file_id, - uint32 offset, - uint32 count, + uint32_t file_id, + uint32_t offset, + uint32_t count, const ReadFileCallback& callback) override; void GetFileInfo(const std::string& storage_handle, - uint32 file_id, + uint32_t file_id, const GetFileInfoCallback& callback) override; void RenameObject(const std::string& storage_handle, - const uint32 object_id, + const uint32_t object_id, const std::string& new_name, const RenameObjectCallback& callback) override; void CopyFileFromLocal(const std::string& storage_handle, const int source_file_descriptor, - const uint32 parent_id, + const uint32_t parent_id, const std::string& file_name, const CopyFileFromLocalCallback& callback) override; void DeleteObject(const std::string& storage_handle, - const uint32 object_id, + const uint32_t object_id, const DeleteObjectCallback& callback) override; DISALLOW_COPY_AND_ASSIGN(TestMediaTransferProtocolManagerLinux);
diff --git a/content/browser/android/background_sync_network_observer_android.h b/content/browser/android/background_sync_network_observer_android.h index 14c09f1..1c1a46e 100644 --- a/content/browser/android/background_sync_network_observer_android.h +++ b/content/browser/android/background_sync_network_observer_android.h
@@ -7,6 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/browser/background_sync/background_sync_network_observer.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc index 4805d962..5d8a3e9 100644 --- a/content/browser/android/browser_jni_registrar.cc +++ b/content/browser/android/browser_jni_registrar.cc
@@ -6,6 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" +#include "base/macros.h" #include "content/browser/android/browser_startup_controller.h" #include "content/browser/android/child_process_launcher_android.h" #include "content/browser/android/content_video_view.h"
diff --git a/content/browser/android/browser_surface_texture_manager.h b/content/browser/android/browser_surface_texture_manager.h index 79a814a9..f9fb74c 100644 --- a/content/browser/android/browser_surface_texture_manager.h +++ b/content/browser/android/browser_surface_texture_manager.h
@@ -7,6 +7,7 @@ #include "content/common/android/surface_texture_manager.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "content/common/android/surface_texture_peer.h" #include "content/common/content_export.h"
diff --git a/content/browser/android/child_process_launcher_android.cc b/content/browser/android/child_process_launcher_android.cc index a29e615..6faab5a 100644 --- a/content/browser/android/child_process_launcher_android.cc +++ b/content/browser/android/child_process_launcher_android.cc
@@ -4,6 +4,9 @@ #include "content/browser/android/child_process_launcher_android.h" +#include <stddef.h> +#include <stdint.h> + #include "base/android/context_utils.h" #include "base/android/jni_android.h" #include "base/android/jni_array.h" @@ -129,8 +132,8 @@ PCHECK(0 <= fd); int id = files_to_register->GetIDAt(i); bool auto_close = files_to_register->OwnsFD(fd); - int64 offset = 0L; - int64 size = 0L; + int64_t offset = 0L; + int64_t size = 0L; auto found_region_iter = regions.find(id); if (found_region_iter != regions.end()) { offset = found_region_iter->second.offset;
diff --git a/content/browser/android/composited_touch_handle_drawable.cc b/content/browser/android/composited_touch_handle_drawable.cc index 3b759923..235e2eef 100644 --- a/content/browser/android/composited_touch_handle_drawable.cc +++ b/content/browser/android/composited_touch_handle_drawable.cc
@@ -7,6 +7,7 @@ #include "base/android/context_utils.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/trace_event/trace_event.h" #include "cc/layers/ui_resource_layer.h" #include "content/public/browser/android/compositor.h"
diff --git a/content/browser/android/composited_touch_handle_drawable.h b/content/browser/android/composited_touch_handle_drawable.h index ccec3e1c..29324da 100644 --- a/content/browser/android/composited_touch_handle_drawable.h +++ b/content/browser/android/composited_touch_handle_drawable.h
@@ -8,6 +8,7 @@ #include "ui/touch_selection/touch_handle.h" #include "base/android/jni_android.h" +#include "base/macros.h" #include "cc/layers/ui_resource_layer.h" namespace content {
diff --git a/content/browser/android/content_protocol_handler_impl.h b/content/browser/android/content_protocol_handler_impl.h index f593a84..f5069fd 100644 --- a/content/browser/android/content_protocol_handler_impl.h +++ b/content/browser/android/content_protocol_handler_impl.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_ANDROID_CONTENT_PROTOCOL_HANDLER_IMPL_H_ #define CONTENT_BROWSER_ANDROID_CONTENT_PROTOCOL_HANDLER_IMPL_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/browser/android/content_protocol_handler.h"
diff --git a/content/browser/android/content_video_view.h b/content/browser/android/content_video_view.h index 467d2c19..7959cd6 100644 --- a/content/browser/android/content_video_view.h +++ b/content/browser/android/content_video_view.h
@@ -9,7 +9,7 @@ #include "base/android/jni_weak_ref.h" #include "base/android/scoped_java_ref.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index 0f2bdc9..965c21e9 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc
@@ -4,12 +4,15 @@ #include "content/browser/android/content_view_core_impl.h" +#include <stddef.h> + #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" @@ -984,8 +987,10 @@ return true; } -WebGestureEvent ContentViewCoreImpl::MakeGestureEvent( - WebInputEvent::Type type, int64 time_ms, float x, float y) const { +WebGestureEvent ContentViewCoreImpl::MakeGestureEvent(WebInputEvent::Type type, + int64_t time_ms, + float x, + float y) const { return WebGestureEventBuilder::Build( type, time_ms / 1000.0, x / dpi_scale(), y / dpi_scale()); }
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h index 160ed85..2e0b226 100644 --- a/content/browser/android/content_view_core_impl.h +++ b/content/browser/android/content_view_core_impl.h
@@ -5,12 +5,15 @@ #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ +#include <stdint.h> + #include <vector> #include "base/android/jni_android.h" #include "base/android/jni_weak_ref.h" #include "base/compiler_specific.h" #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/process/process.h" #include "content/browser/renderer_host/render_widget_host_view_android.h" @@ -411,8 +414,10 @@ RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid() const; - blink::WebGestureEvent MakeGestureEvent( - blink::WebInputEvent::Type type, int64 time_ms, float x, float y) const; + blink::WebGestureEvent MakeGestureEvent(blink::WebInputEvent::Type type, + int64_t time_ms, + float x, + float y) const; gfx::Size GetViewportSizePix() const; int GetTopControlsHeightPix() const;
diff --git a/content/browser/android/content_view_render_view.h b/content/browser/android/content_view_render_view.h index 9bf846c..c571de0f 100644 --- a/content/browser/android/content_view_render_view.h +++ b/content/browser/android/content_view_render_view.h
@@ -7,6 +7,7 @@ #include "base/android/jni_weak_ref.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/android/compositor_client.h"
diff --git a/content/browser/android/content_view_statics.cc b/content/browser/android/content_view_statics.cc index e34ccf87..f5e7267 100644 --- a/content/browser/android/content_view_statics.cc +++ b/content/browser/android/content_view_statics.cc
@@ -8,7 +8,6 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/basictypes.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "content/browser/android/content_view_statics.h"
diff --git a/content/browser/android/date_time_chooser_android.cc b/content/browser/android/date_time_chooser_android.cc index 4f38402a..35d7038 100644 --- a/content/browser/android/date_time_chooser_android.cc +++ b/content/browser/android/date_time_chooser_android.cc
@@ -4,6 +4,8 @@ #include "content/browser/android/date_time_chooser_android.h" +#include <stddef.h> + #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/i18n/char_iterator.h"
diff --git a/content/browser/android/date_time_chooser_android.h b/content/browser/android/date_time_chooser_android.h index ee527ab..05a8bdd3 100644 --- a/content/browser/android/date_time_chooser_android.h +++ b/content/browser/android/date_time_chooser_android.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/android/jni_weak_ref.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/ime/text_input_type.h" #include "ui/gfx/native_widget_types.h"
diff --git a/content/browser/android/deferred_download_observer.h b/content/browser/android/deferred_download_observer.h index f1df3178..0c11db8 100644 --- a/content/browser/android/deferred_download_observer.h +++ b/content/browser/android/deferred_download_observer.h
@@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "content/public/browser/web_contents_observer.h" namespace content {
diff --git a/content/browser/android/download_controller_android_impl.h b/content/browser/android/download_controller_android_impl.h index 76c1dda..36c108e3 100644 --- a/content/browser/android/download_controller_android_impl.h +++ b/content/browser/android/download_controller_android_impl.h
@@ -21,9 +21,12 @@ #include <string> +#include <stdint.h> + #include "base/android/jni_weak_ref.h" #include "base/android/scoped_java_ref.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/memory/singleton.h" #include "content/public/browser/android/download_controller_android.h" @@ -70,7 +73,7 @@ GURL url; // The original URL before any redirection by the server for this URL. GURL original_url; - int64 total_bytes; + int64_t total_bytes; std::string content_disposition; std::string original_mime_type; std::string user_agent;
diff --git a/content/browser/android/in_process/context_provider_in_process.cc b/content/browser/android/in_process/context_provider_in_process.cc index cd9bd7d2..b7ac81f 100644 --- a/content/browser/android/in_process/context_provider_in_process.cc +++ b/content/browser/android/in_process/context_provider_in_process.cc
@@ -4,6 +4,8 @@ #include "content/browser/android/in_process/context_provider_in_process.h" +#include <stddef.h> + #include "base/bind.h" #include "base/callback_helpers.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/android/in_process/context_provider_in_process.h b/content/browser/android/in_process/context_provider_in_process.h index 81726d6..fe24f94 100644 --- a/content/browser/android/in_process/context_provider_in_process.h +++ b/content/browser/android/in_process/context_provider_in_process.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_CONTEXT_PROVIDER_IN_PROCESS_H_ #define CONTENT_BROWSER_ANDROID_IN_PROCESS_CONTEXT_PROVIDER_IN_PROCESS_H_ +#include <stdint.h> + #include <string> #include "base/macros.h"
diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc index 7f5808da..d70dce44 100644 --- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc +++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
@@ -4,7 +4,10 @@ #include "content/browser/android/in_process/synchronous_compositor_factory_impl.h" +#include <stdint.h> + #include "base/command_line.h" +#include "base/macros.h" #include "base/observer_list.h" #include "base/sys_info.h" #include "base/thread_task_runner_handle.h" @@ -94,11 +97,11 @@ } scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture( - uint32 stream_id) override { + uint32_t stream_id) override { return gl_in_process_context_->GetSurfaceTexture(stream_id); } - uint32 CreateStreamTexture(uint32 texture_id) override { + uint32_t CreateStreamTexture(uint32_t texture_id) override { return gl_in_process_context_->CreateStreamTexture(texture_id); }
diff --git a/content/browser/android/in_process/synchronous_compositor_impl.h b/content/browser/android/in_process/synchronous_compositor_impl.h index a5093cf..f0a3d82 100644 --- a/content/browser/android/in_process/synchronous_compositor_impl.h +++ b/content/browser/android/in_process/synchronous_compositor_impl.h
@@ -5,10 +5,12 @@ #ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_ #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_ +#include <stddef.h> + #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/browser/android/synchronous_compositor_base.h" #include "content/renderer/android/synchronous_compositor_external_begin_frame_source.h"
diff --git a/content/browser/android/in_process/synchronous_compositor_registry_in_proc.h b/content/browser/android/in_process/synchronous_compositor_registry_in_proc.h index c475f97..1de2002 100644 --- a/content/browser/android/in_process/synchronous_compositor_registry_in_proc.h +++ b/content/browser/android/in_process/synchronous_compositor_registry_in_proc.h
@@ -7,6 +7,7 @@ #include "base/containers/hash_tables.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "content/renderer/android/synchronous_compositor_registry.h" #include "ui/events/blink/synchronous_input_handler_proxy.h"
diff --git a/content/browser/android/in_process/synchronous_input_event_filter.h b/content/browser/android/in_process/synchronous_input_event_filter.h index 90e581c..98375d7 100644 --- a/content/browser/android/in_process/synchronous_input_event_filter.h +++ b/content/browser/android/in_process/synchronous_input_event_filter.h
@@ -5,7 +5,6 @@ #ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_INPUT_EVENT_FILTER_H_ #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_INPUT_EVENT_FILTER_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "content/common/input/input_event_ack_state.h"
diff --git a/content/browser/android/in_process_surface_texture_manager.h b/content/browser/android/in_process_surface_texture_manager.h index 6b02c8b..24e951c 100644 --- a/content/browser/android/in_process_surface_texture_manager.h +++ b/content/browser/android/in_process_surface_texture_manager.h
@@ -8,6 +8,7 @@ #include "content/common/android/surface_texture_manager.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/synchronization/lock.h"
diff --git a/content/browser/android/interstitial_page_delegate_android.h b/content/browser/android/interstitial_page_delegate_android.h index 69816b6..dcc92ce9 100644 --- a/content/browser/android/interstitial_page_delegate_android.h +++ b/content/browser/android/interstitial_page_delegate_android.h
@@ -9,8 +9,8 @@ #include <string> #include "base/android/jni_weak_ref.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "content/public/browser/interstitial_page_delegate.h"
diff --git a/content/browser/android/java/gin_java_bound_object.cc b/content/browser/android/java/gin_java_bound_object.cc index 527fcef..d281f89 100644 --- a/content/browser/android/java/gin_java_bound_object.cc +++ b/content/browser/android/java/gin_java_bound_object.cc
@@ -42,8 +42,8 @@ GinJavaBoundObject* GinJavaBoundObject::CreateTransient( const JavaObjectWeakGlobalRef& ref, const base::android::JavaRef<jclass>& safe_annotation_clazz, - int32 holder) { - std::set<int32> holders; + int32_t holder) { + std::set<int32_t> holders; holders.insert(holder); return new GinJavaBoundObject(ref, safe_annotation_clazz, holders); } @@ -61,14 +61,13 @@ GinJavaBoundObject::GinJavaBoundObject( const JavaObjectWeakGlobalRef& ref, const base::android::JavaRef<jclass>& safe_annotation_clazz, - const std::set<int32>& holders) + const std::set<int32_t>& holders) : ref_(ref), names_count_(0), holders_(holders), object_get_class_method_id_(NULL), are_methods_set_up_(false), - safe_annotation_clazz_(safe_annotation_clazz) { -} + safe_annotation_clazz_(safe_annotation_clazz) {} GinJavaBoundObject::~GinJavaBoundObject() { }
diff --git a/content/browser/android/java/gin_java_bound_object.h b/content/browser/android/java/gin_java_bound_object.h index cd3a04d..735e14a7 100644 --- a/content/browser/android/java/gin_java_bound_object.h +++ b/content/browser/android/java/gin_java_bound_object.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BOUND_OBJECT_H_ #define CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BOUND_OBJECT_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <set> @@ -20,7 +23,7 @@ class GinJavaBoundObject : public base::RefCountedThreadSafe<GinJavaBoundObject> { public: - typedef int32 ObjectID; + typedef int32_t ObjectID; static GinJavaBoundObject* CreateNamed( const JavaObjectWeakGlobalRef& ref, @@ -28,7 +31,7 @@ static GinJavaBoundObject* CreateTransient( const JavaObjectWeakGlobalRef& ref, const base::android::JavaRef<jclass>& safe_annotation_clazz, - int32 holder); + int32_t holder); // The following methods can be called on any thread. JavaObjectWeakGlobalRef& GetWeakRef() { return ref_; } @@ -42,8 +45,8 @@ // The following methods are called on the background thread. bool HasHolders() { return !holders_.empty(); } - void AddHolder(int32 holder) { holders_.insert(holder); } - void RemoveHolder(int32 holder) { holders_.erase(holder); } + void AddHolder(int32_t holder) { holders_.insert(holder); } + void RemoveHolder(int32_t holder) { holders_.erase(holder); } std::set<std::string> GetMethodNames(); bool HasMethod(const std::string& method_name); @@ -62,7 +65,7 @@ GinJavaBoundObject( const JavaObjectWeakGlobalRef& ref, const base::android::JavaRef<jclass>& safe_annotation_clazz, - const std::set<int32>& holders); + const std::set<int32_t>& holders); ~GinJavaBoundObject(); // The following methods are called on the background thread. @@ -73,7 +76,7 @@ // An object must be kept in retained_object_set_ either if it has // names or if it has a non-empty holders set. int names_count_; - std::set<int32> holders_; + std::set<int32_t> holders_; // The following fields are accessed on the background thread. typedef std::multimap<std::string, linked_ptr<JavaMethod> > JavaMethodMap;
diff --git a/content/browser/android/java/gin_java_bound_object_delegate.h b/content/browser/android/java/gin_java_bound_object_delegate.h index cdee8a6..f4a9c2ae 100644 --- a/content/browser/android/java/gin_java_bound_object_delegate.h +++ b/content/browser/android/java/gin_java_bound_object_delegate.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BOUND_OBJECT_DELEGATE_H_ #define CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BOUND_OBJECT_DELEGATE_H_ +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/browser/android/java/gin_java_bound_object.h" #include "content/browser/android/java/gin_java_method_invocation_helper.h"
diff --git a/content/browser/android/java/gin_java_bridge_dispatcher_host.cc b/content/browser/android/java/gin_java_bridge_dispatcher_host.cc index 0a08896..5063273 100644 --- a/content/browser/android/java/gin_java_bridge_dispatcher_host.cc +++ b/content/browser/android/java/gin_java_bridge_dispatcher_host.cc
@@ -6,6 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" +#include "build/build_config.h" #include "content/browser/android/java/gin_java_bound_object_delegate.h" #include "content/browser/android/java/gin_java_bridge_message_filter.h" #include "content/browser/android/java/java_bridge_thread.h" @@ -83,7 +84,7 @@ const base::android::JavaRef<jobject>& object, const base::android::JavaRef<jclass>& safe_annotation_clazz, bool is_named, - int32 holder) { + int32_t holder) { // Can be called on any thread. Calls come from the UI thread via // AddNamedObject, and from the background thread, when injected Java // object's method returns a Java object. @@ -143,7 +144,7 @@ JavaObjectWeakGlobalRef GinJavaBridgeDispatcherHost::RemoveHolderAndAdvanceLocked( - int32 holder, + int32_t holder, ObjectMap::iterator* iter_ptr) { objects_lock_.AssertAcquired(); JavaObjectWeakGlobalRef result;
diff --git a/content/browser/android/java/gin_java_bridge_dispatcher_host.h b/content/browser/android/java/gin_java_bridge_dispatcher_host.h index f17fd50ae..207d339 100644 --- a/content/browser/android/java/gin_java_bridge_dispatcher_host.h +++ b/content/browser/android/java/gin_java_bridge_dispatcher_host.h
@@ -5,11 +5,14 @@ #ifndef CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_ #define CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_ +#include <stdint.h> + #include <map> #include <set> #include "base/android/jni_weak_ref.h" #include "base/android/scoped_java_ref.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "content/browser/android/java/gin_java_bound_object.h" @@ -83,14 +86,14 @@ const base::android::JavaRef<jobject>& object, const base::android::JavaRef<jclass>& safe_annotation_clazz, bool is_named, - int32 holder); + int32_t holder); scoped_refptr<GinJavaBoundObject> FindObject( GinJavaBoundObject::ObjectID object_id); bool FindObjectId(const base::android::JavaRef<jobject>& object, GinJavaBoundObject::ObjectID* object_id); void RemoveFromRetainedObjectSetLocked(const JavaObjectWeakGlobalRef& ref); JavaObjectWeakGlobalRef RemoveHolderAndAdvanceLocked( - int32 holder, + int32_t holder, ObjectMap::iterator* iter_ptr); // The following objects are used only on the UI thread.
diff --git a/content/browser/android/java/gin_java_bridge_message_filter.cc b/content/browser/android/java/gin_java_bridge_message_filter.cc index ae7ad9a0..f348f9f 100644 --- a/content/browser/android/java/gin_java_bridge_message_filter.cc +++ b/content/browser/android/java/gin_java_bridge_message_filter.cc
@@ -5,6 +5,7 @@ #include "content/browser/android/java/gin_java_bridge_message_filter.h" #include "base/auto_reset.h" +#include "build/build_config.h" #include "content/browser/android/java/gin_java_bridge_dispatcher_host.h" #include "content/browser/android/java/java_bridge_thread.h" #include "content/common/gin_java_bridge_messages.h" @@ -43,7 +44,8 @@ bool GinJavaBridgeMessageFilter::OnMessageReceived( const IPC::Message& message) { DCHECK(JavaBridgeThread::CurrentlyOn()); - base::AutoReset<int32> routing_id(¤t_routing_id_, message.routing_id()); + base::AutoReset<int32_t> routing_id(¤t_routing_id_, + message.routing_id()); bool handled = true; IPC_BEGIN_MESSAGE_MAP(GinJavaBridgeMessageFilter, message) IPC_MESSAGE_HANDLER(GinJavaBridgeHostMsg_GetMethods, OnGetMethods)
diff --git a/content/browser/android/java/gin_java_bridge_message_filter.h b/content/browser/android/java/gin_java_bridge_message_filter.h index 6309632..40165a8 100644 --- a/content/browser/android/java/gin_java_bridge_message_filter.h +++ b/content/browser/android/java/gin_java_bridge_message_filter.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BRIDGE_MESSAGE_FILTER_H_ #define CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BRIDGE_MESSAGE_FILTER_H_ +#include <stdint.h> + #include <map> #include <set> @@ -59,7 +61,7 @@ // 2. As RenderFrames pass away earlier than JavaScript wrappers, // messages from the latter can arrive after the RenderFrame has been // removed from the WebContents' routing table. - typedef std::map<int32, GinJavaBridgeDispatcherHost*> HostMap; + typedef std::map<int32_t, GinJavaBridgeDispatcherHost*> HostMap; GinJavaBridgeMessageFilter(); ~GinJavaBridgeMessageFilter() override; @@ -84,7 +86,7 @@ // The routing id of the RenderFrameHost whose request we are processing. // Used on the background thread. - int32 current_routing_id_; + int32_t current_routing_id_; }; } // namespace content
diff --git a/content/browser/android/java/gin_java_method_invocation_helper.h b/content/browser/android/java/gin_java_method_invocation_helper.h index f7bdd577..d23eb734 100644 --- a/content/browser/android/java/gin_java_method_invocation_helper.h +++ b/content/browser/android/java/gin_java_method_invocation_helper.h
@@ -5,10 +5,13 @@ #ifndef CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_METHOD_INVOCATION_HELPER_H_ #define CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_METHOD_INVOCATION_HELPER_H_ +#include <stddef.h> + #include <map> #include "base/android/jni_weak_ref.h" #include "base/android/scoped_java_ref.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/values.h" #include "content/browser/android/java/gin_java_bound_object.h"
diff --git a/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc b/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc index 4044629..395df88f 100644 --- a/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc +++ b/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc
@@ -4,7 +4,10 @@ #include "content/browser/android/java/gin_java_method_invocation_helper.h" +#include <stddef.h> + #include "base/android/jni_android.h" +#include "base/macros.h" #include "content/browser/android/java/jni_helper.h" #include "content/common/android/gin_java_bridge_value.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/android/java/java_bridge_thread.cc b/content/browser/android/java/java_bridge_thread.cc index a221527..6c69bc0 100644 --- a/content/browser/android/java/java_bridge_thread.cc +++ b/content/browser/android/java/java_bridge_thread.cc
@@ -7,6 +7,7 @@ #include "base/lazy_instance.h" #include "base/message_loop/message_loop.h" #include "base/task_runner_util.h" +#include "build/build_config.h" #if !defined(OS_ANDROID) #error "JavaBridge only supports OS_ANDROID"
diff --git a/content/browser/android/java/java_method.h b/content/browser/android/java/java_method.h index b5ba26a6..333d403 100644 --- a/content/browser/android/java/java_method.h +++ b/content/browser/android/java/java_method.h
@@ -6,10 +6,12 @@ #define CONTENT_BROWSER_ANDROID_JAVA_JAVA_METHOD_H_ #include <jni.h> +#include <stddef.h> #include <string> #include <vector> #include "base/android/scoped_java_ref.h" +#include "base/macros.h" #include "content/browser/android/java/java_type.h" #include "content/common/content_export.h"
diff --git a/content/browser/android/java/java_type_unittest.cc b/content/browser/android/java/java_type_unittest.cc index 484b3eb..c55d7167 100644 --- a/content/browser/android/java/java_type_unittest.cc +++ b/content/browser/android/java/java_type_unittest.cc
@@ -4,6 +4,8 @@ #include "content/browser/android/java/java_type.h" +#include <stddef.h> + #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/android/overscroll_controller_android.h b/content/browser/android/overscroll_controller_android.h index c5ed854..73c1b76 100644 --- a/content/browser/android/overscroll_controller_android.h +++ b/content/browser/android/overscroll_controller_android.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_ #define CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_ +#include "base/macros.h" #include "base/time/time.h" #include "content/common/input/input_event_ack_state.h" #include "ui/android/overscroll_glow.h"
diff --git a/content/browser/android/popup_touch_handle_drawable.h b/content/browser/android/popup_touch_handle_drawable.h index 82cb3e0..316de0e 100644 --- a/content/browser/android/popup_touch_handle_drawable.h +++ b/content/browser/android/popup_touch_handle_drawable.h
@@ -9,6 +9,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_weak_ref.h" +#include "base/macros.h" namespace content {
diff --git a/content/browser/android/synchronous_compositor_host.h b/content/browser/android/synchronous_compositor_host.h index d2001b1..ecb4c89 100644 --- a/content/browser/android/synchronous_compositor_host.h +++ b/content/browser/android/synchronous_compositor_host.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_BROWSER_ANDROID_SYNCHRONOUS_COMPOSITOR_HOST_H_ #define CONTENT_BROWSER_ANDROID_SYNCHRONOUS_COMPOSITOR_HOST_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h"
diff --git a/content/browser/android/tracing_controller_android.h b/content/browser/android/tracing_controller_android.h index 09f1648..77f6144f 100644 --- a/content/browser/android/tracing_controller_android.h +++ b/content/browser/android/tracing_controller_android.h
@@ -9,6 +9,7 @@ #include "base/android/jni_weak_ref.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" namespace content {
diff --git a/content/browser/android/url_request_content_job.cc b/content/browser/android/url_request_content_job.cc index 1bcbf210..baf9483f 100644 --- a/content/browser/android/url_request_content_job.cc +++ b/content/browser/android/url_request_content_job.cc
@@ -184,7 +184,7 @@ } } -void URLRequestContentJob::DidSeek(int64 result) { +void URLRequestContentJob::DidSeek(int64_t result) { if (result != byte_range_.first_byte_position()) { NotifyStartError(net::URLRequestStatus( net::URLRequestStatus::FAILED, net::ERR_REQUEST_RANGE_NOT_SATISFIABLE));
diff --git a/content/browser/android/url_request_content_job.h b/content/browser/android/url_request_content_job.h index dad9fbfc..9858eba3 100644 --- a/content/browser/android/url_request_content_job.h +++ b/content/browser/android/url_request_content_job.h
@@ -5,10 +5,13 @@ #ifndef CONTENT_BROWSER_ANDROID_URL_REQUEST_CONTENT_JOB_H_ #define CONTENT_BROWSER_ANDROID_URL_REQUEST_CONTENT_JOB_H_ +#include <stdint.h> + #include <string> #include <vector> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" @@ -60,7 +63,7 @@ // Flag showing whether the content URI exists. bool content_exists; // Size of the content URI. - int64 content_size; + int64_t content_size; // Mime type associated with the content URI. std::string mime_type; }; @@ -77,7 +80,7 @@ // Callback after seeking to the beginning of |byte_range_| in the content URI // on a background thread. - void DidSeek(int64 result); + void DidSeek(int64_t result); // Callback after data is asynchronously read from the content URI into |buf|. void DidRead(int result); @@ -91,7 +94,7 @@ net::HttpByteRange byte_range_; net::Error range_parse_result_; - int64 remaining_bytes_; + int64_t remaining_bytes_; bool io_pending_;
diff --git a/content/browser/android/url_request_content_job_unittest.cc b/content/browser/android/url_request_content_job_unittest.cc index 288914a5..124b24a 100644 --- a/content/browser/android/url_request_content_job_unittest.cc +++ b/content/browser/android/url_request_content_job_unittest.cc
@@ -4,6 +4,8 @@ #include "content/browser/android/url_request_content_job.h" +#include <stdint.h> + #include <algorithm> #include "base/files/file_util.h" @@ -141,7 +143,7 @@ base::FilePath path = base::InsertImageIntoMediaStore(image_file); EXPECT_TRUE(path.IsContentUri()); EXPECT_TRUE(base::PathExists(path)); - int64 file_size; + int64_t file_size; EXPECT_TRUE(base::GetFileSize(path, &file_size)); EXPECT_LT(0, file_size); CallbacksJobFactory factory(path, &observer_);
diff --git a/content/browser/android/web_contents_observer_proxy.h b/content/browser/android/web_contents_observer_proxy.h index 4c61bb2..23464053 100644 --- a/content/browser/android/web_contents_observer_proxy.h +++ b/content/browser/android/web_contents_observer_proxy.h
@@ -8,7 +8,7 @@ #include <jni.h> #include "base/android/jni_weak_ref.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/process/kill.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/content/browser/media/android/browser_demuxer_android.cc b/content/browser/media/android/browser_demuxer_android.cc index 997b4318..9da7170 100644 --- a/content/browser/media/android/browser_demuxer_android.cc +++ b/content/browser/media/android/browser_demuxer_android.cc
@@ -4,6 +4,7 @@ #include "content/browser/media/android/browser_demuxer_android.h" +#include "base/macros.h" #include "content/common/media/media_player_messages_android.h" #include "media/base/android/media_task_runner.h" #include "media/base/media_switches.h"
diff --git a/content/browser/media/android/browser_demuxer_android.h b/content/browser/media/android/browser_demuxer_android.h index 71ebd7f3..f1b28d3 100644 --- a/content/browser/media/android/browser_demuxer_android.h +++ b/content/browser/media/android/browser_demuxer_android.h
@@ -8,6 +8,7 @@ #include <map> #include "base/id_map.h" +#include "base/macros.h" #include "content/public/browser/browser_message_filter.h" #include "media/base/android/demuxer_android.h"
diff --git a/content/browser/media/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h index 4a2ff0b..061878bd 100644 --- a/content/browser/media/android/browser_media_player_manager.h +++ b/content/browser/media/android/browser_media_player_manager.h
@@ -7,8 +7,8 @@ #include <map> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/time/time.h"
diff --git a/content/browser/media/android/browser_media_session_manager.h b/content/browser/media/android/browser_media_session_manager.h index c03bf1b..3b07b295 100644 --- a/content/browser/media/android/browser_media_session_manager.h +++ b/content/browser/media/android/browser_media_session_manager.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_SESSION_MANAGER_H_ #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_SESSION_MANAGER_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace IPC { class Message;
diff --git a/content/browser/media/android/media_resource_getter_impl.cc b/content/browser/media/android/media_resource_getter_impl.cc index 69200e2..e0d6aff 100644 --- a/content/browser/media/android/media_resource_getter_impl.cc +++ b/content/browser/media/android/media_resource_getter_impl.cc
@@ -8,6 +8,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/bind.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/threading/sequenced_worker_pool.h" #include "content/browser/child_process_security_policy_impl.h" @@ -135,7 +136,9 @@ // Gets the metadata from a file descriptor. When finished, a task is posted to // the UI thread to run the callback function. static void GetMediaMetadataFromFd( - const int fd, const int64 offset, const int64 size, + const int fd, + const int64_t offset, + const int64_t size, const media::MediaResourceGetter::ExtractMediaMetadataCB& callback) { JNIEnv* env = base::android::AttachCurrentThread(); @@ -365,7 +368,9 @@ } void MediaResourceGetterImpl::ExtractMediaMetadata( - const int fd, const int64 offset, const int64 size, + const int fd, + const int64_t offset, + const int64_t size, const ExtractMediaMetadataCB& callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
diff --git a/content/browser/media/android/media_resource_getter_impl.h b/content/browser/media/android/media_resource_getter_impl.h index 9a55fcb7..bedf440 100644 --- a/content/browser/media/android/media_resource_getter_impl.h +++ b/content/browser/media/android/media_resource_getter_impl.h
@@ -6,8 +6,10 @@ #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_RESOURCE_GETTER_IMPL_H_ #include <jni.h> +#include <stdint.h> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/waitable_event.h" @@ -56,8 +58,8 @@ const std::string& user_agent, const ExtractMediaMetadataCB& callback) override; void ExtractMediaMetadata(const int fd, - const int64 offset, - const int64 size, + const int64_t offset, + const int64_t size, const ExtractMediaMetadataCB& callback) override; static bool RegisterMediaResourceGetter(JNIEnv* env);
diff --git a/content/browser/media/android/media_session.h b/content/browser/media/android/media_session.h index a36a954..234ed245 100644 --- a/content/browser/media/android/media_session.h +++ b/content/browser/media/android/media_session.h
@@ -6,9 +6,11 @@ #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_SESSION_H_ #include <jni.h> +#include <stddef.h> #include "base/android/scoped_java_ref.h" #include "base/id_map.h" +#include "base/macros.h" #include "content/browser/media/android/media_session_uma_helper.h" #include "content/common/content_export.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/content/browser/media/android/media_session_browsertest.cc b/content/browser/media/android/media_session_browsertest.cc index dbf9bfe9..98b652a 100644 --- a/content/browser/media/android/media_session_browsertest.cc +++ b/content/browser/media/android/media_session_browsertest.cc
@@ -4,9 +4,12 @@ #include "content/browser/media/android/media_session.h" +#include <stddef.h> + #include <list> #include <vector> +#include "base/macros.h" #include "base/metrics/histogram_samples.h" #include "base/test/histogram_tester.h" #include "base/test/simple_test_clock.h"
diff --git a/content/browser/media/android/media_throttler.h b/content/browser/media/android/media_throttler.h index 002dcd77..ade0b89 100644 --- a/content/browser/media/android/media_throttler.h +++ b/content/browser/media/android/media_throttler.h
@@ -8,6 +8,7 @@ #include <jni.h> #include "base/android/scoped_java_ref.h" +#include "base/macros.h" #include "base/memory/singleton.h" namespace content {
diff --git a/content/browser/media/audio_stream_monitor.h b/content/browser/media/audio_stream_monitor.h index 7756d3ef..0eb51475 100644 --- a/content/browser/media/audio_stream_monitor.h +++ b/content/browser/media/audio_stream_monitor.h
@@ -9,6 +9,7 @@ #include <utility> #include "base/callback_forward.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "base/time/default_tick_clock.h" #include "base/time/time.h"
diff --git a/content/browser/media/audio_stream_monitor_unittest.cc b/content/browser/media/audio_stream_monitor_unittest.cc index f3189af..d9999bf 100644 --- a/content/browser/media/audio_stream_monitor_unittest.cc +++ b/content/browser/media/audio_stream_monitor_unittest.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/simple_test_tick_clock.h" #include "content/browser/web_contents/web_contents_impl.h"
diff --git a/content/browser/media/capture/audio_mirroring_manager.h b/content/browser/media/capture/audio_mirroring_manager.h index 441c884..4e44699 100644 --- a/content/browser/media/capture/audio_mirroring_manager.h +++ b/content/browser/media/capture/audio_mirroring_manager.h
@@ -36,8 +36,8 @@ #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "content/common/content_export.h" #include "media/audio/audio_source_diverter.h"
diff --git a/content/browser/media/capture/audio_mirroring_manager_unittest.cc b/content/browser/media/capture/audio_mirroring_manager_unittest.cc index 6fece29..0f471c88 100644 --- a/content/browser/media/capture/audio_mirroring_manager_unittest.cc +++ b/content/browser/media/capture/audio_mirroring_manager_unittest.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/synchronization/waitable_event.h" #include "content/browser/browser_thread_impl.h"
diff --git a/content/browser/media/capture/aura_window_capture_machine.h b/content/browser/media/capture/aura_window_capture_machine.h index 8407e94..c07c72f 100644 --- a/content/browser/media/capture/aura_window_capture_machine.h +++ b/content/browser/media/capture/aura_window_capture_machine.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_MEDIA_CAPTURE_AURA_WINDOW_CAPTURE_MACHINE_H_ #define CONTENT_BROWSER_MEDIA_CAPTURE_AURA_WINDOW_CAPTURE_MACHINE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h"
diff --git a/content/browser/media/capture/cursor_renderer_aura.cc b/content/browser/media/capture/cursor_renderer_aura.cc index a2b4e1b06..238ed9a1 100644 --- a/content/browser/media/capture/cursor_renderer_aura.cc +++ b/content/browser/media/capture/cursor_renderer_aura.cc
@@ -4,6 +4,8 @@ #include "content/browser/media/capture/cursor_renderer_aura.h" +#include <stdint.h> + #include <algorithm> #include <cmath> @@ -158,12 +160,12 @@ scaled_cursor_bitmap_.lockPixels(); for (int y = rect.y(); y < rect.bottom(); ++y) { int cursor_y = y - cursor_position_in_frame_.y(); - uint8* yplane = target->data(media::VideoFrame::kYPlane) + - y * target->row_bytes(media::VideoFrame::kYPlane); - uint8* uplane = target->data(media::VideoFrame::kUPlane) + - (y / 2) * target->row_bytes(media::VideoFrame::kUPlane); - uint8* vplane = target->data(media::VideoFrame::kVPlane) + - (y / 2) * target->row_bytes(media::VideoFrame::kVPlane); + uint8_t* yplane = target->data(media::VideoFrame::kYPlane) + + y * target->row_bytes(media::VideoFrame::kYPlane); + uint8_t* uplane = target->data(media::VideoFrame::kUPlane) + + (y / 2) * target->row_bytes(media::VideoFrame::kUPlane); + uint8_t* vplane = target->data(media::VideoFrame::kVPlane) + + (y / 2) * target->row_bytes(media::VideoFrame::kVPlane); for (int x = rect.x(); x < rect.right(); ++x) { int cursor_x = x - cursor_position_in_frame_.x(); SkColor color = scaled_cursor_bitmap_.getColor(cursor_x, cursor_y);
diff --git a/content/browser/media/capture/cursor_renderer_aura_unittest.cc b/content/browser/media/capture/cursor_renderer_aura_unittest.cc index 813c8ba..bb210b9 100644 --- a/content/browser/media/capture/cursor_renderer_aura_unittest.cc +++ b/content/browser/media/capture/cursor_renderer_aura_unittest.cc
@@ -4,6 +4,8 @@ #include "content/browser/media/capture/cursor_renderer_aura.h" +#include <stdint.h> + #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" @@ -104,12 +106,12 @@ gfx::Rect rect) { bool y_found = false, u_found = false, v_found = false; for (int y = rect.y(); y < rect.bottom(); ++y) { - uint8* yplane = frame->data(media::VideoFrame::kYPlane) + - y * frame->row_bytes(media::VideoFrame::kYPlane); - uint8* uplane = frame->data(media::VideoFrame::kUPlane) + - (y / 2) * frame->row_bytes(media::VideoFrame::kUPlane); - uint8* vplane = frame->data(media::VideoFrame::kVPlane) + - (y / 2) * frame->row_bytes(media::VideoFrame::kVPlane); + uint8_t* yplane = frame->data(media::VideoFrame::kYPlane) + + y * frame->row_bytes(media::VideoFrame::kYPlane); + uint8_t* uplane = frame->data(media::VideoFrame::kUPlane) + + (y / 2) * frame->row_bytes(media::VideoFrame::kUPlane); + uint8_t* vplane = frame->data(media::VideoFrame::kVPlane) + + (y / 2) * frame->row_bytes(media::VideoFrame::kVPlane); for (int x = rect.x(); x < rect.right(); ++x) { if (yplane[x] != 0) y_found = true;
diff --git a/content/browser/media/capture/desktop_capture_device.cc b/content/browser/media/capture/desktop_capture_device.cc index bc16454..94b6171 100644 --- a/content/browser/media/capture/desktop_capture_device.cc +++ b/content/browser/media/capture/desktop_capture_device.cc
@@ -4,14 +4,19 @@ #include "content/browser/media/capture/desktop_capture_device.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" #include "base/timer/timer.h" +#include "build/build_config.h" #include "content/browser/media/capture/desktop_capture_device_uma_types.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/desktop_media_id.h" @@ -334,9 +339,9 @@ // Limit frame-rate to reduce CPU consumption. base::TimeDelta capture_period = std::max( - (last_capture_duration * 100) / kMaximumCpuConsumptionPercentage, - base::TimeDelta::FromMicroseconds(static_cast<int64>( - 1000000.0 / requested_frame_rate_ + 0.5 /* round to nearest int */))); + (last_capture_duration * 100) / kMaximumCpuConsumptionPercentage, + base::TimeDelta::FromMicroseconds(static_cast<int64_t>( + 1000000.0 / requested_frame_rate_ + 0.5 /* round to nearest int */))); // Schedule a task for the next frame. capture_timer_.Start(FROM_HERE, capture_period - last_capture_duration,
diff --git a/content/browser/media/capture/desktop_capture_device.h b/content/browser/media/capture/desktop_capture_device.h index 6b97159..7afdedc 100644 --- a/content/browser/media/capture/desktop_capture_device.h +++ b/content/browser/media/capture/desktop_capture_device.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_H_ #define CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread.h"
diff --git a/content/browser/media/capture/desktop_capture_device_aura.h b/content/browser/media/capture/desktop_capture_device_aura.h index c295923..82ce595 100644 --- a/content/browser/media/capture/desktop_capture_device_aura.h +++ b/content/browser/media/capture/desktop_capture_device_aura.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "content/public/browser/desktop_media_id.h"
diff --git a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc index c0ee3db..6424273c 100644 --- a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc +++ b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
@@ -4,7 +4,11 @@ #include "content/browser/media/capture/desktop_capture_device_aura.h" +#include <stddef.h> +#include <stdint.h> + #include "base/location.h" +#include "base/macros.h" #include "base/synchronization/waitable_event.h" #include "content/browser/browser_thread_impl.h" #include "content/public/browser/desktop_media_id.h" @@ -37,21 +41,21 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client { public: MOCK_METHOD5(OnIncomingCapturedData, - void(const uint8* data, + void(const uint8_t* data, int length, const media::VideoCaptureFormat& frame_format, int rotation, const base::TimeTicks& timestamp)); MOCK_METHOD9(OnIncomingCapturedYuvData, - void (const uint8* y_data, - const uint8* u_data, - const uint8* v_data, - size_t y_stride, - size_t u_stride, - size_t v_stride, - const media::VideoCaptureFormat& frame_format, - int clockwise_rotation, - const base::TimeTicks& timestamp)); + void(const uint8_t* y_data, + const uint8_t* u_data, + const uint8_t* v_data, + size_t y_stride, + size_t u_stride, + size_t v_stride, + const media::VideoCaptureFormat& frame_format, + int clockwise_rotation, + const base::TimeTicks& timestamp)); MOCK_METHOD0(DoReserveOutputBuffer, void(void)); MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void)); MOCK_METHOD0(DoOnIncomingCapturedVideoFrame, void(void));
diff --git a/content/browser/media/capture/desktop_capture_device_unittest.cc b/content/browser/media/capture/desktop_capture_device_unittest.cc index a754ff7..aa8572fb 100644 --- a/content/browser/media/capture/desktop_capture_device_unittest.cc +++ b/content/browser/media/capture/desktop_capture_device_unittest.cc
@@ -4,10 +4,13 @@ #include "content/browser/media/capture/desktop_capture_device.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" #include "base/time/time.h" @@ -57,21 +60,21 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client { public: MOCK_METHOD5(OnIncomingCapturedData, - void(const uint8* data, + void(const uint8_t* data, int length, const media::VideoCaptureFormat& frame_format, int rotation, const base::TimeTicks& timestamp)); MOCK_METHOD9(OnIncomingCapturedYuvData, - void (const uint8* y_data, - const uint8* u_data, - const uint8* v_data, - size_t y_stride, - size_t u_stride, - size_t v_stride, - const media::VideoCaptureFormat& frame_format, - int clockwise_rotation, - const base::TimeTicks& timestamp)); + void(const uint8_t* y_data, + const uint8_t* u_data, + const uint8_t* v_data, + size_t y_stride, + size_t u_stride, + size_t v_stride, + const media::VideoCaptureFormat& frame_format, + int clockwise_rotation, + const base::TimeTicks& timestamp)); MOCK_METHOD0(DoReserveOutputBuffer, void(void)); MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void)); MOCK_METHOD0(DoOnIncomingCapturedVideoFrame, void(void));
diff --git a/content/browser/media/capture/web_contents_audio_input_stream.cc b/content/browser/media/capture/web_contents_audio_input_stream.cc index 8fd1f97..d78b634 100644 --- a/content/browser/media/capture/web_contents_audio_input_stream.cc +++ b/content/browser/media/capture/web_contents_audio_input_stream.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" #include "content/browser/media/capture/audio_mirroring_manager.h"
diff --git a/content/browser/media/capture/web_contents_audio_input_stream.h b/content/browser/media/capture/web_contents_audio_input_stream.h index ff8074d4..ef994e83 100644 --- a/content/browser/media/capture/web_contents_audio_input_stream.h +++ b/content/browser/media/capture/web_contents_audio_input_stream.h
@@ -15,6 +15,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "media/audio/audio_io.h"
diff --git a/content/browser/media/capture/web_contents_audio_input_stream_unittest.cc b/content/browser/media/capture/web_contents_audio_input_stream_unittest.cc index c7c9c84..1e8ef1f8 100644 --- a/content/browser/media/capture/web_contents_audio_input_stream_unittest.cc +++ b/content/browser/media/capture/web_contents_audio_input_stream_unittest.cc
@@ -4,11 +4,14 @@ #include "content/browser/media/capture/web_contents_audio_input_stream.h" +#include <stdint.h> + #include <list> #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" @@ -162,7 +165,7 @@ MOCK_METHOD4(OnData, void(AudioInputStream* stream, const media::AudioBus* src, - uint32 hardware_delay_bytes, + uint32_t hardware_delay_bytes, double volume)); MOCK_METHOD1(OnError, void(AudioInputStream* stream));
diff --git a/content/browser/media/capture/web_contents_audio_muter.cc b/content/browser/media/capture/web_contents_audio_muter.cc index 675a9a7..82a03fa 100644 --- a/content/browser/media/capture/web_contents_audio_muter.cc +++ b/content/browser/media/capture/web_contents_audio_muter.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "content/browser/media/capture/audio_mirroring_manager.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h"
diff --git a/content/browser/media/capture/web_contents_audio_muter.h b/content/browser/media/capture/web_contents_audio_muter.h index d9c5f2fc..211f7298 100644 --- a/content/browser/media/capture/web_contents_audio_muter.h +++ b/content/browser/media/capture/web_contents_audio_muter.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_AUDIO_MUTER_H_ #define CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_AUDIO_MUTER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" namespace content {
diff --git a/content/browser/media/capture/web_contents_capture_util.cc b/content/browser/media/capture/web_contents_capture_util.cc index 0edaf4a..ff0bc87 100644 --- a/content/browser/media/capture/web_contents_capture_util.cc +++ b/content/browser/media/capture/web_contents_capture_util.cc
@@ -4,7 +4,9 @@ #include "content/browser/media/capture/web_contents_capture_util.h" -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h"
diff --git a/content/browser/media/capture/web_contents_tracker.h b/content/browser/media/capture/web_contents_tracker.h index 591c5e3..02ba7332 100644 --- a/content/browser/media/capture/web_contents_tracker.h +++ b/content/browser/media/capture/web_contents_tracker.h
@@ -17,6 +17,7 @@ #define CONTENT_BROWSER_MEDIA_CAPTURE_WEB_CONTENTS_TRACKER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/content/browser/media/capture/web_contents_video_capture_device.cc b/content/browser/media/capture/web_contents_video_capture_device.cc index d69a0bc6..0f5de4ef 100644 --- a/content/browser/media/capture/web_contents_video_capture_device.cc +++ b/content/browser/media/capture/web_contents_video_capture_device.cc
@@ -52,11 +52,13 @@ #include <algorithm> -#include "base/basictypes.h" +#include <stdint.h> + #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram.h" @@ -65,6 +67,7 @@ #include "base/threading/thread.h" #include "base/threading/thread_checker.h" #include "base/time/time.h" +#include "build/build_config.h" #include "content/browser/media/capture/cursor_renderer.h" #include "content/browser/media/capture/web_contents_capture_util.h" #include "content/browser/media/capture/web_contents_tracker.h" @@ -572,10 +575,8 @@ SkAutoLockPixels scaled_bitmap_locker(scaled_bitmap); media::CopyRGBToVideoFrame( - reinterpret_cast<uint8*>(scaled_bitmap.getPixels()), - scaled_bitmap.rowBytes(), - region_in_yv12_frame, - output.get()); + reinterpret_cast<uint8_t*>(scaled_bitmap.getPixels()), + scaled_bitmap.rowBytes(), region_in_yv12_frame, output.get()); } // The result is now ready.
diff --git a/content/browser/media/capture/web_contents_video_capture_device.h b/content/browser/media/capture/web_contents_video_capture_device.h index 18c9f4e..ab0e03a 100644 --- a/content/browser/media/capture/web_contents_video_capture_device.h +++ b/content/browser/media/capture/web_contents_video_capture_device.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "media/capture/content/screen_capture_device_core.h"
diff --git a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc index ba0b588..553eb721 100644 --- a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc +++ b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
@@ -4,12 +4,17 @@ #include "content/browser/media/capture/web_contents_video_capture_device.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind_helpers.h" #include "base/debug/debugger.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/test/test_timeouts.h" #include "base/time/time.h" #include "base/timer/timer.h" +#include "build/build_config.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/frame_host/render_frame_host_impl.h" #include "content/browser/media/capture/web_contents_capture_util.h" @@ -73,9 +78,9 @@ } SkColor ConvertRgbToYuv(SkColor rgb) { - uint8 yuv[3]; - media::ConvertRGB32ToYUV(reinterpret_cast<uint8*>(&rgb), - yuv, yuv + 1, yuv + 2, 1, 1, 1, 1, 1); + uint8_t yuv[3]; + media::ConvertRGB32ToYUV(reinterpret_cast<uint8_t*>(&rgb), yuv, yuv + 1, + yuv + 2, 1, 1, 1, 1, 1); return SkColorSetRGB(yuv[0], yuv[1], yuv[2]); } @@ -249,8 +254,8 @@ CaptureTestRenderViewHost(SiteInstance* instance, RenderViewHostDelegate* delegate, RenderWidgetHostDelegate* widget_delegate, - int32 routing_id, - int32 main_frame_routing_id, + int32_t routing_id, + int32_t main_frame_routing_id, bool swapped_out, CaptureTestSourceController* controller) : TestRenderViewHost(instance, @@ -310,8 +315,8 @@ SiteInstance* instance, RenderViewHostDelegate* delegate, RenderWidgetHostDelegate* widget_delegate, - int32 routing_id, - int32 main_frame_routing_id, + int32_t routing_id, + int32_t main_frame_routing_id, bool swapped_out) override { return new CaptureTestRenderViewHost(instance, delegate, widget_delegate, routing_id, main_frame_routing_id, @@ -338,15 +343,15 @@ ~StubClient() override {} MOCK_METHOD5(OnIncomingCapturedData, - void(const uint8* data, + void(const uint8_t* data, int length, const media::VideoCaptureFormat& frame_format, int rotation, const base::TimeTicks& timestamp)); MOCK_METHOD9(OnIncomingCapturedYuvData, - void(const uint8* y_data, - const uint8* u_data, - const uint8* v_data, + void(const uint8_t* y_data, + const uint8_t* u_data, + const uint8_t* v_data, size_t y_stride, size_t u_stride, size_t v_stride,
diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc index 1a28ab43..7c49c6df6 100644 --- a/content/browser/media/cdm/browser_cdm_manager.cc +++ b/content/browser/media/cdm/browser_cdm_manager.cc
@@ -4,6 +4,8 @@ #include "content/browser/media/cdm/browser_cdm_manager.h" +#include <stddef.h> + #include <string> #include "base/bind.h" @@ -11,6 +13,7 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/task_runner.h" +#include "build/build_config.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" @@ -45,13 +48,13 @@ // The ID used in this class is a concatenation of |render_frame_id| and // |cdm_id|, i.e. (render_frame_id << 32) + cdm_id. -uint64 GetId(int render_frame_id, int cdm_id) { - return (static_cast<uint64>(render_frame_id) << 32) + - static_cast<uint64>(cdm_id); +uint64_t GetId(int render_frame_id, int cdm_id) { + return (static_cast<uint64_t>(render_frame_id) << 32) + + static_cast<uint64_t>(cdm_id); } -bool IdBelongsToFrame(uint64 id, int render_frame_id) { - return (id >> 32) == static_cast<uint64>(render_frame_id); +bool IdBelongsToFrame(uint64_t id, int render_frame_id) { + return (id >> 32) == static_cast<uint64_t>(render_frame_id); } // media::CdmPromiseTemplate implementation backed by a BrowserCdmManager. @@ -300,7 +303,7 @@ int cdm_id, const std::string& session_id, MediaKeys::MessageType message_type, - const std::vector<uint8>& message, + const std::vector<uint8_t>& message, const GURL& legacy_destination_url) { GURL verified_gurl = legacy_destination_url; if (!verified_gurl.is_valid() && !verified_gurl.is_empty()) { @@ -325,7 +328,7 @@ int cdm_id, const std::string& session_id, MediaKeys::Exception exception_code, - uint32 system_code, + uint32_t system_code, const std::string& error_message) { Send(new CdmMsg_LegacySessionError(render_frame_id, cdm_id, session_id, exception_code, system_code, @@ -432,7 +435,7 @@ int render_frame_id = params.render_frame_id; int cdm_id = params.cdm_id; - const std::vector<uint8>& init_data = params.init_data; + const std::vector<uint8_t>& init_data = params.init_data; scoped_ptr<NewSessionPromise> promise( new NewSessionPromise(weak_ptr_factory_.GetWeakPtr(), render_frame_id, cdm_id, params.promise_id)); @@ -513,7 +516,7 @@ int cdm_id, uint32_t promise_id, const std::string& session_id, - const std::vector<uint8>& response) { + const std::vector<uint8_t>& response) { DCHECK(task_runner_->RunsTasksOnCurrentThread()); scoped_ptr<SimplePromise> promise(new SimplePromise( @@ -594,7 +597,7 @@ return; } - uint64 id = GetId(render_frame_id, cdm_id); + uint64_t id = GetId(render_frame_id, cdm_id); cdm_map_[id] = cdm; cdm_security_origin_map_[id] = security_origin; promise->resolve(); @@ -603,7 +606,7 @@ void BrowserCdmManager::RemoveAllCdmForFrame(int render_frame_id) { DCHECK(task_runner_->RunsTasksOnCurrentThread()); - std::vector<uint64> ids_to_remove; + std::vector<uint64_t> ids_to_remove; for (const auto& entry : cdm_map_) { if (IdBelongsToFrame(entry.first, render_frame_id)) ids_to_remove.push_back(entry.first); @@ -613,7 +616,7 @@ RemoveCdm(id_to_remove); } -void BrowserCdmManager::RemoveCdm(uint64 id) { +void BrowserCdmManager::RemoveCdm(uint64_t id) { DCHECK(task_runner_->RunsTasksOnCurrentThread()); cdm_map_.erase(id); @@ -628,7 +631,7 @@ DCHECK(task_runner_->RunsTasksOnCurrentThread()); GURL security_origin; - std::map<uint64, GURL>::const_iterator iter = + std::map<uint64_t, GURL>::const_iterator iter = cdm_security_origin_map_.find(GetId(render_frame_id, cdm_id)); DCHECK(iter != cdm_security_origin_map_.end()); if (iter != cdm_security_origin_map_.end()) @@ -681,7 +684,7 @@ int cdm_id, media::MediaKeys::SessionType session_type, media::EmeInitDataType init_data_type, - const std::vector<uint8>& init_data, + const std::vector<uint8_t>& init_data, scoped_ptr<media::NewSessionCdmPromise> promise, bool permission_was_allowed) { DCHECK(task_runner_->RunsTasksOnCurrentThread());
diff --git a/content/browser/media/cdm/browser_cdm_manager.h b/content/browser/media/cdm/browser_cdm_manager.h index 521de14a..e3a986a6 100644 --- a/content/browser/media/cdm/browser_cdm_manager.h +++ b/content/browser/media/cdm/browser_cdm_manager.h
@@ -5,12 +5,14 @@ #ifndef CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_ #define CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" @@ -92,7 +94,7 @@ int cdm_id, const std::string& session_id, media::MediaKeys::MessageType message_type, - const std::vector<uint8>& message, + const std::vector<uint8_t>& message, const GURL& legacy_destination_url); void OnSessionClosed(int render_frame_id, int cdm_id, @@ -134,7 +136,7 @@ int cdm_id, uint32_t promise_id, const std::string& session_id, - const std::vector<uint8>& response); + const std::vector<uint8_t>& response); void OnCloseSession(int render_frame_id, int cdm_id, uint32_t promise_id, @@ -157,7 +159,7 @@ void RemoveAllCdmForFrame(int render_frame_id); // Removes the CDM with the specified id. - void RemoveCdm(uint64 id); + void RemoveCdm(uint64_t id); using PermissionStatusCB = base::Callback<void(bool)>; @@ -181,7 +183,7 @@ int cdm_id, media::MediaKeys::SessionType session_type, media::EmeInitDataType init_data_type, - const std::vector<uint8>& init_data, + const std::vector<uint8_t>& init_data, scoped_ptr<media::NewSessionCdmPromise> promise, bool permission_was_allowed); @@ -206,11 +208,11 @@ // |cdm_id|. // Map of managed CDMs. - typedef std::map<uint64, scoped_refptr<media::MediaKeys>> CdmMap; + typedef std::map<uint64_t, scoped_refptr<media::MediaKeys>> CdmMap; CdmMap cdm_map_; // Map of CDM's security origin. - std::map<uint64, GURL> cdm_security_origin_map_; + std::map<uint64_t, GURL> cdm_security_origin_map_; base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_;
diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc index 9bcc7e5..0f53163 100644 --- a/content/browser/media/encrypted_media_browsertest.cc +++ b/content/browser/media/encrypted_media_browsertest.cc
@@ -5,6 +5,7 @@ #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" +#include "build/build_config.h" #include "content/browser/media/media_browsertest.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h"
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc index d0955cc7..43db9ad 100644 --- a/content/browser/media/media_browsertest.cc +++ b/content/browser/media/media_browsertest.cc
@@ -6,6 +6,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/content_browser_test_utils.h"
diff --git a/content/browser/media/media_canplaytype_browsertest.cc b/content/browser/media/media_canplaytype_browsertest.cc index 36254bd3..0c41e31 100644 --- a/content/browser/media/media_canplaytype_browsertest.cc +++ b/content/browser/media/media_canplaytype_browsertest.cc
@@ -4,6 +4,8 @@ #include <string> +#include "base/macros.h" +#include "build/build_config.h" #include "content/browser/media/media_browsertest.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/content_browser_test_utils.h"
diff --git a/content/browser/media/media_internals.cc b/content/browser/media/media_internals.cc index d6db909..dc08926 100644 --- a/content/browser/media/media_internals.cc +++ b/content/browser/media/media_internals.cc
@@ -4,10 +4,14 @@ #include "content/browser/media/media_internals.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h"
diff --git a/content/browser/media/media_internals.h b/content/browser/media/media_internals.h index 4ff545fe..e4869281 100644 --- a/content/browser/media/media_internals.h +++ b/content/browser/media/media_internals.h
@@ -13,6 +13,7 @@ #include "base/callback_forward.h" #include "base/compiler_specific.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/synchronization/lock.h" #include "base/values.h"
diff --git a/content/browser/media/media_internals_handler.h b/content/browser/media/media_internals_handler.h index d984a96d..6fc290b 100644 --- a/content/browser/media/media_internals_handler.h +++ b/content/browser/media/media_internals_handler.h
@@ -6,6 +6,7 @@ #define CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/content/browser/media/media_internals_proxy.cc b/content/browser/media/media_internals_proxy.cc index 6e338ed..0ff34cf 100644 --- a/content/browser/media/media_internals_proxy.cc +++ b/content/browser/media/media_internals_proxy.cc
@@ -4,8 +4,11 @@ #include "content/browser/media/media_internals_proxy.h" +#include <stddef.h> + #include "base/bind.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "content/browser/media/media_internals_handler.h"
diff --git a/content/browser/media/media_internals_proxy.h b/content/browser/media/media_internals_proxy.h index f12e24e..5eb9294f 100644 --- a/content/browser/media/media_internals_proxy.h +++ b/content/browser/media/media_internals_proxy.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_PROXY_H_ #define CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_PROXY_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner_helpers.h" #include "content/browser/media/media_internals.h"
diff --git a/content/browser/media/media_internals_ui.h b/content/browser/media/media_internals_ui.h index f7a17a6..3ec014c 100644 --- a/content/browser/media/media_internals_ui.h +++ b/content/browser/media/media_internals_ui.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_UI_H_ #define CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace content {
diff --git a/content/browser/media/media_internals_unittest.cc b/content/browser/media/media_internals_unittest.cc index 6b026e0..2ab0539 100644 --- a/content/browser/media/media_internals_unittest.cc +++ b/content/browser/media/media_internals_unittest.cc
@@ -4,12 +4,15 @@ #include "content/browser/media/media_internals.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/json/json_reader.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "content/public/test/test_browser_thread_bundle.h" #include "media/audio/audio_parameters.h" #include "media/base/channel_layout.h"
diff --git a/content/browser/media/media_source_browsertest.cc b/content/browser/media/media_source_browsertest.cc index 33dd0ad..39ea59a 100644 --- a/content/browser/media/media_source_browsertest.cc +++ b/content/browser/media/media_source_browsertest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "build/build_config.h" #include "content/browser/media/media_browsertest.h" #include "content/public/common/content_switches.h" #if defined(OS_ANDROID)
diff --git a/content/browser/media/media_web_contents_observer.cc b/content/browser/media/media_web_contents_observer.cc index 42dcf93..d615140f 100644 --- a/content/browser/media/media_web_contents_observer.cc +++ b/content/browser/media/media_web_contents_observer.cc
@@ -6,6 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" +#include "build/build_config.h" #include "content/browser/media/cdm/browser_cdm_manager.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h"
diff --git a/content/browser/media/media_web_contents_observer.h b/content/browser/media/media_web_contents_observer.h index 4af84a4..532272d 100644 --- a/content/browser/media/media_web_contents_observer.h +++ b/content/browser/media/media_web_contents_observer.h
@@ -5,12 +5,16 @@ #ifndef CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_ #define CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_ +#include <stdint.h> + #include <map> #include <set> #include <vector> #include "base/compiler_specific.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" +#include "build/build_config.h" #include "content/browser/power_save_blocker_impl.h" #include "content/common/content_export.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/content/browser/media/midi_host.cc b/content/browser/media/midi_host.cc index bc697ed..1e6de1e2 100644 --- a/content/browser/media/midi_host.cc +++ b/content/browser/media/midi_host.cc
@@ -33,11 +33,11 @@ // how many bytes will be sent before reporting back to the renderer. const size_t kAcknowledgementThresholdBytes = 1024 * 1024; // 1 MB. -bool IsDataByte(uint8 data) { +bool IsDataByte(uint8_t data) { return (data & 0x80) == 0; } -bool IsSystemRealTimeMessage(uint8 data) { +bool IsSystemRealTimeMessage(uint8_t data) { return 0xf8 <= data && data <= 0xff; } @@ -88,8 +88,8 @@ midi_manager_->StartSession(this); } -void MidiHost::OnSendData(uint32 port, - const std::vector<uint8>& data, +void MidiHost::OnSendData(uint32_t port, + const std::vector<uint8_t>& data, double timestamp) { { base::AutoLock auto_lock(output_port_count_lock_); @@ -157,21 +157,20 @@ Send(new MidiMsg_AddOutputPort(info)); } -void MidiHost::SetInputPortState(uint32 port, +void MidiHost::SetInputPortState(uint32_t port, media::midi::MidiPortState state) { Send(new MidiMsg_SetInputPortState(port, state)); } -void MidiHost::SetOutputPortState(uint32 port, +void MidiHost::SetOutputPortState(uint32_t port, media::midi::MidiPortState state) { Send(new MidiMsg_SetOutputPortState(port, state)); } -void MidiHost::ReceiveMidiData( - uint32 port, - const uint8* data, - size_t length, - double timestamp) { +void MidiHost::ReceiveMidiData(uint32_t port, + const uint8_t* data, + size_t length, + double timestamp) { TRACE_EVENT0("midi", "MidiHost::ReceiveMidiData"); base::AutoLock auto_lock(messages_queues_lock_); @@ -183,7 +182,7 @@ received_messages_queues_[port] = new media::midi::MidiMessageQueue(true); received_messages_queues_[port]->Add(data, length); - std::vector<uint8> message; + std::vector<uint8_t> message; while (true) { received_messages_queues_[port]->Get(&message); if (message.empty()) @@ -224,11 +223,11 @@ } // static -bool MidiHost::IsValidWebMIDIData(const std::vector<uint8>& data) { +bool MidiHost::IsValidWebMIDIData(const std::vector<uint8_t>& data) { bool in_sysex = false; size_t waiting_data_length = 0; for (size_t i = 0; i < data.size(); ++i) { - const uint8 current = data[i]; + const uint8_t current = data[i]; if (IsSystemRealTimeMessage(current)) continue; // Real time message can be placed at any point. if (waiting_data_length > 0) {
diff --git a/content/browser/media/midi_host.h b/content/browser/media/midi_host.h index a536ebec..671bd3c 100644 --- a/content/browser/media/midi_host.h +++ b/content/browser/media/midi_host.h
@@ -5,9 +5,13 @@ #ifndef CONTENT_BROWSER_MEDIA_MIDI_HOST_H_ #define CONTENT_BROWSER_MEDIA_MIDI_HOST_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" @@ -41,12 +45,12 @@ void CompleteStartSession(media::midi::Result result) override; void AddInputPort(const media::midi::MidiPortInfo& info) override; void AddOutputPort(const media::midi::MidiPortInfo& info) override; - void SetInputPortState(uint32 port, + void SetInputPortState(uint32_t port, media::midi::MidiPortState state) override; - void SetOutputPortState(uint32 port, + void SetOutputPortState(uint32_t port, media::midi::MidiPortState state) override; - void ReceiveMidiData(uint32 port, - const uint8* data, + void ReceiveMidiData(uint32_t port, + const uint8_t* data, size_t length, double timestamp) override; void AccumulateMidiBytesSent(size_t n) override; @@ -56,8 +60,8 @@ void OnStartSession(); // Data to be sent to a MIDI output port. - void OnSendData(uint32 port, - const std::vector<uint8>& data, + void OnSendData(uint32_t port, + const std::vector<uint8_t>& data, double timestamp); void OnEndSession(); @@ -75,7 +79,7 @@ // - |data| must be any number of complete MIDI messages (data abbreviation // called "running status" is disallowed). // - 1-byte MIDI realtime messages can be placed at any position of |data|. - static bool IsValidWebMIDIData(const std::vector<uint8>& data); + static bool IsValidWebMIDIData(const std::vector<uint8_t>& data); int renderer_process_id_; @@ -111,7 +115,7 @@ base::Lock in_flight_lock_; // How many output port exists. - uint32 output_port_count_; + uint32_t output_port_count_; // Protects access to |output_port_count_|. base::Lock output_port_count_lock_;
diff --git a/content/browser/media/midi_host_unittest.cc b/content/browser/media/midi_host_unittest.cc index 05f2dfe..655414e8 100644 --- a/content/browser/media/midi_host_unittest.cc +++ b/content/browser/media/midi_host_unittest.cc
@@ -4,6 +4,10 @@ #include "content/browser/media/midi_host.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" @@ -15,23 +19,23 @@ namespace content { namespace { -const uint8 kGMOn[] = { 0xf0, 0x7e, 0x7f, 0x09, 0x01, 0xf7 }; -const uint8 kGSOn[] = { - 0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7f, 0x00, 0x41, 0xf7, +const uint8_t kGMOn[] = {0xf0, 0x7e, 0x7f, 0x09, 0x01, 0xf7}; +const uint8_t kGSOn[] = { + 0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7f, 0x00, 0x41, 0xf7, }; -const uint8 kNoteOn[] = { 0x90, 0x3c, 0x7f }; -const uint8 kNoteOnWithRunningStatus[] = { - 0x90, 0x3c, 0x7f, 0x3c, 0x7f, 0x3c, 0x7f, +const uint8_t kNoteOn[] = {0x90, 0x3c, 0x7f}; +const uint8_t kNoteOnWithRunningStatus[] = { + 0x90, 0x3c, 0x7f, 0x3c, 0x7f, 0x3c, 0x7f, }; -const uint8 kChannelPressure[] = { 0xd0, 0x01 }; -const uint8 kChannelPressureWithRunningStatus[] = { - 0xd0, 0x01, 0x01, 0x01, +const uint8_t kChannelPressure[] = {0xd0, 0x01}; +const uint8_t kChannelPressureWithRunningStatus[] = { + 0xd0, 0x01, 0x01, 0x01, }; -const uint8 kTimingClock[] = { 0xf8 }; -const uint8 kBrokenData1[] = { 0x90 }; -const uint8 kBrokenData2[] = { 0xf7 }; -const uint8 kBrokenData3[] = { 0xf2, 0x00 }; -const uint8 kDataByte0[] = { 0x00 }; +const uint8_t kTimingClock[] = {0xf8}; +const uint8_t kBrokenData1[] = {0x90}; +const uint8_t kBrokenData2[] = {0xf7}; +const uint8_t kBrokenData3[] = {0xf2, 0x00}; +const uint8_t kDataByte0[] = {0x00}; const int kRenderProcessId = 0; @@ -53,8 +57,8 @@ struct MidiEvent { MidiEvent(MidiEventType in_type, - uint32 in_port_index, - const std::vector<uint8>& in_data, + uint32_t in_port_index, + const std::vector<uint8_t>& in_data, double in_timestamp) : type(in_type), port_index(in_port_index), @@ -62,16 +66,16 @@ timestamp(in_timestamp) {} MidiEventType type; - uint32 port_index; - std::vector<uint8> data; + uint32_t port_index; + std::vector<uint8_t> data; double timestamp; }; class FakeMidiManager : public media::midi::MidiManager { public: void DispatchSendMidiData(media::midi::MidiManagerClient* client, - uint32 port_index, - const std::vector<uint8>& data, + uint32_t port_index, + const std::vector<uint8_t>& data, double timestamp) override { events_.push_back(MidiEvent(DISPATCH_SEND_MIDI_DATA, port_index, @@ -121,7 +125,7 @@ host_->AddOutputPort(info); } - void OnSendData(uint32 port) { + void OnSendData(uint32_t port) { scoped_ptr<IPC::Message> message( new MidiHostMsg_SendData(port, data_, 0.0)); host_->OnMessageReceived(*message.get()); @@ -131,7 +135,7 @@ return manager_.events_.size(); } - void CheckSendEventAt(size_t at, uint32 port) { + void CheckSendEventAt(size_t at, uint32_t port) { EXPECT_EQ(DISPATCH_SEND_MIDI_DATA, manager_.events_[at].type); EXPECT_EQ(port, manager_.events_[at].port_index); EXPECT_EQ(data_, manager_.events_[at].data); @@ -149,8 +153,8 @@ FakeMidiManager manager_; scoped_refptr<MidiHostForTesting> host_; - std::vector<uint8> data_; - int32 port_id_; + std::vector<uint8_t> data_; + int32_t port_id_; DISALLOW_COPY_AND_ASSIGN(MidiHostTest); }; @@ -177,7 +181,7 @@ // Multiple messages are allowed as long as each of them is complete. { - std::vector<uint8> buffer; + std::vector<uint8_t> buffer; PushToVector(kGMOn, &buffer); PushToVector(kNoteOn, &buffer); PushToVector(kGSOn, &buffer); @@ -190,14 +194,14 @@ // MIDI realtime message can be placed at any position. { - const uint8 kNoteOnWithRealTimeClock[] = { - 0x90, 0xf8, 0x3c, 0x7f, 0x90, 0xf8, 0x3c, 0xf8, 0x7f, 0xf8, + const uint8_t kNoteOnWithRealTimeClock[] = { + 0x90, 0xf8, 0x3c, 0x7f, 0x90, 0xf8, 0x3c, 0xf8, 0x7f, 0xf8, }; EXPECT_TRUE(MidiHost::IsValidWebMIDIData( AsVector(kNoteOnWithRealTimeClock))); - const uint8 kGMOnWithRealTimeClock[] = { - 0xf0, 0xf8, 0x7e, 0x7f, 0x09, 0x01, 0xf8, 0xf7, + const uint8_t kGMOnWithRealTimeClock[] = { + 0xf0, 0xf8, 0x7e, 0x7f, 0x09, 0x01, 0xf8, 0xf7, }; EXPECT_TRUE(MidiHost::IsValidWebMIDIData( AsVector(kGMOnWithRealTimeClock))); @@ -210,14 +214,14 @@ AddOutputPort(); // Sending data to port 0 should be delivered. - uint32 port0 = 0; + uint32_t port0 = 0; OnSendData(port0); RunLoopUntilIdle(); EXPECT_EQ(1U, GetEventSize()); CheckSendEventAt(0, port0); // Sending data to port 1 should not be delivered. - uint32 port1 = 1; + uint32_t port1 = 1; OnSendData(port1); RunLoopUntilIdle(); EXPECT_EQ(1U, GetEventSize());
diff --git a/content/browser/media/webrtc_audio_debug_recordings_browsertest.cc b/content/browser/media/webrtc_audio_debug_recordings_browsertest.cc index cc450f1..f42aed10 100644 --- a/content/browser/media/webrtc_audio_debug_recordings_browsertest.cc +++ b/content/browser/media/webrtc_audio_debug_recordings_browsertest.cc
@@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/process/process_handle.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "content/browser/media/webrtc_internals.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/test/browser_test_utils.h" @@ -124,7 +127,7 @@ render_process_id); EXPECT_TRUE(base::PathExists(aec_dump_file)); - int64 file_size = 0; + int64_t file_size = 0; EXPECT_TRUE(base::GetFileSize(aec_dump_file, &file_size)); EXPECT_GT(file_size, 0); @@ -255,7 +258,7 @@ GetExpectedAecDumpFileName(base_file, render_process_id); EXPECT_TRUE(base::PathExists(aec_dump_file)); - int64 file_size = 0; + int64_t file_size = 0; EXPECT_TRUE(base::GetFileSize(aec_dump_file, &file_size)); EXPECT_GT(file_size, 0);
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc index 11ec55c..7dd174f 100644 --- a/content/browser/media/webrtc_browsertest.cc +++ b/content/browser/media/webrtc_browsertest.cc
@@ -5,6 +5,7 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/threading/platform_thread.h" +#include "build/build_config.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/common/content_switches.h" #include "content/public/common/webrtc_ip_handling_policy.h"
diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc index 426ec4f..314492b 100644 --- a/content/browser/media/webrtc_getusermedia_browsertest.cc +++ b/content/browser/media/webrtc_getusermedia_browsertest.cc
@@ -2,12 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/command_line.h" #include "base/json/json_reader.h" #include "base/strings/stringprintf.h" #include "base/test/trace_event_analyzer.h" #include "base/trace_event/trace_event_impl.h" #include "base/values.h" +#include "build/build_config.h" #include "content/browser/media/webrtc_internals.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/common/content_switches.h"
diff --git a/content/browser/media/webrtc_identity_store.cc b/content/browser/media/webrtc_identity_store.cc index 9867a2f6..6e9f66d 100644 --- a/content/browser/media/webrtc_identity_store.cc +++ b/content/browser/media/webrtc_identity_store.cc
@@ -4,11 +4,15 @@ #include "content/browser/media/webrtc_identity_store.h" +#include <stddef.h> +#include <stdint.h> + #include <map> #include "base/bind.h" #include "base/callback_helpers.h" #include "base/logging.h" +#include "base/macros.h" #include "base/rand_util.h" #include "base/threading/worker_pool.h" #include "content/browser/media/webrtc_identity_store_backend.h" @@ -55,7 +59,7 @@ return; } - std::vector<uint8> private_key_info; + std::vector<uint8_t> private_key_info; if (!key->ExportPrivateKey(&private_key_info)) { DLOG(ERROR) << "Unable to export private key"; result->error = net::ERR_PRIVATE_KEY_EXPORT_FAILED;
diff --git a/content/browser/media/webrtc_identity_store.h b/content/browser/media/webrtc_identity_store.h index 7e5d8139..c788d0d 100644 --- a/content/browser/media/webrtc_identity_store.h +++ b/content/browser/media/webrtc_identity_store.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/time/time.h" #include "content/common/content_export.h"
diff --git a/content/browser/media/webrtc_identity_store_backend.cc b/content/browser/media/webrtc_identity_store_backend.cc index 48e51e6..76d4827 100644 --- a/content/browser/media/webrtc_identity_store_backend.cc +++ b/content/browser/media/webrtc_identity_store_backend.cc
@@ -4,10 +4,14 @@ #include "content/browser/media/webrtc_identity_store_backend.h" +#include <stddef.h> +#include <stdint.h> + #include <tuple> #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/strings/string_util.h" #include "content/public/browser/browser_thread.h" @@ -75,7 +79,7 @@ Identity(const std::string& common_name, const std::string& certificate, const std::string& private_key, - int64 creation_time) + int64_t creation_time) : common_name(common_name), certificate(certificate), private_key(private_key), @@ -84,7 +88,7 @@ std::string common_name; std::string certificate; std::string private_key; - int64 creation_time; + int64_t creation_time; }; struct WebRTCIdentityStoreBackend::PendingFindRequest { @@ -413,7 +417,7 @@ std::string cert, private_key; stmt.ColumnBlobAsString(3, &cert); stmt.ColumnBlobAsString(4, &private_key); - int64 creation_time = stmt.ColumnInt64(5); + int64_t creation_time = stmt.ColumnInt64(5); std::pair<IdentityMap::iterator, bool> result = out_map->insert(std::pair<IdentityKey, Identity>( key, Identity(common_name, cert, private_key, creation_time)));
diff --git a/content/browser/media/webrtc_identity_store_backend.h b/content/browser/media/webrtc_identity_store_backend.h index 57c16ab3..906f71a6 100644 --- a/content/browser/media/webrtc_identity_store_backend.h +++ b/content/browser/media/webrtc_identity_store_backend.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h"
diff --git a/content/browser/media/webrtc_internals.cc b/content/browser/media/webrtc_internals.cc index 10eb6d1..0528f0f 100644 --- a/content/browser/media/webrtc_internals.cc +++ b/content/browser/media/webrtc_internals.cc
@@ -4,7 +4,10 @@ #include "content/browser/media/webrtc_internals.h" +#include <stddef.h> + #include "base/strings/string_number_conversions.h" +#include "build/build_config.h" #include "content/browser/media/webrtc_internals_ui_observer.h" #include "content/browser/web_contents/web_contents_view.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/media/webrtc_internals_browsertest.cc b/content/browser/media/webrtc_internals_browsertest.cc index a0742b3..a266d03 100644 --- a/content/browser/media/webrtc_internals_browsertest.cc +++ b/content/browser/media/webrtc_internals_browsertest.cc
@@ -2,11 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/command_line.h" #include "base/json/json_reader.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/content_browser_test.h" @@ -63,7 +67,7 @@ return ss.str(); } - int64 timestamp; + int64_t timestamp; std::map<string, string> values; }; @@ -137,7 +141,7 @@ std::string video_constraints; }; -static const int64 FAKE_TIME_STAMP = 3600000; +static const int64_t FAKE_TIME_STAMP = 3600000; #if defined(OS_WIN) // All tests are flaky on Windows: crbug.com/277322.
diff --git a/content/browser/media/webrtc_internals_message_handler.h b/content/browser/media/webrtc_internals_message_handler.h index 5949849..1b42f21 100644 --- a/content/browser/media/webrtc_internals_message_handler.h +++ b/content/browser/media/webrtc_internals_message_handler.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_MESSAGE_HANDLER_H_ #define CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_MESSAGE_HANDLER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/browser/media/webrtc_internals_ui_observer.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/content/browser/media/webrtc_internals_ui.h b/content/browser/media/webrtc_internals_ui.h index 29745b1..541af02 100644 --- a/content/browser/media/webrtc_internals_ui.h +++ b/content/browser/media/webrtc_internals_ui.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_UI_H_ #define CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace content {
diff --git a/content/browser/media/webrtc_ip_permissions_browsertest.cc b/content/browser/media/webrtc_ip_permissions_browsertest.cc index 396df11..9b05019 100644 --- a/content/browser/media/webrtc_ip_permissions_browsertest.cc +++ b/content/browser/media/webrtc_ip_permissions_browsertest.cc
@@ -5,6 +5,7 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/threading/platform_thread.h" +#include "build/build_config.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/common/content_switches.h" #include "content/public/common/webrtc_ip_handling_policy.h"
diff --git a/content/browser/media/webrtc_media_recorder_browsertest.cc b/content/browser/media/webrtc_media_recorder_browsertest.cc index ef3b4e6..3765a884 100644 --- a/content/browser/media/webrtc_media_recorder_browsertest.cc +++ b/content/browser/media/webrtc_media_recorder_browsertest.cc
@@ -3,6 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" +#include "build/build_config.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/content_browser_test_utils.h"
diff --git a/content/browser/media/webrtc_webcam_browsertest.cc b/content/browser/media/webrtc_webcam_browsertest.cc index 59889b3..32eeb11 100644 --- a/content/browser/media/webrtc_webcam_browsertest.cc +++ b/content/browser/media/webrtc_webcam_browsertest.cc
@@ -4,6 +4,7 @@ #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h"
diff --git a/content/browser/service_worker/embedded_worker_instance.cc b/content/browser/service_worker/embedded_worker_instance.cc index 0089bf56..17c3022 100644 --- a/content/browser/service_worker/embedded_worker_instance.cc +++ b/content/browser/service_worker/embedded_worker_instance.cc
@@ -5,6 +5,7 @@ #include "content/browser/service_worker/embedded_worker_instance.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/threading/non_thread_safe.h" #include "base/trace_event/trace_event.h" @@ -48,7 +49,7 @@ int process_id, const ServiceWorkerContextCore* service_worker_context, const base::WeakPtr<ServiceWorkerContextCore>& service_worker_context_weak, - int64 service_worker_version_id, + int64_t service_worker_version_id, const GURL& url, const base::Callback<void(int worker_devtools_agent_route_id, bool wait_for_debugger)>& callback) { @@ -139,7 +140,7 @@ registry_->RemoveWorker(process_id_, embedded_worker_id_); } -void EmbeddedWorkerInstance::Start(int64 service_worker_version_id, +void EmbeddedWorkerInstance::Start(int64_t service_worker_version_id, const GURL& scope, const GURL& script_url, const StatusCallback& callback) { @@ -281,7 +282,7 @@ OnStartFailed(callback, status); return; } - const int64 service_worker_version_id = params->service_worker_version_id; + const int64_t service_worker_version_id = params->service_worker_version_id; process_id_ = process_id; GURL script_url(params->script_url);
diff --git a/content/browser/service_worker/embedded_worker_instance.h b/content/browser/service_worker/embedded_worker_instance.h index 60b3363..ad1272f8 100644 --- a/content/browser/service_worker/embedded_worker_instance.h +++ b/content/browser/service_worker/embedded_worker_instance.h
@@ -5,13 +5,15 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_INSTANCE_H_ #define CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_INSTANCE_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" @@ -102,7 +104,7 @@ // Starts the worker. It is invalid to call this when the worker is not in // STOPPED status. |callback| is invoked after the worker script has been // started and evaluated, or when an error occurs. - void Start(int64 service_worker_version_id, + void Start(int64_t service_worker_version_id, const GURL& scope, const GURL& script_url, const StatusCallback& callback);
diff --git a/content/browser/service_worker/embedded_worker_instance_unittest.cc b/content/browser/service_worker/embedded_worker_instance_unittest.cc index c2a109c..4057e3a 100644 --- a/content/browser/service_worker/embedded_worker_instance_unittest.cc +++ b/content/browser/service_worker/embedded_worker_instance_unittest.cc
@@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/run_loop.h" #include "base/stl_util.h" #include "content/browser/service_worker/embedded_worker_instance.h" @@ -108,7 +110,7 @@ embedded_worker_registry()->CreateWorker(); EXPECT_EQ(EmbeddedWorkerInstance::STOPPED, worker->status()); - const int64 service_worker_version_id = 55L; + const int64_t service_worker_version_id = 55L; const GURL pattern("http://example.com/"); const GURL url("http://example.com/worker.js"); @@ -154,7 +156,7 @@ embedded_worker_registry()->CreateWorker(); EXPECT_EQ(EmbeddedWorkerInstance::STOPPED, worker->status()); - const int64 service_worker_version_id = 55L; + const int64_t service_worker_version_id = 55L; const GURL pattern("http://example.com/"); const GURL url("http://example.com/worker.js"); @@ -202,8 +204,8 @@ scoped_ptr<EmbeddedWorkerInstance> worker2 = embedded_worker_registry()->CreateWorker(); - const int64 version_id1 = 55L; - const int64 version_id2 = 56L; + const int64_t version_id1 = 55L; + const int64_t version_id2 = 56L; const GURL pattern("http://example.com/"); const GURL url("http://example.com/worker.js"); int process_id = helper_->mock_render_process_id(); @@ -300,7 +302,7 @@ } TEST_F(EmbeddedWorkerInstanceTest, Detach) { - const int64 version_id = 55L; + const int64_t version_id = 55L; const GURL pattern("http://example.com/"); const GURL url("http://example.com/worker.js"); scoped_ptr<EmbeddedWorkerInstance> worker = @@ -333,7 +335,7 @@ TEST_F(EmbeddedWorkerInstanceTest, FailToSendStartIPC) { helper_.reset(new FailToSendIPCHelper()); - const int64 version_id = 55L; + const int64_t version_id = 55L; const GURL pattern("http://example.com/"); const GURL url("http://example.com/worker.js");
diff --git a/content/browser/service_worker/embedded_worker_registry.h b/content/browser/service_worker/embedded_worker_registry.h index 22313dd..308e1de 100644 --- a/content/browser/service_worker/embedded_worker_registry.h +++ b/content/browser/service_worker/embedded_worker_registry.h
@@ -9,8 +9,8 @@ #include <set> #include <vector> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/service_worker/embedded_worker_test_helper.cc b/content/browser/service_worker/embedded_worker_test_helper.cc index bd331bf7..f3f557d 100644 --- a/content/browser/service_worker/embedded_worker_test_helper.cc +++ b/content/browser/service_worker/embedded_worker_test_helper.cc
@@ -111,7 +111,7 @@ } void EmbeddedWorkerTestHelper::OnStartWorker(int embedded_worker_id, - int64 service_worker_version_id, + int64_t service_worker_version_id, const GURL& scope, const GURL& script_url) { embedded_worker_id_service_worker_version_id_map_[embedded_worker_id] = @@ -197,7 +197,7 @@ void EmbeddedWorkerTestHelper::SimulateWorkerScriptCached( int embedded_worker_id) { - int64 version_id = + int64_t version_id = embedded_worker_id_service_worker_version_id_map_[embedded_worker_id]; ServiceWorkerVersion* version = context()->GetLiveVersion(version_id); if (!version || version->script_cache_map()->size())
diff --git a/content/browser/service_worker/embedded_worker_test_helper.h b/content/browser/service_worker/embedded_worker_test_helper.h index 8efd35b..9a30831 100644 --- a/content/browser/service_worker/embedded_worker_test_helper.h +++ b/content/browser/service_worker/embedded_worker_test_helper.h
@@ -5,11 +5,14 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_TEST_HELPER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_TEST_HELPER_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_test_sink.h" @@ -88,7 +91,7 @@ // - OnStopWorker calls SimulateWorkerStoped // - OnSendMessageToWorker calls the message's respective On*Event handler virtual void OnStartWorker(int embedded_worker_id, - int64 service_worker_version_id, + int64_t service_worker_version_id, const GURL& scope, const GURL& script_url); virtual void OnStopWorker(int embedded_worker_id); @@ -147,7 +150,7 @@ int next_thread_id_; int mock_render_process_id_; - std::map<int, int64> embedded_worker_id_service_worker_version_id_map_; + std::map<int, int64_t> embedded_worker_id_service_worker_version_id_map_; // Updated each time MessageToWorker message is received. int current_embedded_worker_id_;
diff --git a/content/browser/service_worker/foreign_fetch_request_handler.cc b/content/browser/service_worker/foreign_fetch_request_handler.cc index b3b1213b..5edda64 100644 --- a/content/browser/service_worker/foreign_fetch_request_handler.cc +++ b/content/browser/service_worker/foreign_fetch_request_handler.cc
@@ -4,6 +4,7 @@ #include "content/browser/service_worker/foreign_fetch_request_handler.h" +#include "base/macros.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/browser/service_worker/service_worker_url_request_job.h" #include "content/common/resource_request_body.h"
diff --git a/content/browser/service_worker/foreign_fetch_request_handler.h b/content/browser/service_worker/foreign_fetch_request_handler.h index c2300a04..196f7e0 100644 --- a/content/browser/service_worker/foreign_fetch_request_handler.h +++ b/content/browser/service_worker/foreign_fetch_request_handler.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_FOREIGN_FETCH_REQUEST_HANDLER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_FOREIGN_FETCH_REQUEST_HANDLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/supports_user_data.h" #include "base/time/time.h"
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc index 2e5ad394..10b727ca 100644 --- a/content/browser/service_worker/service_worker_browsertest.cc +++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -2,13 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/callback.h" #include "base/command_line.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 "build/build_config.h" #include "content/browser/fileapi/chrome_blob_storage_context.h" #include "content/browser/service_worker/embedded_worker_instance.h" #include "content/browser/service_worker/embedded_worker_registry.h" @@ -181,7 +186,7 @@ RunOnIOThread(base::Bind(&WorkerActivatedObserver::InitOnIOThread, this)); } // ServiceWorkerContextObserver overrides. - void OnVersionStateChanged(int64 version_id, + void OnVersionStateChanged(int64_t version_id, ServiceWorkerVersion::Status) override { ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO)); const ServiceWorkerVersion* version = context_->GetLiveVersion(version_id); @@ -541,7 +546,7 @@ ASSERT_EQ(expected_status, status); } - void StoreRegistration(int64 version_id, + void StoreRegistration(int64_t version_id, ServiceWorkerStatusCode expected_status) { ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI)); ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED; @@ -557,7 +562,7 @@ this, status)); } - void FindRegistrationForId(int64 id, + void FindRegistrationForId(int64_t id, const GURL& origin, ServiceWorkerStatusCode expected_status) { ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI)); @@ -573,7 +578,7 @@ void FindRegistrationForIdOnIOThread(const base::Closure& done, ServiceWorkerStatusCode* result, - int64 id, + int64_t id, const GURL& origin) { ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO)); wrapper()->context()->storage()->FindRegistrationForId( @@ -588,7 +593,7 @@ registration_.get(), version_.get(), status); } - void RemoveLiveRegistrationOnIOThread(int64 id) { + void RemoveLiveRegistrationOnIOThread(int64_t id) { ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO)); wrapper()->context()->RemoveLiveRegistration(id); } @@ -609,7 +614,7 @@ void StoreOnIOThread(const base::Closure& done, ServiceWorkerStatusCode* result, - int64 version_id) { + int64_t version_id) { ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO)); ServiceWorkerVersion* version = wrapper()->context()->GetLiveVersion(version_id);
diff --git a/content/browser/service_worker/service_worker_cache_writer.h b/content/browser/service_worker/service_worker_cache_writer.h index dde71a6..e4c38ccd 100644 --- a/content/browser/service_worker/service_worker_cache_writer.h +++ b/content/browser/service_worker/service_worker_cache_writer.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CACHE_WRITER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CACHE_WRITER_H_ +#include <stddef.h> + #include <map> #include <set>
diff --git a/content/browser/service_worker/service_worker_cache_writer_unittest.cc b/content/browser/service_worker/service_worker_cache_writer_unittest.cc index 887cedc..96f6599c 100644 --- a/content/browser/service_worker/service_worker_cache_writer_unittest.cc +++ b/content/browser/service_worker/service_worker_cache_writer_unittest.cc
@@ -4,10 +4,13 @@ #include "content/browser/service_worker/service_worker_cache_writer.h" +#include <stddef.h> + #include <list> #include <queue> #include <string> +#include "base/macros.h" #include "base/stl_util.h" #include "content/browser/service_worker/service_worker_disk_cache.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/service_worker/service_worker_client_navigation_utils.cc b/content/browser/service_worker/service_worker_client_navigation_utils.cc index afba372e..5147bd1 100644 --- a/content/browser/service_worker/service_worker_client_navigation_utils.cc +++ b/content/browser/service_worker/service_worker_client_navigation_utils.cc
@@ -4,6 +4,7 @@ #include "content/browser/service_worker/service_worker_client_navigation_utils.h" +#include "base/macros.h" #include "content/browser/frame_host/frame_tree_node.h" #include "content/browser/frame_host/render_frame_host_impl.h" #include "content/browser/service_worker/service_worker_context_core.h"
diff --git a/content/browser/service_worker/service_worker_context_core.cc b/content/browser/service_worker/service_worker_context_core.cc index cddecdcb..487fdbd 100644 --- a/content/browser/service_worker/service_worker_context_core.cc +++ b/content/browser/service_worker/service_worker_context_core.cc
@@ -9,6 +9,7 @@ #include "base/bind_helpers.h" #include "base/files/file_path.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/thread_task_runner_handle.h" @@ -104,7 +105,7 @@ return; // Make a copy of live versions map because StopWorker() removes the version // from it when we were starting up and don't have a process yet. - const std::map<int64, ServiceWorkerVersion*> live_versions_copy = + const std::map<int64_t, ServiceWorkerVersion*> live_versions_copy = context->GetLiveVersions(); for (const auto& version_itr : live_versions_copy) { ServiceWorkerVersion* version(version_itr.second); @@ -523,7 +524,7 @@ void ServiceWorkerContextCore::UnregistrationComplete( const GURL& pattern, const ServiceWorkerContextCore::UnregistrationCallback& callback, - int64 registration_id, + int64_t registration_id, ServiceWorkerStatusCode status) { callback.Run(status); if (status == SERVICE_WORKER_OK && observer_list_.get()) { @@ -534,7 +535,7 @@ } ServiceWorkerRegistration* ServiceWorkerContextCore::GetLiveRegistration( - int64 id) { + int64_t id) { RegistrationsMap::iterator it = live_registrations_.find(id); return (it != live_registrations_.end()) ? it->second : NULL; } @@ -550,12 +551,11 @@ } } -void ServiceWorkerContextCore::RemoveLiveRegistration(int64 id) { +void ServiceWorkerContextCore::RemoveLiveRegistration(int64_t id) { live_registrations_.erase(id); } -ServiceWorkerVersion* ServiceWorkerContextCore::GetLiveVersion( - int64 id) { +ServiceWorkerVersion* ServiceWorkerContextCore::GetLiveVersion(int64_t id) { VersionMap::iterator it = live_versions_.find(id); return (it != live_versions_.end()) ? it->second : NULL; } @@ -601,17 +601,16 @@ } } -void ServiceWorkerContextCore::RemoveLiveVersion(int64 id) { +void ServiceWorkerContextCore::RemoveLiveVersion(int64_t id) { live_versions_.erase(id); } std::vector<ServiceWorkerRegistrationInfo> ServiceWorkerContextCore::GetAllLiveRegistrationInfo() { std::vector<ServiceWorkerRegistrationInfo> infos; - for (std::map<int64, ServiceWorkerRegistration*>::const_iterator iter = + for (std::map<int64_t, ServiceWorkerRegistration*>::const_iterator iter = live_registrations_.begin(); - iter != live_registrations_.end(); - ++iter) { + iter != live_registrations_.end(); ++iter) { infos.push_back(iter->second->GetInfo()); } return infos; @@ -620,10 +619,9 @@ std::vector<ServiceWorkerVersionInfo> ServiceWorkerContextCore::GetAllLiveVersionInfo() { std::vector<ServiceWorkerVersionInfo> infos; - for (std::map<int64, ServiceWorkerVersion*>::const_iterator iter = + for (std::map<int64_t, ServiceWorkerVersion*>::const_iterator iter = live_versions_.begin(); - iter != live_versions_.end(); - ++iter) { + iter != live_versions_.end(); ++iter) { infos.push_back(iter->second->GetInfo()); } return infos; @@ -636,7 +634,7 @@ protected_versions_[version->version_id()] = version; } -void ServiceWorkerContextCore::UnprotectVersion(int64 version_id) { +void ServiceWorkerContextCore::UnprotectVersion(int64_t version_id) { DCHECK(protected_versions_.find(version_id) != protected_versions_.end()); protected_versions_.erase(version_id); }
diff --git a/content/browser/service_worker/service_worker_context_core.h b/content/browser/service_worker/service_worker_context_core.h index 0db24473..f9448864 100644 --- a/content/browser/service_worker/service_worker_context_core.h +++ b/content/browser/service_worker/service_worker_context_core.h
@@ -5,12 +5,15 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_CORE_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_CORE_H_ +#include <stdint.h> + #include <map> #include <vector> #include "base/callback.h" #include "base/files/file_path.h" #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list_threadsafe.h" @@ -60,10 +63,10 @@ typedef base::Callback<void(ServiceWorkerStatusCode status)> StatusCallback; typedef base::Callback<void(ServiceWorkerStatusCode status, const std::string& status_message, - int64 registration_id)> RegistrationCallback; + int64_t registration_id)> RegistrationCallback; typedef base::Callback<void(ServiceWorkerStatusCode status, const std::string& status_message, - int64 registration_id)> UpdateCallback; + int64_t registration_id)> UpdateCallback; typedef base::Callback< void(ServiceWorkerStatusCode status)> UnregistrationCallback; typedef IDMap<ServiceWorkerProviderHost, IDMapOwnPointer> ProviderMap; @@ -213,17 +216,17 @@ // This class maintains collections of live instances, this class // does not own these object or influence their lifetime. - ServiceWorkerRegistration* GetLiveRegistration(int64 registration_id); + ServiceWorkerRegistration* GetLiveRegistration(int64_t registration_id); void AddLiveRegistration(ServiceWorkerRegistration* registration); - void RemoveLiveRegistration(int64 registration_id); - const std::map<int64, ServiceWorkerRegistration*>& GetLiveRegistrations() + void RemoveLiveRegistration(int64_t registration_id); + const std::map<int64_t, ServiceWorkerRegistration*>& GetLiveRegistrations() const { return live_registrations_; } - ServiceWorkerVersion* GetLiveVersion(int64 version_id); + ServiceWorkerVersion* GetLiveVersion(int64_t version_id); void AddLiveVersion(ServiceWorkerVersion* version); - void RemoveLiveVersion(int64 registration_id); - const std::map<int64, ServiceWorkerVersion*>& GetLiveVersions() const { + void RemoveLiveVersion(int64_t registration_id); + const std::map<int64_t, ServiceWorkerVersion*>& GetLiveVersions() const { return live_versions_; } @@ -242,7 +245,7 @@ // ProtectVersion holds a reference to |version| until UnprotectVersion is // called. void ProtectVersion(const scoped_refptr<ServiceWorkerVersion>& version); - void UnprotectVersion(int64 version_id); + void UnprotectVersion(int64_t version_id); // Returns new context-local unique ID. int GetNewServiceWorkerHandleId(); @@ -278,8 +281,8 @@ } private: - typedef std::map<int64, ServiceWorkerRegistration*> RegistrationsMap; - typedef std::map<int64, ServiceWorkerVersion*> VersionMap; + typedef std::map<int64_t, ServiceWorkerRegistration*> RegistrationsMap; + typedef std::map<int64_t, ServiceWorkerVersion*> VersionMap; ProviderMap* GetProviderMapForProcess(int process_id) { return providers_->Lookup(process_id); @@ -298,7 +301,7 @@ void UnregistrationComplete(const GURL& pattern, const UnregistrationCallback& callback, - int64 registration_id, + int64_t registration_id, ServiceWorkerStatusCode status); void DidGetAllRegistrationsForUnregisterForOrigin( @@ -324,9 +327,9 @@ scoped_ptr<ServiceWorkerStorage> storage_; scoped_refptr<EmbeddedWorkerRegistry> embedded_worker_registry_; scoped_ptr<ServiceWorkerJobCoordinator> job_coordinator_; - std::map<int64, ServiceWorkerRegistration*> live_registrations_; - std::map<int64, ServiceWorkerVersion*> live_versions_; - std::map<int64, scoped_refptr<ServiceWorkerVersion>> protected_versions_; + std::map<int64_t, ServiceWorkerRegistration*> live_registrations_; + std::map<int64_t, ServiceWorkerVersion*> live_versions_; + std::map<int64_t, scoped_refptr<ServiceWorkerVersion>> protected_versions_; // PlzNavigate // Map of ServiceWorkerNavigationHandleCores used for navigation requests.
diff --git a/content/browser/service_worker/service_worker_context_observer.h b/content/browser/service_worker/service_worker_context_observer.h index 1dcd73e..86c23854 100644 --- a/content/browser/service_worker/service_worker_context_observer.h +++ b/content/browser/service_worker/service_worker_context_observer.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_OBSERVER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_OBSERVER_H_ +#include <stdint.h> + #include "base/strings/string16.h" #include "base/time/time.h" #include "content/browser/service_worker/service_worker_version.h" @@ -45,39 +47,40 @@ const int line_number; const GURL source_url; }; - virtual void OnNewLiveRegistration(int64 registration_id, + virtual void OnNewLiveRegistration(int64_t registration_id, const GURL& pattern) {} - virtual void OnNewLiveVersion(int64 version_id, - int64 registration_id, + virtual void OnNewLiveVersion(int64_t version_id, + int64_t registration_id, const GURL& script_url) {} virtual void OnRunningStateChanged( - int64 version_id, + int64_t version_id, ServiceWorkerVersion::RunningStatus running_status) {} - virtual void OnVersionStateChanged(int64 version_id, + virtual void OnVersionStateChanged(int64_t version_id, ServiceWorkerVersion::Status status) {} virtual void OnMainScriptHttpResponseInfoSet( - int64 version_id, + int64_t version_id, base::Time script_response_time, base::Time script_last_modified) {} - virtual void OnErrorReported(int64 version_id, + virtual void OnErrorReported(int64_t version_id, int process_id, int thread_id, const ErrorInfo& info) {} - virtual void OnReportConsoleMessage(int64 version_id, + virtual void OnReportConsoleMessage(int64_t version_id, int process_id, int thread_id, const ConsoleMessage& message) {} - virtual void OnControlleeAdded(int64 version_id, + virtual void OnControlleeAdded(int64_t version_id, const std::string& uuid, int process_id, int route_id, ServiceWorkerProviderType type) {} - virtual void OnControlleeRemoved(int64 version_id, const std::string& uuid) {} - virtual void OnRegistrationStored(int64 registration_id, + virtual void OnControlleeRemoved(int64_t version_id, + const std::string& uuid) {} + virtual void OnRegistrationStored(int64_t registration_id, const GURL& pattern) {} - virtual void OnRegistrationDeleted(int64 registration_id, + virtual void OnRegistrationDeleted(int64_t registration_id, const GURL& pattern) {} - virtual void OnForceUpdateOnPageLoadChanged(int64 registration_id, + virtual void OnForceUpdateOnPageLoadChanged(int64_t registration_id, bool force_update_on_page_load) {} // Notified when the storage corruption recovery is completed and all stored
diff --git a/content/browser/service_worker/service_worker_context_request_handler.cc b/content/browser/service_worker/service_worker_context_request_handler.cc index beb79f4..8b76146 100644 --- a/content/browser/service_worker/service_worker_context_request_handler.cc +++ b/content/browser/service_worker/service_worker_context_request_handler.cc
@@ -60,7 +60,7 @@ context_->GetLiveRegistration(version_->registration_id()); DCHECK(registration); // We're registering or updating so must be there. - int64 resource_id = context_->storage()->NewResourceId(); + int64_t resource_id = context_->storage()->NewResourceId(); if (resource_id == kInvalidServiceWorkerResourceId) return NULL; @@ -78,7 +78,7 @@ ServiceWorkerVersion* stored_version = registration->waiting_version() ? registration->waiting_version() : registration->active_version(); - int64 incumbent_resource_id = kInvalidServiceWorkerResourceId; + int64_t incumbent_resource_id = kInvalidServiceWorkerResourceId; if (stored_version && stored_version->script_url() == request->url()) { incumbent_resource_id = stored_version->script_cache_map()->LookupResourceId(request->url()); @@ -88,7 +88,7 @@ extra_load_flags, resource_id, incumbent_resource_id); } - int64 resource_id = kInvalidServiceWorkerResourceId; + int64_t resource_id = kInvalidServiceWorkerResourceId; if (ShouldReadFromScriptCache(request->url(), &resource_id)) { return new ServiceWorkerReadFromCacheJob(request, network_delegate, resource_type_, context_, version_, @@ -121,7 +121,7 @@ bool ServiceWorkerContextRequestHandler::ShouldReadFromScriptCache( const GURL& url, - int64* resource_id_out) { + int64_t* resource_id_out) { // We don't read from the script cache until the version is INSTALLED. if (version_->status() == ServiceWorkerVersion::NEW || version_->status() == ServiceWorkerVersion::INSTALLING)
diff --git a/content/browser/service_worker/service_worker_context_request_handler.h b/content/browser/service_worker/service_worker_context_request_handler.h index e936462..e86fb833 100644 --- a/content/browser/service_worker/service_worker_context_request_handler.h +++ b/content/browser/service_worker/service_worker_context_request_handler.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_REQUEST_HANDLER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_REQUEST_HANDLER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "content/browser/service_worker/service_worker_request_handler.h" namespace content { @@ -33,7 +36,7 @@ private: bool ShouldAddToScriptCache(const GURL& url); - bool ShouldReadFromScriptCache(const GURL& url, int64* resource_id_out); + bool ShouldReadFromScriptCache(const GURL& url, int64_t* resource_id_out); scoped_refptr<ServiceWorkerVersion> version_;
diff --git a/content/browser/service_worker/service_worker_context_unittest.cc b/content/browser/service_worker/service_worker_context_unittest.cc index 78c8eb9..a9c89847 100644 --- a/content/browser/service_worker/service_worker_context_unittest.cc +++ b/content/browser/service_worker/service_worker_context_unittest.cc
@@ -4,6 +4,8 @@ #include "content/public/browser/service_worker_context.h" +#include <stdint.h> + #include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" @@ -27,10 +29,10 @@ namespace { void SaveResponseCallback(bool* called, - int64* store_registration_id, + int64_t* store_registration_id, ServiceWorkerStatusCode status, const std::string& status_message, - int64 registration_id) { + int64_t registration_id) { EXPECT_EQ(SERVICE_WORKER_OK, status) << ServiceWorkerStatusToString(status); *called = true; *store_registration_id = registration_id; @@ -38,7 +40,7 @@ ServiceWorkerContextCore::RegistrationCallback MakeRegisteredCallback( bool* called, - int64* store_registration_id) { + int64_t* store_registration_id) { return base::Bind(&SaveResponseCallback, called, store_registration_id); } @@ -110,7 +112,7 @@ struct NotificationLog { NotificationType type; GURL pattern; - int64 registration_id; + int64_t registration_id; }; } // namespace @@ -129,7 +131,7 @@ void TearDown() override { helper_.reset(); } // ServiceWorkerContextObserver overrides. - void OnRegistrationStored(int64 registration_id, + void OnRegistrationStored(int64_t registration_id, const GURL& pattern) override { NotificationLog log; log.type = REGISTRATION_STORED; @@ -137,7 +139,7 @@ log.registration_id = registration_id; notifications_.push_back(log); } - void OnRegistrationDeleted(int64 registration_id, + void OnRegistrationDeleted(int64_t registration_id, const GURL& pattern) override { NotificationLog log; log.type = REGISTRATION_DELETED; @@ -164,7 +166,7 @@ GURL pattern("http://www.example.com/"); GURL script_url("http://www.example.com/service_worker.js"); - int64 registration_id = kInvalidServiceWorkerRegistrationId; + int64_t registration_id = kInvalidServiceWorkerRegistrationId; bool called = false; context()->RegisterServiceWorker( pattern, @@ -212,7 +214,7 @@ helper_.reset(); // Make sure the process lookups stay overridden. helper_.reset(new RejectInstallTestHelper); helper_->context_wrapper()->AddObserver(this); - int64 registration_id = kInvalidServiceWorkerRegistrationId; + int64_t registration_id = kInvalidServiceWorkerRegistrationId; bool called = false; context()->RegisterServiceWorker( pattern, @@ -259,7 +261,7 @@ helper_.reset(); helper_.reset(new RejectActivateTestHelper); helper_->context_wrapper()->AddObserver(this); - int64 registration_id = kInvalidServiceWorkerRegistrationId; + int64_t registration_id = kInvalidServiceWorkerRegistrationId; bool called = false; context()->RegisterServiceWorker( pattern, script_url, NULL, @@ -297,7 +299,7 @@ GURL pattern("http://www.example.com/"); bool called = false; - int64 registration_id = kInvalidServiceWorkerRegistrationId; + int64_t registration_id = kInvalidServiceWorkerRegistrationId; context()->RegisterServiceWorker( pattern, GURL("http://www.example.com/service_worker.js"), @@ -343,10 +345,10 @@ GURL origin3_p1("http://www.other.com/"); bool called = false; - int64 registration_id1 = kInvalidServiceWorkerRegistrationId; - int64 registration_id2 = kInvalidServiceWorkerRegistrationId; - int64 registration_id3 = kInvalidServiceWorkerRegistrationId; - int64 registration_id4 = kInvalidServiceWorkerRegistrationId; + int64_t registration_id1 = kInvalidServiceWorkerRegistrationId; + int64_t registration_id2 = kInvalidServiceWorkerRegistrationId; + int64_t registration_id3 = kInvalidServiceWorkerRegistrationId; + int64_t registration_id4 = kInvalidServiceWorkerRegistrationId; context()->RegisterServiceWorker( origin1_p1, GURL("http://www.example.com/service_worker.js"), @@ -443,7 +445,7 @@ GURL pattern("http://www.example.com/"); bool called = false; - int64 old_registration_id = kInvalidServiceWorkerRegistrationId; + int64_t old_registration_id = kInvalidServiceWorkerRegistrationId; context()->RegisterServiceWorker( pattern, GURL("http://www.example.com/service_worker.js"), @@ -456,7 +458,7 @@ EXPECT_NE(kInvalidServiceWorkerRegistrationId, old_registration_id); called = false; - int64 new_registration_id = kInvalidServiceWorkerRegistrationId; + int64_t new_registration_id = kInvalidServiceWorkerRegistrationId; context()->RegisterServiceWorker( pattern, GURL("http://www.example.com/service_worker_new.js"), @@ -486,7 +488,7 @@ GURL script_url("http://www.example.com/service_worker.js"); bool called = false; - int64 old_registration_id = kInvalidServiceWorkerRegistrationId; + int64_t old_registration_id = kInvalidServiceWorkerRegistrationId; context()->RegisterServiceWorker( pattern, script_url, @@ -499,7 +501,7 @@ EXPECT_NE(kInvalidServiceWorkerRegistrationId, old_registration_id); called = false; - int64 new_registration_id = kInvalidServiceWorkerRegistrationId; + int64_t new_registration_id = kInvalidServiceWorkerRegistrationId; context()->RegisterServiceWorker( pattern, script_url, @@ -619,7 +621,7 @@ helper_->context_wrapper()->AddObserver(this); } - int64 registration_id = kInvalidServiceWorkerRegistrationId; + int64_t registration_id = kInvalidServiceWorkerRegistrationId; bool called = false; context()->RegisterServiceWorker( pattern,
diff --git a/content/browser/service_worker/service_worker_context_watcher.cc b/content/browser/service_worker/service_worker_context_watcher.cc index 9c0a24c..cee965b 100644 --- a/content/browser/service_worker/service_worker_context_watcher.cc +++ b/content/browser/service_worker/service_worker_context_watcher.cc
@@ -63,7 +63,7 @@ DCHECK_CURRENTLY_ON(BrowserThread::IO); context_->AddObserver(this); - base::ScopedPtrHashMap<int64, scoped_ptr<ServiceWorkerRegistrationInfo>> + base::ScopedPtrHashMap<int64_t, scoped_ptr<ServiceWorkerRegistrationInfo>> registration_info_map; for (const auto& registration : stored_registrations) StoreRegistrationInfo(registration, ®istration_info_map); @@ -105,7 +105,7 @@ void ServiceWorkerContextWatcher::StoreRegistrationInfo( const ServiceWorkerRegistrationInfo& registration_info, - base::ScopedPtrHashMap<int64, scoped_ptr<ServiceWorkerRegistrationInfo>>* + base::ScopedPtrHashMap<int64_t, scoped_ptr<ServiceWorkerRegistrationInfo>>* info_map) { DCHECK_CURRENTLY_ON(BrowserThread::IO); if (registration_info.registration_id == kInvalidServiceWorkerRegistrationId) @@ -129,7 +129,7 @@ } void ServiceWorkerContextWatcher::SendRegistrationInfo( - int64 registration_id, + int64_t registration_id, const GURL& pattern, ServiceWorkerRegistrationInfo::DeleteFlag delete_flag) { std::vector<ServiceWorkerRegistrationInfo> registrations; @@ -154,14 +154,14 @@ base::Bind(version_callback_, versions)); } -void ServiceWorkerContextWatcher::OnNewLiveRegistration(int64 registration_id, +void ServiceWorkerContextWatcher::OnNewLiveRegistration(int64_t registration_id, const GURL& pattern) { SendRegistrationInfo(registration_id, pattern, ServiceWorkerRegistrationInfo::IS_NOT_DELETED); } -void ServiceWorkerContextWatcher::OnNewLiveVersion(int64 version_id, - int64 registration_id, +void ServiceWorkerContextWatcher::OnNewLiveVersion(int64_t version_id, + int64_t registration_id, const GURL& script_url) { if (ServiceWorkerVersionInfo* version = version_info_map_.get(version_id)) { DCHECK_EQ(version->registration_id, registration_id); @@ -179,7 +179,7 @@ } void ServiceWorkerContextWatcher::OnRunningStateChanged( - int64 version_id, + int64_t version_id, content::ServiceWorkerVersion::RunningStatus running_status) { ServiceWorkerVersionInfo* version = version_info_map_.get(version_id); DCHECK(version); @@ -192,7 +192,7 @@ } void ServiceWorkerContextWatcher::OnVersionStateChanged( - int64 version_id, + int64_t version_id, content::ServiceWorkerVersion::Status status) { ServiceWorkerVersionInfo* version = version_info_map_.get(version_id); DCHECK(version); @@ -205,7 +205,7 @@ } void ServiceWorkerContextWatcher::OnMainScriptHttpResponseInfoSet( - int64 version_id, + int64_t version_id, base::Time script_response_time, base::Time script_last_modified) { ServiceWorkerVersionInfo* version = version_info_map_.get(version_id); @@ -215,11 +215,11 @@ SendVersionInfo(*version); } -void ServiceWorkerContextWatcher::OnErrorReported(int64 version_id, +void ServiceWorkerContextWatcher::OnErrorReported(int64_t version_id, int process_id, int thread_id, const ErrorInfo& info) { - int64 registration_id = kInvalidServiceWorkerRegistrationId; + int64_t registration_id = kInvalidServiceWorkerRegistrationId; if (ServiceWorkerVersionInfo* version = version_info_map_.get(version_id)) registration_id = version->registration_id; BrowserThread::PostTask( @@ -228,13 +228,13 @@ } void ServiceWorkerContextWatcher::OnReportConsoleMessage( - int64 version_id, + int64_t version_id, int process_id, int thread_id, const ConsoleMessage& message) { if (message.message_level != CONSOLE_MESSAGE_LEVEL_ERROR) return; - int64 registration_id = kInvalidServiceWorkerRegistrationId; + int64_t registration_id = kInvalidServiceWorkerRegistrationId; if (ServiceWorkerVersionInfo* version = version_info_map_.get(version_id)) registration_id = version->registration_id; BrowserThread::PostTask( @@ -245,7 +245,7 @@ } void ServiceWorkerContextWatcher::OnControlleeAdded( - int64 version_id, + int64_t version_id, const std::string& uuid, int process_id, int route_id, @@ -257,7 +257,7 @@ SendVersionInfo(*version); } -void ServiceWorkerContextWatcher::OnControlleeRemoved(int64 version_id, +void ServiceWorkerContextWatcher::OnControlleeRemoved(int64_t version_id, const std::string& uuid) { ServiceWorkerVersionInfo* version = version_info_map_.get(version_id); if (!version) @@ -266,20 +266,20 @@ SendVersionInfo(*version); } -void ServiceWorkerContextWatcher::OnRegistrationStored(int64 registration_id, +void ServiceWorkerContextWatcher::OnRegistrationStored(int64_t registration_id, const GURL& pattern) { SendRegistrationInfo(registration_id, pattern, ServiceWorkerRegistrationInfo::IS_NOT_DELETED); } -void ServiceWorkerContextWatcher::OnRegistrationDeleted(int64 registration_id, +void ServiceWorkerContextWatcher::OnRegistrationDeleted(int64_t registration_id, const GURL& pattern) { SendRegistrationInfo(registration_id, pattern, ServiceWorkerRegistrationInfo::IS_DELETED); } void ServiceWorkerContextWatcher::OnForceUpdateOnPageLoadChanged( - int64 registration_id, + int64_t registration_id, bool force_update_on_page_load) { ServiceWorkerRegistration* registration = context_->GetLiveRegistration(registration_id);
diff --git a/content/browser/service_worker/service_worker_context_watcher.h b/content/browser/service_worker/service_worker_context_watcher.h index a7b430e..506418ba 100644 --- a/content/browser/service_worker/service_worker_context_watcher.h +++ b/content/browser/service_worker/service_worker_context_watcher.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_WATCHER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_WATCHER_H_ +#include <stdint.h> + #include <vector> #include "base/callback.h" @@ -27,8 +29,8 @@ WorkerRegistrationUpdatedCallback; typedef base::Callback<void(const std::vector<ServiceWorkerVersionInfo>&)> WorkerVersionUpdatedCallback; - typedef base::Callback<void(int64 /* registration_id */, - int64 /* version_id */, + typedef base::Callback<void(int64_t /* registration_id */, + int64_t /* version_id */, const ErrorInfo&)> WorkerErrorReportedCallback; ServiceWorkerContextWatcher( @@ -50,54 +52,56 @@ void StoreRegistrationInfo( const ServiceWorkerRegistrationInfo& registration, - base::ScopedPtrHashMap<int64, scoped_ptr<ServiceWorkerRegistrationInfo>>* + base::ScopedPtrHashMap<int64_t, + scoped_ptr<ServiceWorkerRegistrationInfo>>* info_map); void StoreVersionInfo(const ServiceWorkerVersionInfo& version); void SendRegistrationInfo( - int64 registration_id, + int64_t registration_id, const GURL& pattern, ServiceWorkerRegistrationInfo::DeleteFlag delete_flag); void SendVersionInfo(const ServiceWorkerVersionInfo& version); // ServiceWorkerContextObserver implements - void OnNewLiveRegistration(int64 registration_id, + void OnNewLiveRegistration(int64_t registration_id, const GURL& pattern) override; - void OnNewLiveVersion(int64 version_id, - int64 registration_id, + void OnNewLiveVersion(int64_t version_id, + int64_t registration_id, const GURL& script_url) override; void OnRunningStateChanged( - int64 version_id, + int64_t version_id, content::ServiceWorkerVersion::RunningStatus running_status) override; void OnVersionStateChanged( - int64 version_id, + int64_t version_id, content::ServiceWorkerVersion::Status status) override; void OnMainScriptHttpResponseInfoSet( - int64 version_id, + int64_t version_id, base::Time script_response_time, base::Time script_last_modified) override; - void OnErrorReported(int64 version_id, + void OnErrorReported(int64_t version_id, int process_id, int thread_id, const ErrorInfo& info) override; - void OnReportConsoleMessage(int64 version_id, + void OnReportConsoleMessage(int64_t version_id, int process_id, int thread_id, const ConsoleMessage& message) override; - void OnControlleeAdded(int64 version_id, + void OnControlleeAdded(int64_t version_id, const std::string& uuid, int process_id, int route_id, ServiceWorkerProviderType type) override; - void OnControlleeRemoved(int64 version_id, const std::string& uuid) override; - void OnRegistrationStored(int64 registration_id, + void OnControlleeRemoved(int64_t version_id, + const std::string& uuid) override; + void OnRegistrationStored(int64_t registration_id, const GURL& pattern) override; - void OnRegistrationDeleted(int64 registration_id, + void OnRegistrationDeleted(int64_t registration_id, const GURL& pattern) override; - void OnForceUpdateOnPageLoadChanged(int64 registration_id, + void OnForceUpdateOnPageLoadChanged(int64_t registration_id, bool force_update_on_page_load) override; - base::ScopedPtrHashMap<int64, scoped_ptr<ServiceWorkerVersionInfo>> + base::ScopedPtrHashMap<int64_t, scoped_ptr<ServiceWorkerVersionInfo>> version_info_map_; scoped_refptr<ServiceWorkerContextWrapper> context_; WorkerRegistrationUpdatedCallback registration_callback_;
diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc index da6970e..81a6416f6 100644 --- a/content/browser/service_worker/service_worker_context_wrapper.cc +++ b/content/browser/service_worker/service_worker_context_wrapper.cc
@@ -170,7 +170,7 @@ const ServiceWorkerContext::ResultCallback& continuation, ServiceWorkerStatusCode status, const std::string& status_message, - int64 registration_id) { + int64_t registration_id) { DCHECK_CURRENTLY_ON(BrowserThread::IO); BrowserThread::PostTask( BrowserThread::UI,
diff --git a/content/browser/service_worker/service_worker_context_wrapper.h b/content/browser/service_worker/service_worker_context_wrapper.h index 93cd72d..a81e888 100644 --- a/content/browser/service_worker/service_worker_context_wrapper.h +++ b/content/browser/service_worker/service_worker_context_wrapper.h
@@ -5,9 +5,12 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_WRAPPER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_WRAPPER_H_ +#include <stdint.h> + #include <vector> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "content/browser/service_worker/service_worker_context_core.h"
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.cc b/content/browser/service_worker/service_worker_controllee_request_handler.cc index 3c3cb45..85de5313 100644 --- a/content/browser/service_worker/service_worker_controllee_request_handler.cc +++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
@@ -298,7 +298,7 @@ const scoped_refptr<ServiceWorkerRegistration>& original_registration, ServiceWorkerStatusCode status, const std::string& status_message, - int64 registration_id) { + int64_t registration_id) { DCHECK(force_update_started_); // The job may have been canceled and then destroyed before this was invoked.
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.h b/content/browser/service_worker/service_worker_controllee_request_handler.h index dca78ef..1526385a 100644 --- a/content/browser/service_worker/service_worker_controllee_request_handler.h +++ b/content/browser/service_worker/service_worker_controllee_request_handler.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTROLLEE_REQUEST_HANDLER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTROLLEE_REQUEST_HANDLER_H_ +#include <stdint.h> + #include "base/gtest_prod_util.h" #include "base/macros.h" #include "base/memory/ref_counted.h" @@ -75,7 +77,7 @@ const scoped_refptr<ServiceWorkerRegistration>& original_registration, ServiceWorkerStatusCode status, const std::string& status_message, - int64 registration_id); + int64_t registration_id); void OnUpdatedVersionStatusChanged( const scoped_refptr<ServiceWorkerRegistration>& registration, const scoped_refptr<ServiceWorkerVersion>& version);
diff --git a/content/browser/service_worker/service_worker_database.cc b/content/browser/service_worker/service_worker_database.cc index ac96e43..cf6e941 100644 --- a/content/browser/service_worker/service_worker_database.cc +++ b/content/browser/service_worker/service_worker_database.cc
@@ -28,7 +28,7 @@ // ======================= // // NOTE -// - int64 value is serialized as a string by base::Int64ToString(). +// - int64_t value is serialized as a string by base::Int64ToString(). // - GURL value is serialized as a string by GURL::spec(). // // Version 1 (in sorted order) @@ -36,43 +36,43 @@ // value: "1" // // key: "INITDATA_NEXT_REGISTRATION_ID" -// value: <int64 'next_available_registration_id'> +// value: <int64_t 'next_available_registration_id'> // // key: "INITDATA_NEXT_RESOURCE_ID" -// value: <int64 'next_available_resource_id'> +// value: <int64_t 'next_available_resource_id'> // // key: "INITDATA_NEXT_VERSION_ID" -// value: <int64 'next_available_version_id'> +// value: <int64_t 'next_available_version_id'> // // key: "INITDATA_UNIQUE_ORIGIN:" + <GURL 'origin'> // value: <empty> // -// key: "PRES:" + <int64 'purgeable_resource_id'> +// key: "PRES:" + <int64_t 'purgeable_resource_id'> // value: <empty> // -// key: "REG:" + <GURL 'origin'> + '\x00' + <int64 'registration_id'> +// key: "REG:" + <GURL 'origin'> + '\x00' + <int64_t 'registration_id'> // (ex. "REG:http://example.com\x00123456") // value: <ServiceWorkerRegistrationData serialized as a string> // // key: "REG_HAS_USER_DATA:" + <std::string 'user_data_name'> + '\x00' -// + <int64 'registration_id'> +// + <int64_t 'registration_id'> // value: <empty> // -// key: "REG_USER_DATA:" + <int64 'registration_id'> + '\x00' +// key: "REG_USER_DATA:" + <int64_t 'registration_id'> + '\x00' // + <std::string user_data_name> // (ex. "REG_USER_DATA:123456\x00foo_bar") // value: <std::string user_data> // -// key: "RES:" + <int64 'version_id'> + '\x00' + <int64 'resource_id'> +// key: "RES:" + <int64_t 'version_id'> + '\x00' + <int64_t 'resource_id'> // (ex. "RES:123456\x00654321") // value: <ServiceWorkerResourceRecord serialized as a string> // -// key: "URES:" + <int64 'uncommitted_resource_id'> +// key: "URES:" + <int64_t 'uncommitted_resource_id'> // value: <empty> // // Version 2 // -// key: "REGID_TO_ORIGIN:" + <int64 'registration_id'> +// key: "REGID_TO_ORIGIN:" + <int64_t 'registration_id'> // value: <GURL 'origin'> // // OBSOLETE: http://crbug.com/539713 @@ -110,7 +110,7 @@ const char kUncommittedResIdKeyPrefix[] = "URES:"; const char kPurgeableResIdKeyPrefix[] = "PRES:"; -const int64 kCurrentSchemaVersion = 2; +const int64_t kCurrentSchemaVersion = 2; class ServiceWorkerEnv : public leveldb_env::ChromiumEnv { public: @@ -136,21 +136,19 @@ origin.GetOrigin().spec().c_str(), kKeySeparator); } -std::string CreateRegistrationKey(int64 registration_id, - const GURL& origin) { +std::string CreateRegistrationKey(int64_t registration_id, const GURL& origin) { return CreateRegistrationKeyPrefix(origin) .append(base::Int64ToString(registration_id)); } -std::string CreateResourceRecordKeyPrefix(int64 version_id) { +std::string CreateResourceRecordKeyPrefix(int64_t version_id) { return base::StringPrintf("%s%s%c", kResKeyPrefix, base::Int64ToString(version_id).c_str(), kKeySeparator); } -std::string CreateResourceRecordKey(int64 version_id, - int64 resource_id) { +std::string CreateResourceRecordKey(int64_t version_id, int64_t resource_id) { return CreateResourceRecordKeyPrefix(version_id).append( base::Int64ToString(resource_id)); } @@ -165,19 +163,19 @@ origin.GetOrigin().spec().c_str()); } -std::string CreateResourceIdKey(const char* key_prefix, int64 resource_id) { +std::string CreateResourceIdKey(const char* key_prefix, int64_t resource_id) { return base::StringPrintf( "%s%s", key_prefix, base::Int64ToString(resource_id).c_str()); } -std::string CreateUserDataKeyPrefix(int64 registration_id) { +std::string CreateUserDataKeyPrefix(int64_t registration_id) { return base::StringPrintf("%s%s%c", kRegUserDataKeyPrefix, base::Int64ToString(registration_id).c_str(), kKeySeparator); } -std::string CreateUserDataKey(int64 registration_id, +std::string CreateUserDataKey(int64_t registration_id, const std::string& user_data_name) { return CreateUserDataKeyPrefix(registration_id).append(user_data_name); } @@ -187,13 +185,13 @@ user_data_name.c_str(), kKeySeparator); } -std::string CreateHasUserDataKey(int64 registration_id, +std::string CreateHasUserDataKey(int64_t registration_id, const std::string& user_data_name) { return CreateHasUserDataKeyPrefix(user_data_name) .append(base::Int64ToString(registration_id)); } -std::string CreateRegistrationIdToOriginKey(int64 registration_id) { +std::string CreateRegistrationIdToOriginKey(int64_t registration_id) { return base::StringPrintf("%s%s", kRegIdToOriginKeyPrefix, base::Int64ToString(registration_id).c_str()); } @@ -229,7 +227,7 @@ void PutResourceRecordToBatch( const ServiceWorkerDatabase::ResourceRecord& input, - int64 version_id, + int64_t version_id, leveldb::WriteBatch* batch) { DCHECK(batch); DCHECK_GE(input.size_bytes, 0); @@ -252,7 +250,7 @@ batch->Put(CreateUniqueOriginKey(origin), ""); } -void PutPurgeableResourceIdToBatch(int64 resource_id, +void PutPurgeableResourceIdToBatch(int64_t resource_id, leveldb::WriteBatch* batch) { // Value should be empty. batch->Put(CreateResourceIdKey(kPurgeableResIdKeyPrefix, resource_id), ""); @@ -264,11 +262,10 @@ batch->Put(CreateForeignFetchOriginKey(origin), ""); } -ServiceWorkerDatabase::Status ParseId( - const std::string& serialized, - int64* out) { +ServiceWorkerDatabase::Status ParseId(const std::string& serialized, + int64_t* out) { DCHECK(out); - int64 id; + int64_t id; if (!base::StringToInt64(serialized, &id) || id < 0) return ServiceWorkerDatabase::STATUS_ERROR_CORRUPTED; *out = id; @@ -277,10 +274,10 @@ ServiceWorkerDatabase::Status ParseDatabaseVersion( const std::string& serialized, - int64* out) { + int64_t* out) { DCHECK(out); const int kFirstValidVersion = 1; - int64 version; + int64_t version; if (!base::StringToInt64(serialized, &version) || version < kFirstValidVersion) { return ServiceWorkerDatabase::STATUS_ERROR_CORRUPTED; @@ -433,9 +430,9 @@ } ServiceWorkerDatabase::Status ServiceWorkerDatabase::GetNextAvailableIds( - int64* next_avail_registration_id, - int64* next_avail_version_id, - int64* next_avail_resource_id) { + int64_t* next_avail_registration_id, + int64_t* next_avail_version_id, + int64_t* next_avail_resource_id) { DCHECK(sequence_checker_.CalledOnValidSequencedThread()); DCHECK(next_avail_registration_id); DCHECK(next_avail_version_id); @@ -641,7 +638,7 @@ } ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadRegistration( - int64 registration_id, + int64_t registration_id, const GURL& origin, RegistrationData* registration, std::vector<ResourceRecord>* resources) { @@ -673,7 +670,7 @@ } ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadRegistrationOrigin( - int64 registration_id, + int64_t registration_id, GURL* origin) { DCHECK(sequence_checker_.CalledOnValidSequencedThread()); DCHECK(origin); @@ -710,7 +707,7 @@ const RegistrationData& registration, const std::vector<ResourceRecord>& resources, RegistrationData* old_registration, - std::vector<int64>* newly_purgeable_resources) { + std::vector<int64_t>* newly_purgeable_resources) { DCHECK(sequence_checker_.CalledOnValidSequencedThread()); DCHECK(old_registration); DCHECK(!resources.empty()); @@ -738,7 +735,7 @@ registration.scope.GetOrigin().spec()); // Used for avoiding multiple writes for the same resource id or url. - std::set<int64> pushed_resources; + std::set<int64_t> pushed_resources; std::set<GURL> pushed_urls; for (std::vector<ResourceRecord>::const_iterator itr = resources.begin(); itr != resources.end(); ++itr) { @@ -775,10 +772,11 @@ // Currently resource sharing across versions and registrations is not // supported, so resource ids should not be overlapped between // |registration| and |old_registration|. - std::set<int64> deleted_resources(newly_purgeable_resources->begin(), - newly_purgeable_resources->end()); - DCHECK(base::STLSetIntersection<std::set<int64> >( - pushed_resources, deleted_resources).empty()); + std::set<int64_t> deleted_resources(newly_purgeable_resources->begin(), + newly_purgeable_resources->end()); + DCHECK(base::STLSetIntersection<std::set<int64_t>>(pushed_resources, + deleted_resources) + .empty()); // If old registration had foreign fetch scopes, but new registration // doesn't, the origin might have to be removed from the list of origins @@ -810,7 +808,7 @@ } ServiceWorkerDatabase::Status ServiceWorkerDatabase::UpdateVersionToActive( - int64 registration_id, + int64_t registration_id, const GURL& origin) { DCHECK(sequence_checker_.CalledOnValidSequencedThread()); Status status = LazyOpen(false); @@ -834,7 +832,7 @@ } ServiceWorkerDatabase::Status ServiceWorkerDatabase::UpdateLastCheckTime( - int64 registration_id, + int64_t registration_id, const GURL& origin, const base::Time& time) { DCHECK(sequence_checker_.CalledOnValidSequencedThread()); @@ -859,10 +857,10 @@ } ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteRegistration( - int64 registration_id, + int64_t registration_id, const GURL& origin, RegistrationData* deleted_version, - std::vector<int64>* newly_purgeable_resources) { + std::vector<int64_t>* newly_purgeable_resources) { DCHECK(sequence_checker_.CalledOnValidSequencedThread()); DCHECK(deleted_version); deleted_version->version_id = kInvalidServiceWorkerVersionId; @@ -926,7 +924,7 @@ } ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadUserData( - int64 registration_id, + int64_t registration_id, const std::string& user_data_name, std::string* user_data) { DCHECK(sequence_checker_.CalledOnValidSequencedThread()); @@ -949,7 +947,7 @@ } ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteUserData( - int64 registration_id, + int64_t registration_id, const GURL& origin, const std::string& user_data_name, const std::string& user_data) { @@ -976,7 +974,7 @@ } ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteUserData( - int64 registration_id, + int64_t registration_id, const std::string& user_data_name) { DCHECK(sequence_checker_.CalledOnValidSequencedThread()); DCHECK_NE(kInvalidServiceWorkerRegistrationId, registration_id); @@ -997,7 +995,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadUserDataForAllRegistrations( const std::string& user_data_name, - std::vector<std::pair<int64, std::string>>* user_data) { + std::vector<std::pair<int64_t, std::string>>* user_data) { DCHECK(sequence_checker_.CalledOnValidSequencedThread()); DCHECK(user_data->empty()); @@ -1023,7 +1021,7 @@ break; } - int64 registration_id; + int64_t registration_id; status = ParseId(registration_id_string, ®istration_id); if (status != STATUS_OK) { HandleReadResult(FROM_HERE, status); @@ -1047,13 +1045,14 @@ return status; } -ServiceWorkerDatabase::Status -ServiceWorkerDatabase::GetUncommittedResourceIds(std::set<int64>* ids) { +ServiceWorkerDatabase::Status ServiceWorkerDatabase::GetUncommittedResourceIds( + std::set<int64_t>* ids) { return ReadResourceIds(kUncommittedResIdKeyPrefix, ids); } ServiceWorkerDatabase::Status -ServiceWorkerDatabase::WriteUncommittedResourceIds(const std::set<int64>& ids) { +ServiceWorkerDatabase::WriteUncommittedResourceIds( + const std::set<int64_t>& ids) { leveldb::WriteBatch batch; Status status = WriteResourceIdsInBatch(kUncommittedResIdKeyPrefix, ids, &batch); @@ -1062,13 +1061,13 @@ return WriteBatch(&batch); } -ServiceWorkerDatabase::Status -ServiceWorkerDatabase::GetPurgeableResourceIds(std::set<int64>* ids) { +ServiceWorkerDatabase::Status ServiceWorkerDatabase::GetPurgeableResourceIds( + std::set<int64_t>* ids) { return ReadResourceIds(kPurgeableResIdKeyPrefix, ids); } -ServiceWorkerDatabase::Status -ServiceWorkerDatabase::ClearPurgeableResourceIds(const std::set<int64>& ids) { +ServiceWorkerDatabase::Status ServiceWorkerDatabase::ClearPurgeableResourceIds( + const std::set<int64_t>& ids) { leveldb::WriteBatch batch; Status status = DeleteResourceIdsInBatch(kPurgeableResIdKeyPrefix, ids, &batch); @@ -1079,7 +1078,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::PurgeUncommittedResourceIds( - const std::set<int64>& ids) { + const std::set<int64_t>& ids) { leveldb::WriteBatch batch; Status status = DeleteResourceIdsInBatch( kUncommittedResIdKeyPrefix, ids, &batch); @@ -1093,7 +1092,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteAllDataForOrigins( const std::set<GURL>& origins, - std::vector<int64>* newly_purgeable_resources) { + std::vector<int64_t>* newly_purgeable_resources) { DCHECK(sequence_checker_.CalledOnValidSequencedThread()); Status status = LazyOpen(false); if (IsNewOrNonexistentDatabase(status)) @@ -1194,7 +1193,7 @@ } db_.reset(db); - int64 db_version; + int64_t db_version; status = ReadDatabaseVersion(&db_version); if (status != STATUS_OK) return status; @@ -1255,7 +1254,7 @@ return status; } - int64 registration_id; + int64_t registration_id; status = ParseId(parts[1], ®istration_id); if (status != STATUS_OK) { HandleReadResult(FROM_HERE, status); @@ -1276,7 +1275,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadNextAvailableId( const char* id_key, - int64* next_avail_id) { + int64_t* next_avail_id) { DCHECK(id_key); DCHECK(next_avail_id); @@ -1299,7 +1298,7 @@ } ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadRegistrationData( - int64 registration_id, + int64_t registration_id, const GURL& origin, RegistrationData* registration) { DCHECK(registration); @@ -1321,7 +1320,7 @@ } ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadResourceRecords( - int64 version_id, + int64_t version_id, std::vector<ResourceRecord>* resources) { DCHECK(resources->empty()); @@ -1355,8 +1354,8 @@ } ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteResourceRecords( - int64 version_id, - std::vector<int64>* newly_purgeable_resources, + int64_t version_id, + std::vector<int64_t>* newly_purgeable_resources, leveldb::WriteBatch* batch) { DCHECK(batch); @@ -1376,7 +1375,7 @@ if (!RemovePrefix(key, prefix, &unprefixed)) break; - int64 resource_id; + int64_t resource_id; status = ParseId(unprefixed, &resource_id); if (status != STATUS_OK) { HandleReadResult(FROM_HERE, status); @@ -1398,7 +1397,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadResourceIds( const char* id_key_prefix, - std::set<int64>* ids) { + std::set<int64_t>* ids) { DCHECK(sequence_checker_.CalledOnValidSequencedThread()); DCHECK(id_key_prefix); DCHECK(ids->empty()); @@ -1422,7 +1421,7 @@ if (!RemovePrefix(itr->key().ToString(), id_key_prefix, &unprefixed)) break; - int64 resource_id; + int64_t resource_id; status = ParseId(unprefixed, &resource_id); if (status != STATUS_OK) { HandleReadResult(FROM_HERE, status); @@ -1438,7 +1437,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteResourceIdsInBatch( const char* id_key_prefix, - const std::set<int64>& ids, + const std::set<int64_t>& ids, leveldb::WriteBatch* batch) { DCHECK(sequence_checker_.CalledOnValidSequencedThread()); DCHECK(id_key_prefix); @@ -1449,8 +1448,8 @@ if (ids.empty()) return STATUS_OK; - for (std::set<int64>::const_iterator itr = ids.begin(); - itr != ids.end(); ++itr) { + for (std::set<int64_t>::const_iterator itr = ids.begin(); itr != ids.end(); + ++itr) { // Value should be empty. batch->Put(CreateResourceIdKey(id_key_prefix, *itr), ""); } @@ -1461,7 +1460,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteResourceIdsInBatch( const char* id_key_prefix, - const std::set<int64>& ids, + const std::set<int64_t>& ids, leveldb::WriteBatch* batch) { DCHECK(sequence_checker_.CalledOnValidSequencedThread()); DCHECK(id_key_prefix); @@ -1472,8 +1471,8 @@ if (status != STATUS_OK) return status; - for (std::set<int64>::const_iterator itr = ids.begin(); - itr != ids.end(); ++itr) { + for (std::set<int64_t>::const_iterator itr = ids.begin(); itr != ids.end(); + ++itr) { batch->Delete(CreateResourceIdKey(id_key_prefix, *itr)); } return STATUS_OK; @@ -1481,7 +1480,7 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteUserDataForRegistration( - int64 registration_id, + int64_t registration_id, leveldb::WriteBatch* batch) { DCHECK(batch); Status status = STATUS_OK; @@ -1506,7 +1505,7 @@ } ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadDatabaseVersion( - int64* db_version) { + int64_t* db_version) { std::string value; Status status = LevelDBStatusToStatus( db_->Get(leveldb::ReadOptions(), kDatabaseVersionKey, &value)); @@ -1545,7 +1544,8 @@ } void ServiceWorkerDatabase::BumpNextRegistrationIdIfNeeded( - int64 used_id, leveldb::WriteBatch* batch) { + int64_t used_id, + leveldb::WriteBatch* batch) { DCHECK(batch); if (next_avail_registration_id_ <= used_id) { next_avail_registration_id_ = used_id + 1; @@ -1554,7 +1554,8 @@ } void ServiceWorkerDatabase::BumpNextResourceIdIfNeeded( - int64 used_id, leveldb::WriteBatch* batch) { + int64_t used_id, + leveldb::WriteBatch* batch) { DCHECK(batch); if (next_avail_resource_id_ <= used_id) { next_avail_resource_id_ = used_id + 1; @@ -1563,7 +1564,8 @@ } void ServiceWorkerDatabase::BumpNextVersionIdIfNeeded( - int64 used_id, leveldb::WriteBatch* batch) { + int64_t used_id, + leveldb::WriteBatch* batch) { DCHECK(batch); if (next_avail_version_id_ <= used_id) { next_avail_version_id_ = used_id + 1;
diff --git a/content/browser/service_worker/service_worker_database.h b/content/browser/service_worker/service_worker_database.h index 7fa022f..e43bcd2 100644 --- a/content/browser/service_worker/service_worker_database.h +++ b/content/browser/service_worker/service_worker_database.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DATABASE_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DATABASE_H_ +#include <stdint.h> + #include <map> #include <set> #include <string> @@ -54,14 +56,14 @@ struct CONTENT_EXPORT RegistrationData { // These values are immutable for the life of a registration. - int64 registration_id; + int64_t registration_id; GURL scope; // Versions are first stored once they successfully install and become // the waiting version. Then transition to the active version. The stored // version may be in the ACTIVATED state or in the INSTALLED state. GURL script; - int64 version_id; + int64_t version_id; bool is_active; bool has_fetch_handler; base::Time last_update_check; @@ -75,24 +77,23 @@ }; struct ResourceRecord { - int64 resource_id; + int64_t resource_id; GURL url; // Signed so we can store -1 to specify an unknown or error state. When // stored to the database, this value should always be >= 0. - int64 size_bytes; + int64_t size_bytes; ResourceRecord() : resource_id(-1), size_bytes(0) {} - ResourceRecord(int64 id, GURL url, int64 size_bytes) + ResourceRecord(int64_t id, GURL url, int64_t size_bytes) : resource_id(id), url(url), size_bytes(size_bytes) {} }; // Reads next available ids from the database. Returns OK if they are // successfully read. Fills the arguments with an initial value and returns // OK if they are not found in the database. Otherwise, returns an error. - Status GetNextAvailableIds( - int64* next_avail_registration_id, - int64* next_avail_version_id, - int64* next_avail_resource_id); + Status GetNextAvailableIds(int64_t* next_avail_registration_id, + int64_t* next_avail_version_id, + int64_t* next_avail_resource_id); // Reads origins that have one or more than one registration from the // database. Returns OK if they are successfully read or not found. @@ -123,16 +124,15 @@ // Reads a registration for |registration_id| and resource records associated // with it from the database. Returns OK if they are successfully read. // Otherwise, returns an error. - Status ReadRegistration( - int64 registration_id, - const GURL& origin, - RegistrationData* registration, - std::vector<ResourceRecord>* resources); + Status ReadRegistration(int64_t registration_id, + const GURL& origin, + RegistrationData* registration, + std::vector<ResourceRecord>* resources); // Looks up the origin for the registration with |registration_id|. Returns OK // if a registration was found and read successfully. Otherwise, returns an // error. - Status ReadRegistrationOrigin(int64 registration_id, GURL* origin); + Status ReadRegistrationOrigin(int64_t registration_id, GURL* origin); // Writes |registration| and |resources| into the database and does following // things: @@ -146,20 +146,17 @@ Status WriteRegistration(const RegistrationData& registration, const std::vector<ResourceRecord>& resources, RegistrationData* deleted_version, - std::vector<int64>* newly_purgeable_resources); + std::vector<int64_t>* newly_purgeable_resources); // Updates a registration for |registration_id| to an active state. Returns OK // if it's successfully updated. Otherwise, returns an error. - Status UpdateVersionToActive( - int64 registration_id, - const GURL& origin); + Status UpdateVersionToActive(int64_t registration_id, const GURL& origin); // Updates last check time of a registration for |registration_id| by |time|. // Returns OK if it's successfully updated. Otherwise, returns an error. - Status UpdateLastCheckTime( - int64 registration_id, - const GURL& origin, - const base::Time& time); + Status UpdateLastCheckTime(int64_t registration_id, + const GURL& origin, + const base::Time& time); // Deletes a registration for |registration_id| and moves resource records // associated with it into the purgeable list. If deletion occurred, sets @@ -167,20 +164,20 @@ // |newly_purgeable_resources| to its resources; otherwise, sets |version_id| // to -1. Returns OK if it's successfully deleted or not found in the // database. Otherwise, returns an error. - Status DeleteRegistration(int64 registration_id, + Status DeleteRegistration(int64_t registration_id, const GURL& origin, RegistrationData* deleted_version, - std::vector<int64>* newly_purgeable_resources); + std::vector<int64_t>* newly_purgeable_resources); // Reads user data for |registration_id| and |user_data_name| from the // database. - Status ReadUserData(int64 registration_id, + Status ReadUserData(int64_t registration_id, const std::string& user_data_name, std::string* user_data); // Writes |user_data| into the database. Returns NOT_FOUND if the registration // specified by |registration_id| does not exist in the database. - Status WriteUserData(int64 registration_id, + Status WriteUserData(int64_t registration_id, const GURL& origin, const std::string& user_data_name, const std::string& user_data); @@ -188,14 +185,14 @@ // Deletes user data for |registration_id| and |user_data_name| from the // database. Returns OK if it's successfully deleted or not found in the // database. - Status DeleteUserData(int64 registration_id, + Status DeleteUserData(int64_t registration_id, const std::string& user_data_name); // Reads user data for all registrations that have data with |user_data_name| // from the database. Returns OK if they are successfully read or not found. Status ReadUserDataForAllRegistrations( const std::string& user_data_name, - std::vector<std::pair<int64, std::string>>* user_data); + std::vector<std::pair<int64_t, std::string>>* user_data); // Resources should belong to one of following resource lists: uncommitted, // committed and purgeable. @@ -208,31 +205,32 @@ // Reads resource ids from the uncommitted list. Returns OK on success. // Otherwise clears |ids| and returns an error. - Status GetUncommittedResourceIds(std::set<int64>* ids); + Status GetUncommittedResourceIds(std::set<int64_t>* ids); // Writes resource ids into the uncommitted list. Returns OK on success. // Otherwise writes nothing and returns an error. - Status WriteUncommittedResourceIds(const std::set<int64>& ids); + Status WriteUncommittedResourceIds(const std::set<int64_t>& ids); // Reads resource ids from the purgeable list. Returns OK on success. // Otherwise clears |ids| and returns an error. - Status GetPurgeableResourceIds(std::set<int64>* ids); + Status GetPurgeableResourceIds(std::set<int64_t>* ids); // Deletes resource ids from the purgeable list. Returns OK on success. // Otherwise deletes nothing and returns an error. - Status ClearPurgeableResourceIds(const std::set<int64>& ids); + Status ClearPurgeableResourceIds(const std::set<int64_t>& ids); // Writes resource ids into the purgeable list and removes them from the // uncommitted list. Returns OK on success. Otherwise writes nothing and // returns an error. - Status PurgeUncommittedResourceIds(const std::set<int64>& ids); + Status PurgeUncommittedResourceIds(const std::set<int64_t>& ids); // Deletes all data for |origins|, namely, unique origin, registrations and // resource records. Resources are moved to the purgeable list. Returns OK if // they are successfully deleted or not found in the database. Otherwise, // returns an error. - Status DeleteAllDataForOrigins(const std::set<GURL>& origins, - std::vector<int64>* newly_purgeable_resources); + Status DeleteAllDataForOrigins( + const std::set<GURL>& origins, + std::vector<int64_t>* newly_purgeable_resources); // Completely deletes the contents of the database. // Be careful using this function. @@ -257,63 +255,53 @@ // Reads the next available id for |id_key|. Returns OK if it's successfully // read. Fills |next_avail_id| with an initial value and returns OK if it's // not found in the database. Otherwise, returns an error. - Status ReadNextAvailableId( - const char* id_key, - int64* next_avail_id); + Status ReadNextAvailableId(const char* id_key, int64_t* next_avail_id); // Reads registration data for |registration_id| from the database. Returns OK // if successfully reads. Otherwise, returns an error. - Status ReadRegistrationData( - int64 registration_id, - const GURL& origin, - RegistrationData* registration); + Status ReadRegistrationData(int64_t registration_id, + const GURL& origin, + RegistrationData* registration); // Reads resource records for |version_id| from the database. Returns OK if // it's successfully read or not found in the database. Otherwise, returns an // error. - Status ReadResourceRecords( - int64 version_id, - std::vector<ResourceRecord>* resources); + Status ReadResourceRecords(int64_t version_id, + std::vector<ResourceRecord>* resources); // Deletes resource records for |version_id| from the database. Returns OK if // they are successfully deleted or not found in the database. Otherwise, // returns an error. - Status DeleteResourceRecords( - int64 version_id, - std::vector<int64>* newly_purgeable_resources, - leveldb::WriteBatch* batch); + Status DeleteResourceRecords(int64_t version_id, + std::vector<int64_t>* newly_purgeable_resources, + leveldb::WriteBatch* batch); // Reads resource ids for |id_key_prefix| from the database. Returns OK if // it's successfully read or not found in the database. Otherwise, returns an // error. - Status ReadResourceIds( - const char* id_key_prefix, - std::set<int64>* ids); + Status ReadResourceIds(const char* id_key_prefix, std::set<int64_t>* ids); // Write resource ids for |id_key_prefix| into the database. Returns OK on // success. Otherwise, returns writes nothing and returns an error. - Status WriteResourceIdsInBatch( - const char* id_key_prefix, - const std::set<int64>& ids, - leveldb::WriteBatch* batch); + Status WriteResourceIdsInBatch(const char* id_key_prefix, + const std::set<int64_t>& ids, + leveldb::WriteBatch* batch); // Deletes resource ids for |id_key_prefix| from the database. Returns OK if // it's successfully deleted or not found in the database. Otherwise, returns // an error. - Status DeleteResourceIdsInBatch( - const char* id_key_prefix, - const std::set<int64>& ids, - leveldb::WriteBatch* batch); + Status DeleteResourceIdsInBatch(const char* id_key_prefix, + const std::set<int64_t>& ids, + leveldb::WriteBatch* batch); // Deletes all user data for |registration_id| from the database. Returns OK // if they are successfully deleted or not found in the database. - Status DeleteUserDataForRegistration( - int64 registration_id, - leveldb::WriteBatch* batch); + Status DeleteUserDataForRegistration(int64_t registration_id, + leveldb::WriteBatch* batch); // Reads the current schema version from the database. If the database hasn't // been written anything yet, sets |db_version| to 0 and returns OK. - Status ReadDatabaseVersion(int64* db_version); + Status ReadDatabaseVersion(int64_t* db_version); // Writes a batch into the database. // NOTE: You must call this when you want to put something into the database @@ -322,15 +310,10 @@ // Bumps the next available id if |used_id| is greater than or equal to the // cached one. - void BumpNextRegistrationIdIfNeeded( - int64 used_id, - leveldb::WriteBatch* batch); - void BumpNextResourceIdIfNeeded( - int64 used_id, - leveldb::WriteBatch* batch); - void BumpNextVersionIdIfNeeded( - int64 used_id, - leveldb::WriteBatch* batch); + void BumpNextRegistrationIdIfNeeded(int64_t used_id, + leveldb::WriteBatch* batch); + void BumpNextResourceIdIfNeeded(int64_t used_id, leveldb::WriteBatch* batch); + void BumpNextVersionIdIfNeeded(int64_t used_id, leveldb::WriteBatch* batch); bool IsOpen(); @@ -351,9 +334,9 @@ scoped_ptr<leveldb::Env> env_; scoped_ptr<leveldb::DB> db_; - int64 next_avail_registration_id_; - int64 next_avail_resource_id_; - int64 next_avail_version_id_; + int64_t next_avail_registration_id_; + int64_t next_avail_resource_id_; + int64_t next_avail_version_id_; enum State { UNINITIALIZED,
diff --git a/content/browser/service_worker/service_worker_database_task_manager.h b/content/browser/service_worker/service_worker_database_task_manager.h index a54b252a..dbe9aa2 100644 --- a/content/browser/service_worker/service_worker_database_task_manager.h +++ b/content/browser/service_worker/service_worker_database_task_manager.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DATABASE_TASK_MANAGER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DATABASE_TASK_MANAGER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h"
diff --git a/content/browser/service_worker/service_worker_database_unittest.cc b/content/browser/service_worker/service_worker_database_unittest.cc index 33a5f09..15521208 100644 --- a/content/browser/service_worker/service_worker_database_unittest.cc +++ b/content/browser/service_worker/service_worker_database_unittest.cc
@@ -4,10 +4,14 @@ #include "content/browser/service_worker/service_worker_database.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "content/browser/service_worker/service_worker_database.pb.h" @@ -23,9 +27,9 @@ typedef ServiceWorkerDatabase::ResourceRecord Resource; struct AvailableIds { - int64 reg_id; - int64 res_id; - int64 ver_id; + int64_t reg_id; + int64_t res_id; + int64_t ver_id; AvailableIds() : reg_id(-1), res_id(-1), ver_id(-1) {} ~AvailableIds() {} @@ -39,7 +43,9 @@ return out; } -Resource CreateResource(int64 resource_id, const GURL& url, uint64 size_bytes) { +Resource CreateResource(int64_t resource_id, + const GURL& url, + uint64_t size_bytes) { EXPECT_TRUE(url.is_valid()); return Resource(resource_id, url, size_bytes); } @@ -116,7 +122,7 @@ // Opening a new database does not write anything, so its schema version // should be 0. - int64 db_version = -1; + int64_t db_version = -1; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->ReadDatabaseVersion(&db_version)); EXPECT_EQ(0u, db_version); @@ -126,7 +132,7 @@ std::vector<ServiceWorkerDatabase::ResourceRecord> resources; resources.push_back(CreateResource(1, URL(origin, "/resource"), 10)); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; ServiceWorkerDatabase::RegistrationData data; data.resources_total_size_bytes = 10; ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK, @@ -149,7 +155,7 @@ // Add a registration to the database. std::vector<ServiceWorkerDatabase::ResourceRecord> resources; ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; ServiceWorkerDatabase::RegistrationData data; data.registration_id = 100; data.scope = URL(origin, "/foo"); @@ -162,7 +168,7 @@ &newly_purgeable_resources)); // Sanity check on current version. - int64 db_version = -1; + int64_t db_version = -1; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->ReadDatabaseVersion(&db_version)); EXPECT_LE(2, db_version); @@ -223,7 +229,7 @@ std::vector<Resource> resources1; RegistrationData data1; ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; data1.registration_id = 100; data1.scope = URL(origin, "/foo"); data1.script = URL(origin, "/script1.js"); @@ -241,10 +247,10 @@ EXPECT_EQ(0, ids.res_id); // Writing uncommitted resources bumps the next available id. - const int64 kUncommittedIds[] = {0, 1, 3, 5, 6, 10}; + const int64_t kUncommittedIds[] = {0, 1, 3, 5, 6, 10}; EXPECT_EQ( ServiceWorkerDatabase::STATUS_OK, - database->WriteUncommittedResourceIds(std::set<int64>( + database->WriteUncommittedResourceIds(std::set<int64_t>( kUncommittedIds, kUncommittedIds + arraysize(kUncommittedIds)))); EXPECT_EQ( ServiceWorkerDatabase::STATUS_OK, @@ -254,9 +260,9 @@ EXPECT_EQ(11, ids.res_id); // Writing purgeable resources bumps the next available id. - const int64 kPurgeableIds[] = {4, 12, 16, 17, 20}; + const int64_t kPurgeableIds[] = {4, 12, 16, 17, 20}; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, - database->WriteUncommittedResourceIds(std::set<int64>( + database->WriteUncommittedResourceIds(std::set<int64_t>( kPurgeableIds, kPurgeableIds + arraysize(kPurgeableIds)))); EXPECT_EQ( ServiceWorkerDatabase::STATUS_OK, @@ -280,10 +286,10 @@ &newly_purgeable_resources)); // Same with resources. - int64 kLowResourceId = 15; + int64_t kLowResourceId = 15; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->WriteUncommittedResourceIds( - std::set<int64>(&kLowResourceId, &kLowResourceId + 1))); + std::set<int64_t>(&kLowResourceId, &kLowResourceId + 1))); // Close and reopen the database to verify the stored values. database.reset(CreateDatabase(database_dir.path())); @@ -304,7 +310,7 @@ EXPECT_TRUE(origins.empty()); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; GURL origin1("http://example.com"); RegistrationData data1; @@ -415,7 +421,7 @@ EXPECT_TRUE(resources_list.empty()); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; RegistrationData data1; data1.registration_id = 100; @@ -517,7 +523,7 @@ EXPECT_TRUE(registrations.empty()); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; GURL origin1("http://www1.example.com"); RegistrationData data1; @@ -600,18 +606,18 @@ // Write a resource to the uncommitted list to make sure that writing // registration removes resource ids associated with the registration from // the uncommitted list. - std::set<int64> uncommitted_ids; + std::set<int64_t> uncommitted_ids; uncommitted_ids.insert(resources[0].resource_id); EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->WriteUncommittedResourceIds(uncommitted_ids)); - std::set<int64> uncommitted_ids_out; + std::set<int64_t> uncommitted_ids_out; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->GetUncommittedResourceIds(&uncommitted_ids_out)); EXPECT_EQ(uncommitted_ids, uncommitted_ids_out); ServiceWorkerDatabase::RegistrationData deleted_version; deleted_version.version_id = 222; // Dummy initial value - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->WriteRegistration( @@ -660,7 +666,7 @@ database->ReadRegistrationOrigin(data.registration_id, &origin_out)); // Resources should be purgeable because these are no longer referred. - std::set<int64> purgeable_ids_out; + std::set<int64_t> purgeable_ids_out; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->GetPurgeableResourceIds(&purgeable_ids_out)); EXPECT_EQ(2u, purgeable_ids_out.size()); @@ -683,12 +689,12 @@ resources.push_back(CreateResource(1, URL(origin, "/resource1"), 19)); resources.push_back(CreateResource(2, URL(origin, "/resource2"), 29129)); - const int64 kNonExistentRegistrationId = 999; - const int64 kArbitraryVersionId = 222; // Used as a dummy initial value + const int64_t kNonExistentRegistrationId = 999; + const int64_t kArbitraryVersionId = 222; // Used as a dummy initial value ServiceWorkerDatabase::RegistrationData deleted_version; deleted_version.version_id = kArbitraryVersionId; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->WriteRegistration( data, resources, &deleted_version, &newly_purgeable_resources)); @@ -736,7 +742,7 @@ ServiceWorkerDatabase::RegistrationData deleted_version; deleted_version.version_id = 222; // Dummy inital value - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; EXPECT_EQ( ServiceWorkerDatabase::STATUS_OK, @@ -780,7 +786,7 @@ VerifyRegistrationData(updated_data, data_out); VerifyResourceRecords(resources2, resources_out); - std::set<int64> purgeable_ids_out; + std::set<int64_t> purgeable_ids_out; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->GetPurgeableResourceIds(&purgeable_ids_out)); EXPECT_EQ(2u, purgeable_ids_out.size()); @@ -793,7 +799,7 @@ GURL origin("http://example.com"); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; // Add registration1. RegistrationData data1; @@ -851,7 +857,7 @@ database->ReadRegistrationOrigin(data2.registration_id, &origin_out)); EXPECT_EQ(origin, origin_out); - std::set<int64> purgeable_ids_out; + std::set<int64_t> purgeable_ids_out; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->GetPurgeableResourceIds(&purgeable_ids_out)); EXPECT_TRUE(purgeable_ids_out.empty()); @@ -911,7 +917,7 @@ // Deleting non-existent registration should succeed. RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->DeleteRegistration( 100, origin, &deleted_version, &newly_purgeable_resources)); @@ -953,7 +959,7 @@ std::vector<Resource> resources; resources.push_back(CreateResource(1, data.script, 100)); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK, database->WriteRegistration( data, resources, &deleted_version, &newly_purgeable_resources)); @@ -1032,7 +1038,7 @@ resources2.push_back(CreateResource(2, data2.script, 200)); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK, database->WriteRegistration(data1, resources1, &deleted_version, &newly_purgeable_resources)); @@ -1068,7 +1074,7 @@ EXPECT_EQ("data2", user_data_out); // Get all registrations with user data. - std::vector<std::pair<int64, std::string>> user_data_list; + std::vector<std::pair<int64_t, std::string>> user_data_list; ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK, database->ReadUserDataForAllRegistrations("key", &user_data_list)); EXPECT_EQ(2u, user_data_list.size()); @@ -1123,7 +1129,7 @@ resources2.push_back(CreateResource(2, data2.script, 200)); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; ASSERT_EQ(ServiceWorkerDatabase::STATUS_OK, database->WriteRegistration(data1, resources1, &deleted_version, &newly_purgeable_resources)); @@ -1212,7 +1218,7 @@ GURL origin("http://example.com"); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; // Should be false because a registration does not exist. EXPECT_EQ(ServiceWorkerDatabase::STATUS_ERROR_NOT_FOUND, @@ -1272,7 +1278,7 @@ scoped_ptr<ServiceWorkerDatabase> database(CreateDatabaseInMemory()); GURL origin("http://example.com"); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; // Should be false because a registration does not exist. EXPECT_EQ(ServiceWorkerDatabase::STATUS_ERROR_NOT_FOUND, @@ -1335,20 +1341,20 @@ scoped_ptr<ServiceWorkerDatabase> database(CreateDatabaseInMemory()); // Write {1, 2, 3} into the uncommitted list. - std::set<int64> ids1; + std::set<int64_t> ids1; ids1.insert(1); ids1.insert(2); ids1.insert(3); EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->WriteUncommittedResourceIds(ids1)); - std::set<int64> ids_out; + std::set<int64_t> ids_out; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->GetUncommittedResourceIds(&ids_out)); EXPECT_EQ(ids1, ids_out); // Write {2, 4} into the uncommitted list. - std::set<int64> ids2; + std::set<int64_t> ids2; ids2.insert(2); ids2.insert(4); EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, @@ -1357,7 +1363,7 @@ ids_out.clear(); EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->GetUncommittedResourceIds(&ids_out)); - std::set<int64> expected = base::STLSetUnion<std::set<int64>>(ids1, ids2); + std::set<int64_t> expected = base::STLSetUnion<std::set<int64_t>>(ids1, ids2); EXPECT_EQ(expected, ids_out); // Move {2, 4} from the uncommitted list to the purgeable list. @@ -1380,14 +1386,14 @@ ids_out.clear(); EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->GetUncommittedResourceIds(&ids_out)); - expected = base::STLSetDifference<std::set<int64>>(ids1, ids2); + expected = base::STLSetDifference<std::set<int64_t>>(ids1, ids2); EXPECT_EQ(expected, ids_out); } TEST(ServiceWorkerDatabaseTest, DeleteAllDataForOrigin) { scoped_ptr<ServiceWorkerDatabase> database(CreateDatabaseInMemory()); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; // Data associated with |origin1| will be removed. GURL origin1("http://example.com"); @@ -1510,7 +1516,7 @@ EXPECT_EQ(origin2, origin_out); // The resources associated with |origin1| should be purgeable. - std::set<int64> purgeable_ids_out; + std::set<int64_t> purgeable_ids_out; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, database->GetPurgeableResourceIds(&purgeable_ids_out)); EXPECT_EQ(4u, purgeable_ids_out.size()); @@ -1567,7 +1573,7 @@ EXPECT_TRUE(origins.empty()); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; GURL origin1("http://example.com"); RegistrationData data1;
diff --git a/content/browser/service_worker/service_worker_disk_cache.cc b/content/browser/service_worker/service_worker_disk_cache.cc index 98f6845..ef8f168f 100644 --- a/content/browser/service_worker/service_worker_disk_cache.cc +++ b/content/browser/service_worker/service_worker_disk_cache.cc
@@ -10,17 +10,17 @@ : AppCacheDiskCache(true /* use_simple_cache */) {} ServiceWorkerResponseReader::ServiceWorkerResponseReader( - int64 resource_id, + int64_t resource_id, ServiceWorkerDiskCache* disk_cache) : AppCacheResponseReader(resource_id, 0, disk_cache) {} ServiceWorkerResponseWriter::ServiceWorkerResponseWriter( - int64 resource_id, + int64_t resource_id, ServiceWorkerDiskCache* disk_cache) : AppCacheResponseWriter(resource_id, 0, disk_cache) {} ServiceWorkerResponseMetadataWriter::ServiceWorkerResponseMetadataWriter( - int64 resource_id, + int64_t resource_id, ServiceWorkerDiskCache* disk_cache) : AppCacheResponseMetadataWriter(resource_id, 0, disk_cache) {}
diff --git a/content/browser/service_worker/service_worker_disk_cache.h b/content/browser/service_worker/service_worker_disk_cache.h index 603614f..90f29bc 100644 --- a/content/browser/service_worker/service_worker_disk_cache.h +++ b/content/browser/service_worker/service_worker_disk_cache.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISK_CACHE_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISK_CACHE_H_ +#include <stdint.h> + #include "content/browser/appcache/appcache_disk_cache.h" #include "content/common/content_export.h" @@ -27,7 +29,7 @@ protected: // Should only be constructed by the storage class. friend class ServiceWorkerStorage; - ServiceWorkerResponseReader(int64 resource_id, + ServiceWorkerResponseReader(int64_t resource_id, ServiceWorkerDiskCache* disk_cache); }; @@ -36,7 +38,7 @@ protected: // Should only be constructed by the storage class. friend class ServiceWorkerStorage; - ServiceWorkerResponseWriter(int64 resource_id, + ServiceWorkerResponseWriter(int64_t resource_id, ServiceWorkerDiskCache* disk_cache); }; @@ -45,7 +47,7 @@ protected: // Should only be constructed by the storage class. friend class ServiceWorkerStorage; - ServiceWorkerResponseMetadataWriter(int64 resource_id, + ServiceWorkerResponseMetadataWriter(int64_t resource_id, ServiceWorkerDiskCache* disk_cache); };
diff --git a/content/browser/service_worker/service_worker_dispatcher_host.cc b/content/browser/service_worker/service_worker_dispatcher_host.cc index 2b36dcf..1e264d8 100644 --- a/content/browser/service_worker/service_worker_dispatcher_host.cc +++ b/content/browser/service_worker/service_worker_dispatcher_host.cc
@@ -5,6 +5,7 @@ #include "content/browser/service_worker/service_worker_dispatcher_host.h" #include "base/logging.h" +#include "base/macros.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" @@ -45,9 +46,8 @@ "The user denied permission to use Service Worker."; const char kInvalidStateErrorMessage[] = "The object is in an invalid state."; -const uint32 kFilteredMessageClasses[] = { - ServiceWorkerMsgStart, - EmbeddedWorkerMsgStart, +const uint32_t kFilteredMessageClasses[] = { + ServiceWorkerMsgStart, EmbeddedWorkerMsgStart, }; bool AllOriginsMatch(const GURL& url_a, const GURL& url_b, const GURL& url_c) { @@ -248,7 +248,7 @@ ServiceWorkerHandle* ServiceWorkerDispatcherHost::FindServiceWorkerHandle( int provider_id, - int64 version_id) { + int64_t version_id) { for (IDMap<ServiceWorkerHandle, IDMapOwnPointer>::iterator iter(&handles_); !iter.IsAtEnd(); iter.Advance()) { ServiceWorkerHandle* handle = iter.GetCurrentValue(); @@ -366,10 +366,11 @@ request_id)); } -void ServiceWorkerDispatcherHost::OnUpdateServiceWorker(int thread_id, - int request_id, - int provider_id, - int64 registration_id) { +void ServiceWorkerDispatcherHost::OnUpdateServiceWorker( + int thread_id, + int request_id, + int provider_id, + int64_t registration_id) { TRACE_EVENT0("ServiceWorker", "ServiceWorkerDispatcherHost::OnUpdateServiceWorker"); if (!GetContext()) { @@ -450,7 +451,7 @@ int thread_id, int request_id, int provider_id, - int64 registration_id) { + int64_t registration_id) { TRACE_EVENT0("ServiceWorker", "ServiceWorkerDispatcherHost::OnUnregisterServiceWorker"); if (!GetContext()) { @@ -780,8 +781,8 @@ GetContext()->RemoveProviderHost(render_process_id_, provider_id); } -void ServiceWorkerDispatcherHost::OnSetHostedVersionId( - int provider_id, int64 version_id) { +void ServiceWorkerDispatcherHost::OnSetHostedVersionId(int provider_id, + int64_t version_id) { TRACE_EVENT0("ServiceWorker", "ServiceWorkerDispatcherHost::OnSetHostedVersionId"); if (!GetContext()) @@ -824,7 +825,7 @@ ServiceWorkerRegistrationHandle* ServiceWorkerDispatcherHost::FindRegistrationHandle(int provider_id, - int64 registration_id) { + int64_t registration_id) { for (RegistrationHandleMap::iterator iter(®istration_handles_); !iter.IsAtEnd(); iter.Advance()) { ServiceWorkerRegistrationHandle* handle = iter.GetCurrentValue(); @@ -859,7 +860,7 @@ int request_id, ServiceWorkerStatusCode status, const std::string& status_message, - int64 registration_id) { + int64_t registration_id) { if (!GetContext()) return; @@ -897,7 +898,7 @@ int request_id, ServiceWorkerStatusCode status, const std::string& status_message, - int64 registration_id) { + int64_t registration_id) { if (!GetContext()) return;
diff --git a/content/browser/service_worker/service_worker_dispatcher_host.h b/content/browser/service_worker/service_worker_dispatcher_host.h index d907f9d..89ff7899 100644 --- a/content/browser/service_worker/service_worker_dispatcher_host.h +++ b/content/browser/service_worker/service_worker_dispatcher_host.h
@@ -5,9 +5,12 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_HOST_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_HOST_H_ +#include <stdint.h> + #include <vector> #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" @@ -63,7 +66,7 @@ scoped_ptr<ServiceWorkerRegistrationHandle> handle); ServiceWorkerHandle* FindServiceWorkerHandle(int provider_id, - int64 version_id); + int64_t version_id); // Returns the existing registration handle whose reference count is // incremented or a newly created one if it doesn't exist. @@ -92,11 +95,11 @@ void OnUpdateServiceWorker(int thread_id, int request_id, int provider_id, - int64 registration_id); + int64_t registration_id); void OnUnregisterServiceWorker(int thread_id, int request_id, int provider_id, - int64 registration_id); + int64_t registration_id); void OnGetRegistration(int thread_id, int request_id, int provider_id, @@ -109,7 +112,7 @@ int route_id, ServiceWorkerProviderType provider_type); void OnProviderDestroyed(int provider_id); - void OnSetHostedVersionId(int provider_id, int64 version_id); + void OnSetHostedVersionId(int provider_id, int64_t version_id); void OnWorkerReadyForInspection(int embedded_worker_id); void OnWorkerScriptLoaded(int embedded_worker_id); void OnWorkerThreadStarted(int embedded_worker_id, @@ -139,7 +142,7 @@ ServiceWorkerRegistrationHandle* FindRegistrationHandle( int provider_id, - int64 registration_handle_id); + int64_t registration_handle_id); void GetRegistrationObjectInfoAndVersionAttributes( base::WeakPtr<ServiceWorkerProviderHost> provider_host, @@ -153,14 +156,14 @@ int request_id, ServiceWorkerStatusCode status, const std::string& status_message, - int64 registration_id); + int64_t registration_id); void UpdateComplete(int thread_id, int provider_id, int request_id, ServiceWorkerStatusCode status, const std::string& status_message, - int64 registration_id); + int64_t registration_id); void UnregistrationComplete(int thread_id, int request_id,
diff --git a/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc b/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc index fde3c472..2d9d36e 100644 --- a/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc +++ b/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc
@@ -4,6 +4,8 @@ #include "content/browser/service_worker/service_worker_dispatcher_host.h" +#include <stdint.h> + #include "base/command_line.h" #include "base/files/file_path.h" #include "base/run_loop.h" @@ -81,62 +83,62 @@ return helper_->context_wrapper(); } - void SendRegister(int64 provider_id, GURL pattern, GURL worker_url) { + void SendRegister(int64_t provider_id, GURL pattern, GURL worker_url) { dispatcher_host_->OnMessageReceived( ServiceWorkerHostMsg_RegisterServiceWorker( -1, -1, provider_id, pattern, worker_url)); base::RunLoop().RunUntilIdle(); } - void Register(int64 provider_id, + void Register(int64_t provider_id, GURL pattern, GURL worker_url, - uint32 expected_message) { + uint32_t expected_message) { SendRegister(provider_id, pattern, worker_url); EXPECT_TRUE(dispatcher_host_->ipc_sink()->GetUniqueMessageMatching( expected_message)); dispatcher_host_->ipc_sink()->ClearMessages(); } - void SendUnregister(int64 provider_id, int64 registration_id) { + void SendUnregister(int64_t provider_id, int64_t registration_id) { dispatcher_host_->OnMessageReceived( ServiceWorkerHostMsg_UnregisterServiceWorker(-1, -1, provider_id, registration_id)); base::RunLoop().RunUntilIdle(); } - void Unregister(int64 provider_id, - int64 registration_id, - uint32 expected_message) { + void Unregister(int64_t provider_id, + int64_t registration_id, + uint32_t expected_message) { SendUnregister(provider_id, registration_id); EXPECT_TRUE(dispatcher_host_->ipc_sink()->GetUniqueMessageMatching( expected_message)); dispatcher_host_->ipc_sink()->ClearMessages(); } - void SendGetRegistration(int64 provider_id, GURL document_url) { + void SendGetRegistration(int64_t provider_id, GURL document_url) { dispatcher_host_->OnMessageReceived( ServiceWorkerHostMsg_GetRegistration( -1, -1, provider_id, document_url)); base::RunLoop().RunUntilIdle(); } - void GetRegistration(int64 provider_id, + void GetRegistration(int64_t provider_id, GURL document_url, - uint32 expected_message) { + uint32_t expected_message) { SendGetRegistration(provider_id, document_url); EXPECT_TRUE(dispatcher_host_->ipc_sink()->GetUniqueMessageMatching( expected_message)); dispatcher_host_->ipc_sink()->ClearMessages(); } - void SendGetRegistrations(int64 provider_id) { + void SendGetRegistrations(int64_t provider_id) { dispatcher_host_->OnMessageReceived( ServiceWorkerHostMsg_GetRegistrations(-1, -1, provider_id)); base::RunLoop().RunUntilIdle(); } - void GetRegistrations(int64 provider_id, uint32 expected_message) { + void GetRegistrations(int64_t provider_id, uint32_t expected_message) { SendGetRegistrations(provider_id); EXPECT_TRUE(dispatcher_host_->ipc_sink()->GetUniqueMessageMatching( expected_message)); @@ -175,7 +177,7 @@ ContentBrowserClient* old_browser_client = SetBrowserClientForTesting(&test_browser_client); - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("https://www.example.com/foo")); @@ -193,7 +195,7 @@ // Add a registration into a live registration map so that Unregister() can // find it. - const int64 kRegistrationId = 999; // Dummy value + const int64_t kRegistrationId = 999; // Dummy value scoped_refptr<ServiceWorkerRegistration> registration( new ServiceWorkerRegistration(GURL("https://www.example.com/"), kRegistrationId, context()->AsWeakPtr())); @@ -204,7 +206,7 @@ } TEST_F(ServiceWorkerDispatcherHostTest, Register_HTTPS) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("https://www.example.com/foo")); @@ -217,7 +219,7 @@ } TEST_F(ServiceWorkerDispatcherHostTest, Register_NonSecureTransportLocalhost) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("http://127.0.0.3:81/foo")); @@ -230,7 +232,7 @@ } TEST_F(ServiceWorkerDispatcherHostTest, Register_InvalidScopeShouldFail) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("https://www.example.com/foo")); @@ -242,7 +244,7 @@ } TEST_F(ServiceWorkerDispatcherHostTest, Register_InvalidScriptShouldFail) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("https://www.example.com/foo")); @@ -253,7 +255,7 @@ } TEST_F(ServiceWorkerDispatcherHostTest, Register_NonSecureOriginShouldFail) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("http://www.example.com/foo")); @@ -266,7 +268,7 @@ } TEST_F(ServiceWorkerDispatcherHostTest, Register_CrossOriginShouldFail) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("https://www.example.com/foo")); @@ -310,7 +312,7 @@ } TEST_F(ServiceWorkerDispatcherHostTest, Register_BadCharactersShouldFail) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("https://www.example.com/")); @@ -343,7 +345,7 @@ TEST_F(ServiceWorkerDispatcherHostTest, Register_FileSystemDocumentShouldFail) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("filesystem:https://www.example.com/temporary/a")); @@ -367,7 +369,7 @@ TEST_F(ServiceWorkerDispatcherHostTest, Register_FileSystemScriptOrScopeShouldFail) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("https://www.example.com/temporary/")); @@ -434,7 +436,7 @@ } TEST_F(ServiceWorkerDispatcherHostTest, GetRegistration_SameOrigin) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("https://www.example.com/foo")); @@ -446,7 +448,7 @@ } TEST_F(ServiceWorkerDispatcherHostTest, GetRegistration_CrossOriginShouldFail) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("https://www.example.com/foo")); @@ -458,7 +460,7 @@ TEST_F(ServiceWorkerDispatcherHostTest, GetRegistration_InvalidScopeShouldFail) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("https://www.example.com/foo")); @@ -470,7 +472,7 @@ TEST_F(ServiceWorkerDispatcherHostTest, GetRegistration_NonSecureOriginShouldFail) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("http://www.example.com/foo")); @@ -492,7 +494,7 @@ } TEST_F(ServiceWorkerDispatcherHostTest, GetRegistrations_SecureOrigin) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("https://www.example.com/foo")); @@ -503,7 +505,7 @@ TEST_F(ServiceWorkerDispatcherHostTest, GetRegistrations_NonSecureOriginShouldFail) { - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value scoped_ptr<ServiceWorkerProviderHost> host( CreateServiceWorkerProviderHost(kProviderId)); host->SetDocumentUrl(GURL("http://www.example.com/foo")); @@ -526,7 +528,7 @@ int process_id = helper_->mock_render_process_id(); // Add a provider and worker. - const int64 kProviderId = 99; // Dummy value + const int64_t kProviderId = 99; // Dummy value dispatcher_host_->OnMessageReceived(ServiceWorkerHostMsg_ProviderCreated( kProviderId, MSG_ROUTING_NONE, SERVICE_WORKER_PROVIDER_FOR_WINDOW));
diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher.h b/content/browser/service_worker/service_worker_fetch_dispatcher.h index f0165b6..518be849 100644 --- a/content/browser/service_worker/service_worker_fetch_dispatcher.h +++ b/content/browser/service_worker/service_worker_fetch_dispatcher.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_FETCH_DISPATCHER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_FETCH_DISPATCHER_H_ -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/common/service_worker/service_worker_status_code.h" #include "content/common/service_worker/service_worker_types.h"
diff --git a/content/browser/service_worker/service_worker_handle.h b/content/browser/service_worker/service_worker_handle.h index 8fe2bd9d..a9c0e44 100644 --- a/content/browser/service_worker/service_worker_handle.h +++ b/content/browser/service_worker/service_worker_handle.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_HANDLE_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_HANDLE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/service_worker/service_worker_handle_unittest.cc b/content/browser/service_worker/service_worker_handle_unittest.cc index 066dd39f..25514ffb 100644 --- a/content/browser/service_worker/service_worker_handle_unittest.cc +++ b/content/browser/service_worker/service_worker_handle_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include "base/macros.h" #include "base/run_loop.h" #include "content/browser/service_worker/embedded_worker_registry.h" #include "content/browser/service_worker/embedded_worker_test_helper.h"
diff --git a/content/browser/service_worker/service_worker_info.cc b/content/browser/service_worker/service_worker_info.cc index 90571016..7d40512a 100644 --- a/content/browser/service_worker/service_worker_info.cc +++ b/content/browser/service_worker/service_worker_info.cc
@@ -36,8 +36,8 @@ ServiceWorkerVersion::RunningStatus running_status, ServiceWorkerVersion::Status status, const GURL& script_url, - int64 registration_id, - int64 version_id, + int64_t registration_id, + int64_t version_id, int process_id, int thread_id, int devtools_agent_route_id) @@ -48,8 +48,7 @@ version_id(version_id), process_id(process_id), thread_id(thread_id), - devtools_agent_route_id(devtools_agent_route_id) { -} + devtools_agent_route_id(devtools_agent_route_id) {} ServiceWorkerVersionInfo::~ServiceWorkerVersionInfo() {} @@ -61,7 +60,7 @@ ServiceWorkerRegistrationInfo::ServiceWorkerRegistrationInfo( const GURL& pattern, - int64 registration_id, + int64_t registration_id, DeleteFlag delete_flag) : pattern(pattern), registration_id(registration_id), @@ -71,7 +70,7 @@ ServiceWorkerRegistrationInfo::ServiceWorkerRegistrationInfo( const GURL& pattern, - int64 registration_id, + int64_t registration_id, DeleteFlag delete_flag, ForceUpdateOnPageLoad force_update_on_page_load, const ServiceWorkerVersionInfo& active_version,
diff --git a/content/browser/service_worker/service_worker_info.h b/content/browser/service_worker/service_worker_info.h index f7bd894f..b1c0a73 100644 --- a/content/browser/service_worker/service_worker_info.h +++ b/content/browser/service_worker/service_worker_info.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_INFO_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_INFO_H_ +#include <stdint.h> + #include <vector> #include "base/time/time.h" @@ -30,8 +32,8 @@ ServiceWorkerVersionInfo(ServiceWorkerVersion::RunningStatus running_status, ServiceWorkerVersion::Status status, const GURL& script_url, - int64 registration_id, - int64 version_id, + int64_t registration_id, + int64_t version_id, int process_id, int thread_id, int devtools_agent_route_id); @@ -40,8 +42,8 @@ ServiceWorkerVersion::RunningStatus running_status; ServiceWorkerVersion::Status status; GURL script_url; - int64 registration_id; - int64 version_id; + int64_t registration_id; + int64_t version_id; int process_id; int thread_id; int devtools_agent_route_id; @@ -56,11 +58,11 @@ enum ForceUpdateOnPageLoad { IS_NOT_FORCED, IS_FORCED }; ServiceWorkerRegistrationInfo(); ServiceWorkerRegistrationInfo(const GURL& pattern, - int64 registration_id, + int64_t registration_id, DeleteFlag delete_flag); ServiceWorkerRegistrationInfo( const GURL& pattern, - int64 registration_id, + int64_t registration_id, DeleteFlag delete_flag, ForceUpdateOnPageLoad force_update_on_page_load, const ServiceWorkerVersionInfo& active_version, @@ -70,7 +72,7 @@ ~ServiceWorkerRegistrationInfo(); GURL pattern; - int64 registration_id; + int64_t registration_id; DeleteFlag delete_flag; ForceUpdateOnPageLoad force_update_on_page_load; ServiceWorkerVersionInfo active_version;
diff --git a/content/browser/service_worker/service_worker_internals_ui.cc b/content/browser/service_worker/service_worker_internals_ui.cc index 0e50fa4b..cf46466c 100644 --- a/content/browser/service_worker/service_worker_internals_ui.cc +++ b/content/browser/service_worker/service_worker_internals_ui.cc
@@ -4,6 +4,8 @@ #include "content/browser/service_worker/service_worker_internals_ui.h" +#include <stdint.h> + #include <string> #include <vector> @@ -64,7 +66,7 @@ void CallServiceWorkerVersionMethodWithVersionID( ServiceWorkerInternalsUI::ServiceWorkerVersionMethod method, scoped_refptr<ServiceWorkerContextWrapper> context, - int64 version_id, + int64_t version_id, const ServiceWorkerInternalsUI::StatusCallback& callback) { if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { BrowserThread::PostTask( @@ -89,7 +91,7 @@ void DispatchPushEventWithVersionID( scoped_refptr<ServiceWorkerContextWrapper> context, - int64 version_id, + int64_t version_id, const ServiceWorkerInternalsUI::StatusCallback& callback) { if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { BrowserThread::PostTask( @@ -251,14 +253,14 @@ : partition_id_(partition_id), web_ui_(web_ui) {} ~PartitionObserver() override {} // ServiceWorkerContextObserver overrides: - void OnRunningStateChanged(int64 version_id, + void OnRunningStateChanged(int64_t version_id, ServiceWorkerVersion::RunningStatus) override { DCHECK_CURRENTLY_ON(BrowserThread::UI); web_ui_->CallJavascriptFunction( "serviceworker.onRunningStateChanged", FundamentalValue(partition_id_), StringValue(base::Int64ToString(version_id))); } - void OnVersionStateChanged(int64 version_id, + void OnVersionStateChanged(int64_t version_id, ServiceWorkerVersion::Status) override { DCHECK_CURRENTLY_ON(BrowserThread::UI); web_ui_->CallJavascriptFunction( @@ -266,7 +268,7 @@ FundamentalValue(partition_id_), StringValue(base::Int64ToString(version_id))); } - void OnErrorReported(int64 version_id, + void OnErrorReported(int64_t version_id, int process_id, int thread_id, const ErrorInfo& info) override { @@ -285,7 +287,7 @@ web_ui_->CallJavascriptFunction("serviceworker.onErrorReported", args.get()); } - void OnReportConsoleMessage(int64 version_id, + void OnReportConsoleMessage(int64_t version_id, int process_id, int thread_id, const ConsoleMessage& message) override { @@ -305,13 +307,13 @@ web_ui_->CallJavascriptFunction("serviceworker.onConsoleMessageReported", args.get()); } - void OnRegistrationStored(int64 registration_id, + void OnRegistrationStored(int64_t registration_id, const GURL& pattern) override { DCHECK_CURRENTLY_ON(BrowserThread::UI); web_ui_->CallJavascriptFunction("serviceworker.onRegistrationStored", StringValue(pattern.spec())); } - void OnRegistrationDeleted(int64 registration_id, + void OnRegistrationDeleted(int64_t registration_id, const GURL& pattern) override { web_ui_->CallJavascriptFunction("serviceworker.onRegistrationDeleted", StringValue(pattern.spec())); @@ -491,7 +493,7 @@ int partition_id; scoped_refptr<ServiceWorkerContextWrapper> context; std::string version_id_string; - int64 version_id = 0; + int64_t version_id = 0; if (!args->GetInteger(0, &callback_id) || !args->GetDictionary(1, &cmd_args) || !cmd_args->GetInteger("partition_id", &partition_id) || @@ -512,7 +514,7 @@ DCHECK_CURRENTLY_ON(BrowserThread::UI); int callback_id; int partition_id; - int64 version_id = 0; + int64_t version_id = 0; std::string version_id_string; const DictionaryValue* cmd_args = NULL; scoped_refptr<ServiceWorkerContextWrapper> context;
diff --git a/content/browser/service_worker/service_worker_job_coordinator.cc b/content/browser/service_worker/service_worker_job_coordinator.cc index 62ace7d..da417c7 100644 --- a/content/browser/service_worker/service_worker_job_coordinator.cc +++ b/content/browser/service_worker/service_worker_job_coordinator.cc
@@ -4,6 +4,8 @@ #include "content/browser/service_worker/service_worker_job_coordinator.h" +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" #include "content/browser/service_worker/service_worker_register_job_base.h"
diff --git a/content/browser/service_worker/service_worker_job_coordinator.h b/content/browser/service_worker/service_worker_job_coordinator.h index b4fa8a28..728b8206 100644 --- a/content/browser/service_worker/service_worker_job_coordinator.h +++ b/content/browser/service_worker/service_worker_job_coordinator.h
@@ -8,6 +8,7 @@ #include <deque> #include <map> +#include "base/macros.h" #include "content/browser/service_worker/service_worker_register_job.h" #include "content/browser/service_worker/service_worker_unregister_job.h" #include "content/common/content_export.h"
diff --git a/content/browser/service_worker/service_worker_job_unittest.cc b/content/browser/service_worker/service_worker_job_unittest.cc index d8cd7ef..a5572a4f 100644 --- a/content/browser/service_worker/service_worker_job_unittest.cc +++ b/content/browser/service_worker/service_worker_job_unittest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/files/scoped_temp_dir.h" #include "base/logging.h" +#include "base/macros.h" #include "base/run_loop.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/service_worker/embedded_worker_registry.h" @@ -82,7 +85,7 @@ void SaveUnregistrationCallback(ServiceWorkerStatusCode expected_status, bool* called, - int64 registration_id, + int64_t registration_id, ServiceWorkerStatusCode status) { EXPECT_EQ(expected_status, status); *called = true; @@ -354,7 +357,7 @@ FailToStartWorkerTestHelper() : EmbeddedWorkerTestHelper(base::FilePath()) {} void OnStartWorker(int embedded_worker_id, - int64 service_worker_version_id, + int64_t service_worker_version_id, const GURL& scope, const GURL& script_url) override { EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); @@ -721,10 +724,11 @@ *rv_out = rv; } -void WriteResponse( - ServiceWorkerStorage* storage, int64 id, - const std::string& headers, - IOBuffer* body, int length) { +void WriteResponse(ServiceWorkerStorage* storage, + int64_t id, + const std::string& headers, + IOBuffer* body, + int length) { scoped_ptr<ServiceWorkerResponseWriter> writer = storage->CreateResponseWriter(id); @@ -748,9 +752,9 @@ EXPECT_EQ(length, rv); } -void WriteStringResponse( - ServiceWorkerStorage* storage, int64 id, - const std::string& body) { +void WriteStringResponse(ServiceWorkerStorage* storage, + int64_t id, + const std::string& body) { scoped_refptr<IOBuffer> body_buffer(new WrappedIOBuffer(body.data())); const char kHttpHeaders[] = "HTTP/1.0 200 HONKYDORY\0\0"; std::string headers(kHttpHeaders, arraysize(kHttpHeaders)); @@ -763,13 +767,13 @@ public ServiceWorkerVersion::Listener { public: struct AttributeChangeLogEntry { - int64 registration_id; + int64_t registration_id; ChangedVersionAttributesMask mask; ServiceWorkerRegistrationInfo info; }; struct StateChangeLogEntry { - int64 version_id; + int64_t version_id; ServiceWorkerVersion::Status status; }; @@ -805,11 +809,11 @@ // EmbeddedWorkerTestHelper overrides void OnStartWorker(int embedded_worker_id, - int64 version_id, + int64_t version_id, const GURL& scope, const GURL& script) override { const std::string kMockScriptBody = "mock_script"; - const uint64 kMockScriptSize = 19284; + const uint64_t kMockScriptSize = 19284; ServiceWorkerVersion* version = context()->GetLiveVersion(version_id); ServiceWorkerRegistration* registration = context()->GetLiveRegistration(version->registration_id()); @@ -821,7 +825,7 @@ if (!is_update) { // Spoof caching the script for the initial version. - int64 resource_id = storage()->NewResourceId(); + int64_t resource_id = storage()->NewResourceId(); version->script_cache_map()->NotifyStartedCaching(script, resource_id); WriteStringResponse(storage(), resource_id, kMockScriptBody); version->script_cache_map()->NotifyFinishedCaching( @@ -834,7 +838,7 @@ } // Spoof caching the script for the new version. - int64 resource_id = storage()->NewResourceId(); + int64_t resource_id = storage()->NewResourceId(); version->script_cache_map()->NotifyStartedCaching(script, resource_id); WriteStringResponse(storage(), resource_id, "mock_different_script"); version->script_cache_map()->NotifyFinishedCaching( @@ -888,7 +892,7 @@ ~EvictIncumbentVersionHelper() override {} void OnStartWorker(int embedded_worker_id, - int64 version_id, + int64_t version_id, const GURL& scope, const GURL& script) override { ServiceWorkerVersion* version = context()->GetLiveVersion(version_id);
diff --git a/content/browser/service_worker/service_worker_metrics.h b/content/browser/service_worker/service_worker_metrics.h index b02e4da1..ebf941d 100644 --- a/content/browser/service_worker/service_worker_metrics.h +++ b/content/browser/service_worker/service_worker_metrics.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_METRICS_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_METRICS_H_ +#include <stddef.h> + #include "base/macros.h" #include "content/browser/service_worker/service_worker_database.h" #include "content/common/service_worker/service_worker_types.h"
diff --git a/content/browser/service_worker/service_worker_process_manager.cc b/content/browser/service_worker/service_worker_process_manager.cc index 36715bc..cb1f5891 100644 --- a/content/browser/service_worker/service_worker_process_manager.cc +++ b/content/browser/service_worker/service_worker_process_manager.cc
@@ -4,6 +4,8 @@ #include "content/browser/service_worker/service_worker_process_manager.h" +#include <stddef.h> + #include <algorithm> #include <utility>
diff --git a/content/browser/service_worker/service_worker_process_manager_unittest.cc b/content/browser/service_worker/service_worker_process_manager_unittest.cc index bb0c1ff7..622412a 100644 --- a/content/browser/service_worker/service_worker_process_manager_unittest.cc +++ b/content/browser/service_worker/service_worker_process_manager_unittest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/bind.h" +#include "base/macros.h" #include "base/run_loop.h" #include "content/browser/service_worker/service_worker_process_manager.h" #include "content/public/test/mock_render_process_host.h"
diff --git a/content/browser/service_worker/service_worker_provider_host.cc b/content/browser/service_worker/service_worker_provider_host.cc index 174b44ad..359010c9 100644 --- a/content/browser/service_worker/service_worker_provider_host.cc +++ b/content/browser/service_worker/service_worker_provider_host.cc
@@ -216,7 +216,7 @@ notify_controllerchange)); } -bool ServiceWorkerProviderHost::SetHostedVersionId(int64 version_id) { +bool ServiceWorkerProviderHost::SetHostedVersionId(int64_t version_id) { if (!context_) return true; // System is shutting down. if (active_version()) @@ -323,7 +323,7 @@ void ServiceWorkerProviderHost::AddAllMatchingRegistrations() { DCHECK(context_); - const std::map<int64, ServiceWorkerRegistration*>& registrations = + const std::map<int64_t, ServiceWorkerRegistration*>& registrations = context_->GetLiveRegistrations(); for (const auto& key_registration : registrations) { ServiceWorkerRegistration* registration = key_registration.second;
diff --git a/content/browser/service_worker/service_worker_provider_host.h b/content/browser/service_worker/service_worker_provider_host.h index 1ed95fa..cab3ff0 100644 --- a/content/browser/service_worker/service_worker_provider_host.h +++ b/content/browser/service_worker/service_worker_provider_host.h
@@ -5,10 +5,14 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_PROVIDER_HOST_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_PROVIDER_HOST_H_ +#include <stddef.h> +#include <stdint.h> + #include <set> #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/browser/service_worker/service_worker_registration.h" @@ -131,7 +135,7 @@ // Returns false if the version is not in the expected STARTING in our // process state. That would be indicative of a bad IPC message. - bool SetHostedVersionId(int64 versions_id); + bool SetHostedVersionId(int64_t versions_id); // Returns a handler for a request, the handler may return NULL if // the request doesn't require special handling.
diff --git a/content/browser/service_worker/service_worker_provider_host_unittest.cc b/content/browser/service_worker/service_worker_provider_host_unittest.cc index 463d5ca..642260b0 100644 --- a/content/browser/service_worker/service_worker_provider_host_unittest.cc +++ b/content/browser/service_worker/service_worker_provider_host_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/thread_task_runner_handle.h" #include "content/browser/service_worker/embedded_worker_test_helper.h"
diff --git a/content/browser/service_worker/service_worker_quota_client.h b/content/browser/service_worker/service_worker_quota_client.h index a1cf91d..3c6f84fb 100644 --- a/content/browser/service_worker/service_worker_quota_client.h +++ b/content/browser/service_worker/service_worker_quota_client.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_QUOTA_CLIENT_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_QUOTA_CLIENT_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "storage/browser/quota/quota_client.h"
diff --git a/content/browser/service_worker/service_worker_read_from_cache_job.cc b/content/browser/service_worker/service_worker_read_from_cache_job.cc index 3b0d658c..bd9844b3 100644 --- a/content/browser/service_worker/service_worker_read_from_cache_job.cc +++ b/content/browser/service_worker/service_worker_read_from_cache_job.cc
@@ -28,7 +28,7 @@ ResourceType resource_type, base::WeakPtr<ServiceWorkerContextCore> context, const scoped_refptr<ServiceWorkerVersion>& version, - int64 resource_id) + int64_t resource_id) : net::URLRequestJob(request, network_delegate), resource_type_(resource_type), resource_id_(resource_id),
diff --git a/content/browser/service_worker/service_worker_read_from_cache_job.h b/content/browser/service_worker/service_worker_read_from_cache_job.h index 0ee30e64..41b40ca 100644 --- a/content/browser/service_worker/service_worker_read_from_cache_job.h +++ b/content/browser/service_worker/service_worker_read_from_cache_job.h
@@ -5,8 +5,11 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_READ_FROM_CACHE_JOB_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_READ_FROM_CACHE_JOB_H_ +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/browser/service_worker/service_worker_disk_cache.h" @@ -33,7 +36,7 @@ ResourceType resource_type, base::WeakPtr<ServiceWorkerContextCore> context, const scoped_refptr<ServiceWorkerVersion>& version, - int64 resource_id); + int64_t resource_id); ~ServiceWorkerReadFromCacheJob() override; private: @@ -66,7 +69,7 @@ void Done(const net::URLRequestStatus& status); const ResourceType resource_type_; - const int64 resource_id_; + const int64_t resource_id_; base::WeakPtr<ServiceWorkerContextCore> context_; scoped_refptr<ServiceWorkerVersion> version_;
diff --git a/content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc b/content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc index 93c86a13..aa7508b 100644 --- a/content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc +++ b/content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc
@@ -4,6 +4,9 @@ #include "content/browser/service_worker/service_worker_read_from_cache_job.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/run_loop.h" #include "content/browser/fileapi/mock_url_request_delegate.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" @@ -23,11 +26,11 @@ namespace { -const int64 kRegistrationId = 1; -const int64 kVersionId = 2; -const int64 kMainScriptResourceId = 10; -const int64 kImportedScriptResourceId = 11; -const int64 kResourceSize = 100; +const int64_t kRegistrationId = 1; +const int64_t kVersionId = 2; +const int64_t kMainScriptResourceId = 10; +const int64_t kImportedScriptResourceId = 11; +const int64_t kResourceSize = 100; void DidStoreRegistration(ServiceWorkerStatusCode* status_out, const base::Closure& quit_closure, @@ -88,7 +91,7 @@ ASSERT_TRUE(WriteResource(imported_script_.resource_id)); } - bool WriteResource(int64 resource_id) { + bool WriteResource(int64_t resource_id) { const char kHttpHeaders[] = "HTTP/1.0 200 OK\0Content-Length: 5\0\0"; const char kHttpBody[] = "Hello"; const int length = arraysize(kHttpBody); @@ -210,7 +213,7 @@ scoped_ptr<net::URLRequest> request = url_request_context_->CreateRequest( GURL("http://example.com/nonexistent"), net::DEFAULT_PRIORITY, &delegate_); - const int64 kNonexistentResourceId = 100; + const int64_t kNonexistentResourceId = 100; scoped_ptr<ServiceWorkerReadFromCacheJob> job( new ServiceWorkerReadFromCacheJob( request.get(), nullptr /* NetworkDelegate */,
diff --git a/content/browser/service_worker/service_worker_register_job.cc b/content/browser/service_worker/service_worker_register_job.cc index 244905e..69f5acdc 100644 --- a/content/browser/service_worker/service_worker_register_job.cc +++ b/content/browser/service_worker/service_worker_register_job.cc
@@ -4,6 +4,8 @@ #include "content/browser/service_worker/service_worker_register_job.h" +#include <stdint.h> + #include <vector> #include "base/location.h" @@ -274,7 +276,7 @@ void ServiceWorkerRegisterJob::RegisterAndContinue() { SetPhase(REGISTER); - int64 registration_id = context_->storage()->NewRegistrationId(); + int64_t registration_id = context_->storage()->NewRegistrationId(); if (registration_id == kInvalidServiceWorkerRegistrationId) { Complete(SERVICE_WORKER_ERROR_ABORT); return; @@ -331,7 +333,7 @@ SetPhase(UPDATE); context_->storage()->NotifyInstallingRegistration(registration()); - int64 version_id = context_->storage()->NewVersionId(); + int64_t version_id = context_->storage()->NewVersionId(); if (version_id == kInvalidServiceWorkerVersionId) { Complete(SERVICE_WORKER_ERROR_ABORT); return;
diff --git a/content/browser/service_worker/service_worker_register_job.h b/content/browser/service_worker/service_worker_register_job.h index a439b0c..15033bcc 100644 --- a/content/browser/service_worker/service_worker_register_job.h +++ b/content/browser/service_worker/service_worker_register_job.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/browser/service_worker/embedded_worker_instance.h" #include "content/browser/service_worker/service_worker_register_job_base.h"
diff --git a/content/browser/service_worker/service_worker_registration.cc b/content/browser/service_worker/service_worker_registration.cc index 1a2f536..fbb87a0 100644 --- a/content/browser/service_worker/service_worker_registration.cc +++ b/content/browser/service_worker/service_worker_registration.cc
@@ -25,7 +25,7 @@ ServiceWorkerRegistration::ServiceWorkerRegistration( const GURL& pattern, - int64 registration_id, + int64_t registration_id, base::WeakPtr<ServiceWorkerContextCore> context) : pattern_(pattern), registration_id_(registration_id),
diff --git a/content/browser/service_worker/service_worker_registration.h b/content/browser/service_worker/service_worker_registration.h index accb464d..dab2043 100644 --- a/content/browser/service_worker/service_worker_registration.h +++ b/content/browser/service_worker/service_worker_registration.h
@@ -5,10 +5,12 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REGISTRATION_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REGISTRATION_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "content/browser/service_worker/service_worker_version.h" @@ -50,10 +52,10 @@ }; ServiceWorkerRegistration(const GURL& pattern, - int64 registration_id, + int64_t registration_id, base::WeakPtr<ServiceWorkerContextCore> context); - int64 id() const { return registration_id_; } + int64_t id() const { return registration_id_; } const GURL& pattern() const { return pattern_; } bool is_deleted() const { return is_deleted_; } @@ -168,7 +170,7 @@ ServiceWorkerStatusCode status); const GURL pattern_; - const int64 registration_id_; + const int64_t registration_id_; bool is_deleted_; bool is_uninstalling_; bool is_uninstalled_;
diff --git a/content/browser/service_worker/service_worker_registration_handle.h b/content/browser/service_worker/service_worker_registration_handle.h index bbe0cf8..6fb4e07d 100644 --- a/content/browser/service_worker/service_worker_registration_handle.h +++ b/content/browser/service_worker/service_worker_registration_handle.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REGISTRATION_HANDLE_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REGISTRATION_HANDLE_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/service_worker/service_worker_registration_unittest.cc b/content/browser/service_worker/service_worker_registration_unittest.cc index f7a644c8..0bbe6733 100644 --- a/content/browser/service_worker/service_worker_registration_unittest.cc +++ b/content/browser/service_worker/service_worker_registration_unittest.cc
@@ -4,6 +4,8 @@ #include "content/browser/service_worker/service_worker_registration.h" +#include <stdint.h> + #include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/run_loop.h" @@ -87,15 +89,15 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) { const GURL kScope("http://www.example.not/"); const GURL kScript("http://www.example.not/service_worker.js"); - int64 kRegistrationId = 1L; + int64_t kRegistrationId = 1L; scoped_refptr<ServiceWorkerRegistration> registration = new ServiceWorkerRegistration( kScope, kRegistrationId, context_ptr_); - const int64 version_1_id = 1L; - const int64 version_2_id = 2L; + const int64_t version_1_id = 1L; + const int64_t version_2_id = 2L; scoped_refptr<ServiceWorkerVersion> version_1 = new ServiceWorkerVersion( registration.get(), kScript, version_1_id, context_ptr_); scoped_refptr<ServiceWorkerVersion> version_2 = new ServiceWorkerVersion( @@ -156,7 +158,7 @@ TEST_F(ServiceWorkerRegistrationTest, FailedRegistrationNoCrash) { const GURL kScope("http://www.example.not/"); - int64 kRegistrationId = 1L; + int64_t kRegistrationId = 1L; scoped_refptr<ServiceWorkerRegistration> registration = new ServiceWorkerRegistration( kScope,
diff --git a/content/browser/service_worker/service_worker_request_handler.cc b/content/browser/service_worker/service_worker_request_handler.cc index 9cb0b2d0..bd27e42e 100644 --- a/content/browser/service_worker/service_worker_request_handler.cc +++ b/content/browser/service_worker/service_worker_request_handler.cc
@@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "content/browser/service_worker/service_worker_context_core.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/browser/service_worker/service_worker_navigation_handle_core.h"
diff --git a/content/browser/service_worker/service_worker_request_handler.h b/content/browser/service_worker/service_worker_request_handler.h index 332c9a9..9f9c7eb4 100644 --- a/content/browser/service_worker/service_worker_request_handler.h +++ b/content/browser/service_worker/service_worker_request_handler.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REQUEST_HANDLER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_REQUEST_HANDLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/supports_user_data.h" #include "base/time/time.h"
diff --git a/content/browser/service_worker/service_worker_script_cache_map.cc b/content/browser/service_worker/service_worker_script_cache_map.cc index c99fef87..5a9f2b3 100644 --- a/content/browser/service_worker/service_worker_script_cache_map.cc +++ b/content/browser/service_worker/service_worker_script_cache_map.cc
@@ -24,15 +24,15 @@ ServiceWorkerScriptCacheMap::~ServiceWorkerScriptCacheMap() { } -int64 ServiceWorkerScriptCacheMap::LookupResourceId(const GURL& url) { +int64_t ServiceWorkerScriptCacheMap::LookupResourceId(const GURL& url) { ResourceMap::const_iterator found = resource_map_.find(url); if (found == resource_map_.end()) return kInvalidServiceWorkerResourceId; return found->second.resource_id; } -void ServiceWorkerScriptCacheMap::NotifyStartedCaching( - const GURL& url, int64 resource_id) { +void ServiceWorkerScriptCacheMap::NotifyStartedCaching(const GURL& url, + int64_t resource_id) { DCHECK_EQ(kInvalidServiceWorkerResourceId, LookupResourceId(url)); DCHECK(owner_->status() == ServiceWorkerVersion::NEW || owner_->status() == ServiceWorkerVersion::INSTALLING) @@ -46,7 +46,7 @@ void ServiceWorkerScriptCacheMap::NotifyFinishedCaching( const GURL& url, - int64 size_bytes, + int64_t size_bytes, const net::URLRequestStatus& status, const std::string& status_message) { DCHECK_NE(kInvalidServiceWorkerResourceId, LookupResourceId(url));
diff --git a/content/browser/service_worker/service_worker_script_cache_map.h b/content/browser/service_worker/service_worker_script_cache_map.h index b4cf74b..f2c27c6d 100644 --- a/content/browser/service_worker/service_worker_script_cache_map.h +++ b/content/browser/service_worker/service_worker_script_cache_map.h
@@ -5,10 +5,13 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_SCRIPT_CACHE_MAP_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_SCRIPT_CACHE_MAP_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/browser/service_worker/service_worker_database.h" #include "content/common/content_export.h" @@ -27,13 +30,13 @@ // for a particular version's implicit script resources. class CONTENT_EXPORT ServiceWorkerScriptCacheMap { public: - int64 LookupResourceId(const GURL& url); + int64_t LookupResourceId(const GURL& url); // Used during the initial run of a new version to build the map // of resources ids. - void NotifyStartedCaching(const GURL& url, int64 resource_id); + void NotifyStartedCaching(const GURL& url, int64_t resource_id); void NotifyFinishedCaching(const GURL& url, - int64 size_bytes, + int64_t size_bytes, const net::URLRequestStatus& status, const std::string& status_message);
diff --git a/content/browser/service_worker/service_worker_storage.cc b/content/browser/service_worker/service_worker_storage.cc index 76cf507..4bb270f 100644 --- a/content/browser/service_worker/service_worker_storage.cc +++ b/content/browser/service_worker/service_worker_storage.cc
@@ -4,6 +4,8 @@ #include "content/browser/service_worker/service_worker_storage.h" +#include <stddef.h> + #include "base/bind_helpers.h" #include "base/files/file_util.h" #include "base/message_loop/message_loop.h" @@ -175,7 +177,7 @@ // To connect this TRACE_EVENT with the callback, TimeTicks is used for // callback id. - int64 callback_id = base::TimeTicks::Now().ToInternalValue(); + int64_t callback_id = base::TimeTicks::Now().ToInternalValue(); TRACE_EVENT_ASYNC_BEGIN1( "ServiceWorker", "ServiceWorkerStorage::FindRegistrationForDocument", @@ -248,7 +250,7 @@ } void ServiceWorkerStorage::FindRegistrationForId( - int64 registration_id, + int64_t registration_id, const GURL& origin, const FindRegistrationCallback& callback) { if (!LazyInitialize(base::Bind( @@ -294,7 +296,7 @@ } void ServiceWorkerStorage::FindRegistrationForIdOnly( - int64 registration_id, + int64_t registration_id, const FindRegistrationCallback& callback) { if (!LazyInitialize( base::Bind(&ServiceWorkerStorage::FindRegistrationForIdOnly, @@ -412,7 +414,7 @@ return; } - uint64 resources_total_size_bytes = 0; + uint64_t resources_total_size_bytes = 0; for (const auto& resource : resources) { resources_total_size_bytes += resource.size_bytes; } @@ -477,10 +479,9 @@ registration->last_update_check())); } -void ServiceWorkerStorage::DeleteRegistration( - int64 registration_id, - const GURL& origin, - const StatusCallback& callback) { +void ServiceWorkerStorage::DeleteRegistration(int64_t registration_id, + const GURL& origin, + const StatusCallback& callback) { DCHECK(state_ == INITIALIZED || state_ == DISABLED) << state_; if (IsDisabled()) { RunSoon(FROM_HERE, base::Bind(callback, SERVICE_WORKER_ERROR_ABORT)); @@ -515,24 +516,24 @@ } scoped_ptr<ServiceWorkerResponseReader> -ServiceWorkerStorage::CreateResponseReader(int64 resource_id) { +ServiceWorkerStorage::CreateResponseReader(int64_t resource_id) { return make_scoped_ptr( new ServiceWorkerResponseReader(resource_id, disk_cache())); } scoped_ptr<ServiceWorkerResponseWriter> -ServiceWorkerStorage::CreateResponseWriter(int64 resource_id) { +ServiceWorkerStorage::CreateResponseWriter(int64_t resource_id) { return make_scoped_ptr( new ServiceWorkerResponseWriter(resource_id, disk_cache())); } scoped_ptr<ServiceWorkerResponseMetadataWriter> -ServiceWorkerStorage::CreateResponseMetadataWriter(int64 resource_id) { +ServiceWorkerStorage::CreateResponseMetadataWriter(int64_t resource_id) { return make_scoped_ptr( new ServiceWorkerResponseMetadataWriter(resource_id, disk_cache())); } -void ServiceWorkerStorage::StoreUncommittedResourceId(int64 resource_id) { +void ServiceWorkerStorage::StoreUncommittedResourceId(int64_t resource_id) { DCHECK_NE(kInvalidServiceWorkerResourceId, resource_id); DCHECK_EQ(INITIALIZED, state_); @@ -543,18 +544,18 @@ database_task_manager_->GetTaskRunner(), FROM_HERE, base::Bind(&ServiceWorkerDatabase::WriteUncommittedResourceIds, base::Unretained(database_.get()), - std::set<int64>(&resource_id, &resource_id + 1)), + std::set<int64_t>(&resource_id, &resource_id + 1)), base::Bind(&ServiceWorkerStorage::DidWriteUncommittedResourceIds, weak_factory_.GetWeakPtr())); } -void ServiceWorkerStorage::DoomUncommittedResource(int64 resource_id) { +void ServiceWorkerStorage::DoomUncommittedResource(int64_t resource_id) { DCHECK_NE(kInvalidServiceWorkerResourceId, resource_id); - DoomUncommittedResources(std::set<int64>(&resource_id, &resource_id + 1)); + DoomUncommittedResources(std::set<int64_t>(&resource_id, &resource_id + 1)); } void ServiceWorkerStorage::DoomUncommittedResources( - const std::set<int64>& resource_ids) { + const std::set<int64_t>& resource_ids) { PostTaskAndReplyWithResult( database_task_manager_->GetTaskRunner(), FROM_HERE, base::Bind(&ServiceWorkerDatabase::PurgeUncommittedResourceIds, @@ -563,12 +564,11 @@ weak_factory_.GetWeakPtr(), resource_ids)); } -void ServiceWorkerStorage::StoreUserData( - int64 registration_id, - const GURL& origin, - const std::string& key, - const std::string& data, - const StatusCallback& callback) { +void ServiceWorkerStorage::StoreUserData(int64_t registration_id, + const GURL& origin, + const std::string& key, + const std::string& data, + const StatusCallback& callback) { DCHECK(state_ == INITIALIZED || state_ == DISABLED) << state_; if (IsDisabled()) { RunSoon(FROM_HERE, base::Bind(callback, SERVICE_WORKER_ERROR_ABORT)); @@ -591,10 +591,9 @@ callback)); } -void ServiceWorkerStorage::GetUserData( - int64 registration_id, - const std::string& key, - const GetUserDataCallback& callback) { +void ServiceWorkerStorage::GetUserData(int64_t registration_id, + const std::string& key, + const GetUserDataCallback& callback) { DCHECK(state_ == INITIALIZED || state_ == DISABLED) << state_; if (IsDisabled()) { RunSoon(FROM_HERE, @@ -620,10 +619,9 @@ callback))); } -void ServiceWorkerStorage::ClearUserData( - int64 registration_id, - const std::string& key, - const StatusCallback& callback) { +void ServiceWorkerStorage::ClearUserData(int64_t registration_id, + const std::string& key, + const StatusCallback& callback) { DCHECK(state_ == INITIALIZED || state_ == DISABLED) << state_; if (IsDisabled()) { RunSoon(FROM_HERE, base::Bind(callback, SERVICE_WORKER_ERROR_ABORT)); @@ -654,9 +652,10 @@ base::Bind(&ServiceWorkerStorage::GetUserDataForAllRegistrations, weak_factory_.GetWeakPtr(), key, callback))) { if (state_ != INITIALIZING) { - RunSoon(FROM_HERE, - base::Bind(callback, std::vector<std::pair<int64, std::string>>(), - SERVICE_WORKER_ERROR_ABORT)); + RunSoon( + FROM_HERE, + base::Bind(callback, std::vector<std::pair<int64_t, std::string>>(), + SERVICE_WORKER_ERROR_ABORT)); } return; } @@ -664,7 +663,7 @@ if (key.empty()) { RunSoon(FROM_HERE, - base::Bind(callback, std::vector<std::pair<int64, std::string>>(), + base::Bind(callback, std::vector<std::pair<int64_t, std::string>>(), SERVICE_WORKER_ERROR_FAILED)); return; } @@ -699,21 +698,21 @@ weak_factory_.GetWeakPtr(), callback)); } -int64 ServiceWorkerStorage::NewRegistrationId() { +int64_t ServiceWorkerStorage::NewRegistrationId() { if (state_ == DISABLED) return kInvalidServiceWorkerRegistrationId; DCHECK_EQ(INITIALIZED, state_); return next_registration_id_++; } -int64 ServiceWorkerStorage::NewVersionId() { +int64_t ServiceWorkerStorage::NewVersionId() { if (state_ == DISABLED) return kInvalidServiceWorkerVersionId; DCHECK_EQ(INITIALIZED, state_); return next_version_id_++; } -int64 ServiceWorkerStorage::NewResourceId() { +int64_t ServiceWorkerStorage::NewResourceId() { if (state_ == DISABLED) return kInvalidServiceWorkerResourceId; DCHECK_EQ(INITIALIZED, state_); @@ -736,7 +735,7 @@ ResourceList resources; version->script_cache_map()->GetResources(&resources); - std::set<int64> resource_ids; + std::set<int64_t> resource_ids; for (const auto& resource : resources) resource_ids.insert(resource.resource_id); DoomUncommittedResources(resource_ids); @@ -861,7 +860,7 @@ void ServiceWorkerStorage::DidFindRegistrationForDocument( const GURL& document_url, const FindRegistrationCallback& callback, - int64 callback_id, + int64_t callback_id, const ServiceWorkerDatabase::RegistrationData& data, const ResourceList& resources, ServiceWorkerDatabase::Status status) { @@ -979,7 +978,7 @@ } // Add all stored registrations. - std::set<int64> registration_ids; + std::set<int64_t> registration_ids; std::vector<scoped_refptr<ServiceWorkerRegistration>> registrations; size_t index = 0; for (const auto& registration_data : *registration_data_list) { @@ -1014,7 +1013,7 @@ } // Add all stored registrations. - std::set<int64> pushed_registrations; + std::set<int64_t> pushed_registrations; std::vector<ServiceWorkerRegistrationInfo> infos; for (const auto& registration_data : *registration_data_list) { const bool inserted = @@ -1074,7 +1073,7 @@ const ServiceWorkerDatabase::RegistrationData& new_version, const GURL& origin, const ServiceWorkerDatabase::RegistrationData& deleted_version, - const std::vector<int64>& newly_purgeable_resources, + const std::vector<int64_t>& newly_purgeable_resources, ServiceWorkerDatabase::Status status) { if (status != ServiceWorkerDatabase::STATUS_OK) { ScheduleDeleteAndStartOver(); @@ -1121,7 +1120,7 @@ const DidDeleteRegistrationParams& params, OriginState origin_state, const ServiceWorkerDatabase::RegistrationData& deleted_version, - const std::vector<int64>& newly_purgeable_resources, + const std::vector<int64_t>& newly_purgeable_resources, ServiceWorkerDatabase::Status status) { pending_deletions_.erase(params.registration_id); if (status != ServiceWorkerDatabase::STATUS_OK) { @@ -1155,7 +1154,7 @@ } void ServiceWorkerStorage::DidPurgeUncommittedResourceIds( - const std::set<int64>& resource_ids, + const std::set<int64_t>& resource_ids, ServiceWorkerDatabase::Status status) { if (status != ServiceWorkerDatabase::STATUS_OK) { ScheduleDeleteAndStartOver(); @@ -1198,7 +1197,7 @@ void ServiceWorkerStorage::DidGetUserDataForAllRegistrations( const GetUserDataForAllRegistrationsCallback& callback, - const std::vector<std::pair<int64, std::string>>& user_data, + const std::vector<std::pair<int64_t, std::string>>& user_data, ServiceWorkerDatabase::Status status) { if (status != ServiceWorkerDatabase::STATUS_OK) ScheduleDeleteAndStartOver(); @@ -1268,7 +1267,7 @@ } ServiceWorkerRegistration* -ServiceWorkerStorage::FindInstallingRegistrationForId(int64 registration_id) { +ServiceWorkerStorage::FindInstallingRegistrationForId(int64_t registration_id) { RegistrationRefsById::const_iterator found = installing_registrations_.find(registration_id); if (found == installing_registrations_.end()) @@ -1315,17 +1314,17 @@ } void ServiceWorkerStorage::StartPurgingResources( - const std::set<int64>& resource_ids) { + const std::set<int64_t>& resource_ids) { DCHECK(has_checked_for_stale_resources_); - for (int64 resource_id : resource_ids) + for (int64_t resource_id : resource_ids) purgeable_resource_ids_.push_back(resource_id); ContinuePurgingResources(); } void ServiceWorkerStorage::StartPurgingResources( - const std::vector<int64>& resource_ids) { + const std::vector<int64_t>& resource_ids) { DCHECK(has_checked_for_stale_resources_); - for (int64 resource_id : resource_ids) + for (int64_t resource_id : resource_ids) purgeable_resource_ids_.push_back(resource_id); ContinuePurgingResources(); } @@ -1345,14 +1344,14 @@ // Do one at a time until we're done, use RunSoon to avoid recursion when // DoomEntry returns immediately. is_purge_pending_ = true; - int64 id = purgeable_resource_ids_.front(); + int64_t id = purgeable_resource_ids_.front(); purgeable_resource_ids_.pop_front(); RunSoon(FROM_HERE, base::Bind(&ServiceWorkerStorage::PurgeResource, weak_factory_.GetWeakPtr(), id)); } -void ServiceWorkerStorage::PurgeResource(int64 id) { +void ServiceWorkerStorage::PurgeResource(int64_t id) { DCHECK(is_purge_pending_); int rv = disk_cache()->DoomEntry( id, base::Bind(&ServiceWorkerStorage::OnResourcePurged, @@ -1361,7 +1360,7 @@ OnResourcePurged(id, rv); } -void ServiceWorkerStorage::OnResourcePurged(int64 id, int rv) { +void ServiceWorkerStorage::OnResourcePurged(int64_t id, int rv) { DCHECK(is_purge_pending_); is_purge_pending_ = false; @@ -1369,10 +1368,9 @@ database_task_manager_->GetTaskRunner()->PostTask( FROM_HERE, - base::Bind(base::IgnoreResult( - &ServiceWorkerDatabase::ClearPurgeableResourceIds), - base::Unretained(database_.get()), - std::set<int64>(&id, &id + 1))); + base::Bind( + base::IgnoreResult(&ServiceWorkerDatabase::ClearPurgeableResourceIds), + base::Unretained(database_.get()), std::set<int64_t>(&id, &id + 1))); // Continue purging resources regardless of the previous result. ContinuePurgingResources(); @@ -1391,7 +1389,7 @@ } void ServiceWorkerStorage::DidCollectStaleResources( - const std::vector<int64>& stale_resource_ids, + const std::vector<int64_t>& stale_resource_ids, ServiceWorkerDatabase::Status status) { if (status != ServiceWorkerDatabase::STATUS_OK) { DCHECK_NE(ServiceWorkerDatabase::STATUS_ERROR_NOT_FOUND, status); @@ -1426,14 +1424,14 @@ ServiceWorkerDatabase* database, scoped_refptr<base::SequencedTaskRunner> original_task_runner, const GetResourcesCallback& callback) { - std::set<int64> ids; + std::set<int64_t> ids; ServiceWorkerDatabase::Status status = database->GetUncommittedResourceIds(&ids); if (status != ServiceWorkerDatabase::STATUS_OK) { original_task_runner->PostTask( FROM_HERE, - base::Bind( - callback, std::vector<int64>(ids.begin(), ids.end()), status)); + base::Bind(callback, std::vector<int64_t>(ids.begin(), ids.end()), + status)); return; } @@ -1441,8 +1439,8 @@ if (status != ServiceWorkerDatabase::STATUS_OK) { original_task_runner->PostTask( FROM_HERE, - base::Bind( - callback, std::vector<int64>(ids.begin(), ids.end()), status)); + base::Bind(callback, std::vector<int64_t>(ids.begin(), ids.end()), + status)); return; } @@ -1450,7 +1448,8 @@ status = database->GetPurgeableResourceIds(&ids); original_task_runner->PostTask( FROM_HERE, - base::Bind(callback, std::vector<int64>(ids.begin(), ids.end()), status)); + base::Bind(callback, std::vector<int64_t>(ids.begin(), ids.end()), + status)); } void ServiceWorkerStorage::ReadInitialDataFromDB( @@ -1487,19 +1486,19 @@ void ServiceWorkerStorage::DeleteRegistrationFromDB( ServiceWorkerDatabase* database, scoped_refptr<base::SequencedTaskRunner> original_task_runner, - int64 registration_id, + int64_t registration_id, const GURL& origin, const DeleteRegistrationCallback& callback) { DCHECK(database); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; ServiceWorkerDatabase::Status status = database->DeleteRegistration( registration_id, origin, &deleted_version, &newly_purgeable_resources); if (status != ServiceWorkerDatabase::STATUS_OK) { original_task_runner->PostTask( FROM_HERE, base::Bind(callback, OriginState::KEEP_ALL, deleted_version, - std::vector<int64>(), status)); + std::vector<int64_t>(), status)); return; } @@ -1510,7 +1509,7 @@ if (status != ServiceWorkerDatabase::STATUS_OK) { original_task_runner->PostTask( FROM_HERE, base::Bind(callback, OriginState::KEEP_ALL, deleted_version, - std::vector<int64>(), status)); + std::vector<int64_t>(), status)); return; } @@ -1539,7 +1538,7 @@ const WriteRegistrationCallback& callback) { DCHECK(database); ServiceWorkerDatabase::RegistrationData deleted_version; - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; ServiceWorkerDatabase::Status status = database->WriteRegistration( data, resources, &deleted_version, &newly_purgeable_resources); original_task_runner->PostTask(FROM_HERE, @@ -1575,7 +1574,7 @@ // Find one with a pattern match. LongestScopeMatcher matcher(document_url); - int64 match = kInvalidServiceWorkerRegistrationId; + int64_t match = kInvalidServiceWorkerRegistrationId; for (const auto& registration_data : registration_data_list) if (matcher.MatchLongest(registration_data.scope)) match = registration_data.registration_id; @@ -1626,7 +1625,7 @@ void ServiceWorkerStorage::FindForIdInDB( ServiceWorkerDatabase* database, scoped_refptr<base::SequencedTaskRunner> original_task_runner, - int64 registration_id, + int64_t registration_id, const GURL& origin, const FindInDBCallback& callback) { ServiceWorkerDatabase::RegistrationData data; @@ -1640,7 +1639,7 @@ void ServiceWorkerStorage::FindForIdOnlyInDB( ServiceWorkerDatabase* database, scoped_refptr<base::SequencedTaskRunner> original_task_runner, - int64 registration_id, + int64_t registration_id, const FindInDBCallback& callback) { GURL origin; ServiceWorkerDatabase::Status status = @@ -1659,7 +1658,7 @@ void ServiceWorkerStorage::GetUserDataInDB( ServiceWorkerDatabase* database, scoped_refptr<base::SequencedTaskRunner> original_task_runner, - int64 registration_id, + int64_t registration_id, const std::string& key, const GetUserDataInDBCallback& callback) { std::string data; @@ -1674,7 +1673,7 @@ scoped_refptr<base::SequencedTaskRunner> original_task_runner, const std::string& key, const GetUserDataForAllRegistrationsInDBCallback& callback) { - std::vector<std::pair<int64, std::string>> user_data; + std::vector<std::pair<int64_t, std::string>> user_data; ServiceWorkerDatabase::Status status = database->ReadUserDataForAllRegistrations(key, &user_data); original_task_runner->PostTask(FROM_HERE, @@ -1686,7 +1685,7 @@ const std::set<GURL>& origins) { DCHECK(database); - std::vector<int64> newly_purgeable_resources; + std::vector<int64_t> newly_purgeable_resources; database->DeleteAllDataForOrigins(origins, &newly_purgeable_resources); }
diff --git a/content/browser/service_worker/service_worker_storage.h b/content/browser/service_worker/service_worker_storage.h index 7317a631..92042de 100644 --- a/content/browser/service_worker/service_worker_storage.h +++ b/content/browser/service_worker/service_worker_storage.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STORAGE_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_STORAGE_H_ +#include <stdint.h> + #include <deque> #include <map> #include <set> @@ -14,6 +16,7 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/browser/service_worker/service_worker_database.h" #include "content/browser/service_worker/service_worker_database_task_manager.h" @@ -63,9 +66,8 @@ void(const std::string& data, ServiceWorkerStatusCode status)> GetUserDataCallback; typedef base::Callback<void( - const std::vector<std::pair<int64, std::string>>& user_data, - ServiceWorkerStatusCode status)> - GetUserDataForAllRegistrationsCallback; + const std::vector<std::pair<int64_t, std::string>>& user_data, + ServiceWorkerStatusCode status)> GetUserDataForAllRegistrationsCallback; ~ServiceWorkerStorage() override; @@ -95,7 +97,7 @@ const FindRegistrationCallback& callback); void FindRegistrationForPattern(const GURL& scope, const FindRegistrationCallback& callback); - void FindRegistrationForId(int64 registration_id, + void FindRegistrationForId(int64_t registration_id, const GURL& origin, const FindRegistrationCallback& callback); @@ -104,7 +106,7 @@ // is all that is available this method can be used instead. // Like |FindRegistrationForId| this method may complete immediately (the // callback may be called prior to the method returning) or asynchronously. - void FindRegistrationForIdOnly(int64 registration_id, + void FindRegistrationForIdOnly(int64_t registration_id, const FindRegistrationCallback& callback); ServiceWorkerRegistration* GetUninstallingRegistration(const GURL& scope); @@ -136,38 +138,38 @@ // Deletes the registration data for |registration_id|. If the registration's // version is live, its script resources will remain available. // PurgeResources should be called when it's OK to delete them. - void DeleteRegistration(int64 registration_id, + void DeleteRegistration(int64_t registration_id, const GURL& origin, const StatusCallback& callback); scoped_ptr<ServiceWorkerResponseReader> CreateResponseReader( - int64 resource_id); + int64_t resource_id); scoped_ptr<ServiceWorkerResponseWriter> CreateResponseWriter( - int64 resource_id); + int64_t resource_id); scoped_ptr<ServiceWorkerResponseMetadataWriter> CreateResponseMetadataWriter( - int64 resource_id); + int64_t resource_id); // Adds |resource_id| to the set of resources that are in the disk cache // but not yet stored with a registration. - void StoreUncommittedResourceId(int64 resource_id); + void StoreUncommittedResourceId(int64_t resource_id); // Removes resource ids from uncommitted list, adds them to the purgeable list // and purges them. - void DoomUncommittedResource(int64 resource_id); - void DoomUncommittedResources(const std::set<int64>& resource_ids); + void DoomUncommittedResource(int64_t resource_id); + void DoomUncommittedResources(const std::set<int64_t>& resource_ids); // Provide a storage mechanism to read/write arbitrary data associated with // a registration. Each registration has its own key namespace. Stored data // is deleted when the associated registraton is deleted. - void GetUserData(int64 registration_id, + void GetUserData(int64_t registration_id, const std::string& key, const GetUserDataCallback& callback); - void StoreUserData(int64 registration_id, + void StoreUserData(int64_t registration_id, const GURL& origin, const std::string& key, const std::string& data, const StatusCallback& callback); - void ClearUserData(int64 registration_id, + void ClearUserData(int64_t registration_id, const std::string& key, const StatusCallback& callback); // Returns all registrations that have user data with a particular key, as @@ -186,15 +188,15 @@ // Returns a new registration id which is guaranteed to be unique in the // storage. Returns kInvalidServiceWorkerRegistrationId if the storage is // disabled. - int64 NewRegistrationId(); + int64_t NewRegistrationId(); // Returns a new version id which is guaranteed to be unique in the storage. // Returns kInvalidServiceWorkerVersionId if the storage is disabled. - int64 NewVersionId(); + int64_t NewVersionId(); // Returns a new resource id which is guaranteed to be unique in the storage. // Returns kInvalidServiceWorkerResourceId if the storage is disabled. - int64 NewResourceId(); + int64_t NewResourceId(); // Intended for use only by ServiceWorkerRegisterJob and // ServiceWorkerRegistration. @@ -248,9 +250,9 @@ DeleteAndStartOver_OpenedFileExists); struct InitialData { - int64 next_registration_id; - int64 next_version_id; - int64 next_resource_id; + int64_t next_registration_id; + int64_t next_version_id; + int64_t next_resource_id; std::set<GURL> origins; std::set<GURL> foreign_fetch_origins; @@ -260,7 +262,7 @@ // Because there are too many params for base::Bind to wrap a closure around. struct DidDeleteRegistrationParams { - int64 registration_id; + int64_t registration_id; GURL origin; StatusCallback callback; @@ -279,7 +281,7 @@ }; typedef std::vector<ServiceWorkerDatabase::RegistrationData> RegistrationList; - typedef std::map<int64, scoped_refptr<ServiceWorkerRegistration> > + typedef std::map<int64_t, scoped_refptr<ServiceWorkerRegistration>> RegistrationRefsById; typedef base::Callback<void(scoped_ptr<InitialData> data, ServiceWorkerDatabase::Status status)> @@ -289,12 +291,12 @@ typedef base::Callback<void( const GURL& origin, const ServiceWorkerDatabase::RegistrationData& deleted_version_data, - const std::vector<int64>& newly_purgeable_resources, + const std::vector<int64_t>& newly_purgeable_resources, ServiceWorkerDatabase::Status status)> WriteRegistrationCallback; typedef base::Callback<void( OriginState origin_state, const ServiceWorkerDatabase::RegistrationData& deleted_version_data, - const std::vector<int64>& newly_purgeable_resources, + const std::vector<int64_t>& newly_purgeable_resources, ServiceWorkerDatabase::Status status)> DeleteRegistrationCallback; typedef base::Callback<void( const ServiceWorkerDatabase::RegistrationData& data, @@ -304,10 +306,10 @@ const std::string& data, ServiceWorkerDatabase::Status)> GetUserDataInDBCallback; typedef base::Callback<void( - const std::vector<std::pair<int64, std::string>>& user_data, + const std::vector<std::pair<int64_t, std::string>>& user_data, ServiceWorkerDatabase::Status)> GetUserDataForAllRegistrationsInDBCallback; - typedef base::Callback<void(const std::vector<int64>& resource_ids, + typedef base::Callback<void(const std::vector<int64_t>& resource_ids, ServiceWorkerDatabase::Status status)> GetResourcesCallback; @@ -329,7 +331,7 @@ void DidFindRegistrationForDocument( const GURL& document_url, const FindRegistrationCallback& callback, - int64 callback_id, + int64_t callback_id, const ServiceWorkerDatabase::RegistrationData& data, const ResourceList& resources, ServiceWorkerDatabase::Status status); @@ -358,7 +360,7 @@ const ServiceWorkerDatabase::RegistrationData& new_version, const GURL& origin, const ServiceWorkerDatabase::RegistrationData& deleted_version, - const std::vector<int64>& newly_purgeable_resources, + const std::vector<int64_t>& newly_purgeable_resources, ServiceWorkerDatabase::Status status); void DidUpdateToActiveState( const StatusCallback& callback, @@ -367,10 +369,10 @@ const DidDeleteRegistrationParams& params, OriginState origin_state, const ServiceWorkerDatabase::RegistrationData& deleted_version, - const std::vector<int64>& newly_purgeable_resources, + const std::vector<int64_t>& newly_purgeable_resources, ServiceWorkerDatabase::Status status); void DidWriteUncommittedResourceIds(ServiceWorkerDatabase::Status status); - void DidPurgeUncommittedResourceIds(const std::set<int64>& resource_ids, + void DidPurgeUncommittedResourceIds(const std::set<int64_t>& resource_ids, ServiceWorkerDatabase::Status status); void DidStoreUserData( const StatusCallback& callback, @@ -384,7 +386,7 @@ ServiceWorkerDatabase::Status status); void DidGetUserDataForAllRegistrations( const GetUserDataForAllRegistrationsCallback& callback, - const std::vector<std::pair<int64, std::string>>& user_data, + const std::vector<std::pair<int64_t, std::string>>& user_data, ServiceWorkerDatabase::Status status); void ReturnFoundRegistration( const FindRegistrationCallback& callback, @@ -399,25 +401,25 @@ ServiceWorkerRegistration* FindInstallingRegistrationForPattern( const GURL& scope); ServiceWorkerRegistration* FindInstallingRegistrationForId( - int64 registration_id); + int64_t registration_id); // Lazy disk_cache getter. ServiceWorkerDiskCache* disk_cache(); void InitializeDiskCache(); void OnDiskCacheInitialized(int rv); - void StartPurgingResources(const std::set<int64>& resource_ids); - void StartPurgingResources(const std::vector<int64>& resource_ids); + void StartPurgingResources(const std::set<int64_t>& resource_ids); + void StartPurgingResources(const std::vector<int64_t>& resource_ids); void StartPurgingResources(const ResourceList& resources); void ContinuePurgingResources(); - void PurgeResource(int64 id); - void OnResourcePurged(int64 id, int rv); + void PurgeResource(int64_t id); + void OnResourcePurged(int64_t id, int rv); // Deletes purgeable and uncommitted resources left over from the previous // browser session. This must be called once per session before any database // operation that may mutate the purgeable or uncommitted resource lists. void DeleteStaleResources(); - void DidCollectStaleResources(const std::vector<int64>& stale_resource_ids, + void DidCollectStaleResources(const std::vector<int64_t>& stale_resource_ids, ServiceWorkerDatabase::Status status); void ClearSessionOnlyOrigins(); @@ -434,7 +436,7 @@ static void DeleteRegistrationFromDB( ServiceWorkerDatabase* database, scoped_refptr<base::SequencedTaskRunner> original_task_runner, - int64 registration_id, + int64_t registration_id, const GURL& origin, const DeleteRegistrationCallback& callback); static void WriteRegistrationInDB( @@ -456,18 +458,18 @@ static void FindForIdInDB( ServiceWorkerDatabase* database, scoped_refptr<base::SequencedTaskRunner> original_task_runner, - int64 registration_id, + int64_t registration_id, const GURL& origin, const FindInDBCallback& callback); static void FindForIdOnlyInDB( ServiceWorkerDatabase* database, scoped_refptr<base::SequencedTaskRunner> original_task_runner, - int64 registration_id, + int64_t registration_id, const FindInDBCallback& callback); static void GetUserDataInDB( ServiceWorkerDatabase* database, scoped_refptr<base::SequencedTaskRunner> original_task_runner, - int64 registration_id, + int64_t registration_id, const std::string& key, const GetUserDataInDBCallback& callback); static void GetUserDataForAllRegistrationsInDB( @@ -498,9 +500,9 @@ // Pending database tasks waiting for initialization. std::vector<base::Closure> pending_tasks_; - int64 next_registration_id_; - int64 next_version_id_; - int64 next_resource_id_; + int64_t next_registration_id_; + int64_t next_version_id_; + int64_t next_resource_id_; enum State { UNINITIALIZED, @@ -525,10 +527,10 @@ scoped_ptr<ServiceWorkerDiskCache> disk_cache_; - std::deque<int64> purgeable_resource_ids_; + std::deque<int64_t> purgeable_resource_ids_; bool is_purge_pending_; bool has_checked_for_stale_resources_; - std::set<int64> pending_deletions_; + std::set<int64_t> pending_deletions_; base::WeakPtrFactory<ServiceWorkerStorage> weak_factory_;
diff --git a/content/browser/service_worker/service_worker_storage_unittest.cc b/content/browser/service_worker/service_worker_storage_unittest.cc index 8e65963..2cc2c49 100644 --- a/content/browser/service_worker/service_worker_storage_unittest.cc +++ b/content/browser/service_worker/service_worker_storage_unittest.cc
@@ -2,13 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/service_worker/service_worker_context_core.h" #include "content/browser/service_worker/service_worker_disk_cache.h" @@ -116,19 +120,20 @@ void GetUserDataForAllRegistrationsCallback( bool* was_called, - std::vector<std::pair<int64, std::string>>* data_out, + std::vector<std::pair<int64_t, std::string>>* data_out, ServiceWorkerStatusCode* status_out, - const std::vector<std::pair<int64, std::string>>& data, + const std::vector<std::pair<int64_t, std::string>>& data, ServiceWorkerStatusCode status) { *was_called = true; *data_out = data; *status_out = status; } -void WriteResponse( - ServiceWorkerStorage* storage, int64 id, - const std::string& headers, - IOBuffer* body, int length) { +void WriteResponse(ServiceWorkerStorage* storage, + int64_t id, + const std::string& headers, + IOBuffer* body, + int length) { scoped_ptr<ServiceWorkerResponseWriter> writer = storage->CreateResponseWriter(id); @@ -153,15 +158,15 @@ } } -void WriteStringResponse( - ServiceWorkerStorage* storage, int64 id, - const std::string& headers, - const std::string& body) { +void WriteStringResponse(ServiceWorkerStorage* storage, + int64_t id, + const std::string& headers, + const std::string& body) { scoped_refptr<IOBuffer> body_buffer(new WrappedIOBuffer(body.data())); WriteResponse(storage, id, headers, body_buffer.get(), body.length()); } -void WriteBasicResponse(ServiceWorkerStorage* storage, int64 id) { +void WriteBasicResponse(ServiceWorkerStorage* storage, int64_t id) { scoped_ptr<ServiceWorkerResponseWriter> writer = storage->CreateResponseWriter(id); @@ -171,7 +176,8 @@ WriteStringResponse(storage, id, headers, std::string(kHttpBody)); } -bool VerifyBasicResponse(ServiceWorkerStorage* storage, int64 id, +bool VerifyBasicResponse(ServiceWorkerStorage* storage, + int64_t id, bool expected_positive_result) { const std::string kExpectedHttpBody("Hello"); scoped_ptr<ServiceWorkerResponseReader> reader = @@ -212,7 +218,7 @@ } int WriteResponseMetadata(ServiceWorkerStorage* storage, - int64 id, + int64_t id, const std::string& metadata) { scoped_refptr<IOBuffer> body_buffer(new WrappedIOBuffer(metadata.data())); scoped_ptr<ServiceWorkerResponseMetadataWriter> metadata_writer = @@ -241,7 +247,7 @@ } bool VerifyResponseMetadata(ServiceWorkerStorage* storage, - int64 id, + int64_t id, const std::string& expected_metadata) { scoped_ptr<ServiceWorkerResponseReader> reader = storage->CreateResponseReader(id); @@ -297,7 +303,7 @@ // A static class method for friendliness. static void VerifyPurgeableListStatusCallback( ServiceWorkerDatabase* database, - std::set<int64> *purgeable_ids, + std::set<int64_t>* purgeable_ids, bool* was_called, ServiceWorkerStatusCode* result, ServiceWorkerStatusCode status) { @@ -327,9 +333,8 @@ return result; } - ServiceWorkerStatusCode DeleteRegistration( - int64 registration_id, - const GURL& origin) { + ServiceWorkerStatusCode DeleteRegistration(int64_t registration_id, + const GURL& origin) { bool was_called = false; ServiceWorkerStatusCode result = SERVICE_WORKER_ERROR_FAILED; storage()->DeleteRegistration( @@ -361,10 +366,9 @@ EXPECT_TRUE(was_called); } - ServiceWorkerStatusCode GetUserData( - int64 registration_id, - const std::string& key, - std::string* data) { + ServiceWorkerStatusCode GetUserData(int64_t registration_id, + const std::string& key, + std::string* data) { bool was_called = false; ServiceWorkerStatusCode result = SERVICE_WORKER_ERROR_FAILED; storage()->GetUserData( @@ -376,11 +380,10 @@ return result; } - ServiceWorkerStatusCode StoreUserData( - int64 registration_id, - const GURL& origin, - const std::string& key, - const std::string& data) { + ServiceWorkerStatusCode StoreUserData(int64_t registration_id, + const GURL& origin, + const std::string& key, + const std::string& data) { bool was_called = false; ServiceWorkerStatusCode result = SERVICE_WORKER_ERROR_FAILED; storage()->StoreUserData( @@ -392,9 +395,8 @@ return result; } - ServiceWorkerStatusCode ClearUserData( - int64 registration_id, - const std::string& key) { + ServiceWorkerStatusCode ClearUserData(int64_t registration_id, + const std::string& key) { bool was_called = false; ServiceWorkerStatusCode result = SERVICE_WORKER_ERROR_FAILED; storage()->ClearUserData( @@ -407,7 +409,7 @@ ServiceWorkerStatusCode GetUserDataForAllRegistrations( const std::string& key, - std::vector<std::pair<int64, std::string>>* data) { + std::vector<std::pair<int64_t, std::string>>* data) { bool was_called = false; ServiceWorkerStatusCode result = SERVICE_WORKER_ERROR_FAILED; storage()->GetUserDataForAllRegistrations( @@ -462,7 +464,7 @@ } ServiceWorkerStatusCode FindRegistrationForId( - int64 registration_id, + int64_t registration_id, const GURL& origin, scoped_refptr<ServiceWorkerRegistration>* registration) { bool was_called = false; @@ -476,7 +478,7 @@ } ServiceWorkerStatusCode FindRegistrationForIdOnly( - int64 registration_id, + int64_t registration_id, scoped_refptr<ServiceWorkerRegistration>* registration) { bool was_called = false; ServiceWorkerStatusCode result = SERVICE_WORKER_ERROR_FAILED; @@ -499,11 +501,11 @@ const GURL kScript("http://www.test.not/script.js"); const GURL kDocumentUrl("http://www.test.not/scope/document.html"); const GURL kResource1("http://www.test.not/scope/resource1.js"); - const int64 kResource1Size = 1591234; + const int64_t kResource1Size = 1591234; const GURL kResource2("http://www.test.not/scope/resource2.js"); - const int64 kResource2Size = 51; - const int64 kRegistrationId = 0; - const int64 kVersionId = 0; + const int64_t kResource2Size = 51; + const int64_t kRegistrationId = 0; + const int64_t kVersionId = 0; const GURL kForeignFetchScope("http://www.test.not/scope/ff/"); const base::Time kToday = base::Time::Now(); const base::Time kYesterday = kToday - base::TimeDelta::FromDays(1); @@ -689,8 +691,8 @@ const GURL kScope("http://www.test.not/scope/"); const GURL kScript("http://www.test.not/script.js"); const GURL kDocumentUrl("http://www.test.not/scope/document.html"); - const int64 kRegistrationId = 0; - const int64 kVersionId = 0; + const int64_t kRegistrationId = 0; + const int64_t kVersionId = 0; scoped_refptr<ServiceWorkerRegistration> found_registration; @@ -809,8 +811,8 @@ TEST_F(ServiceWorkerStorageTest, StoreUserData) { const GURL kScope("http://www.test.not/scope/"); const GURL kScript("http://www.test.not/script.js"); - const int64 kRegistrationId = 0; - const int64 kVersionId = 0; + const int64_t kRegistrationId = 0; + const int64_t kVersionId = 0; LazyInitialize(); @@ -838,7 +840,7 @@ EXPECT_EQ("data", data_out); EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND, GetUserData(kRegistrationId, "unknown_key", &data_out)); - std::vector<std::pair<int64, std::string>> data_list_out; + std::vector<std::pair<int64_t, std::string>> data_list_out; EXPECT_EQ(SERVICE_WORKER_OK, GetUserDataForAllRegistrations("key", &data_list_out)); ASSERT_EQ(1u, data_list_out.size()); @@ -927,7 +929,7 @@ storage()->StoreUncommittedResourceId(resource_id1_); storage()->StoreUncommittedResourceId(resource_id2_); base::RunLoop().RunUntilIdle(); - std::set<int64> verify_ids; + std::set<int64_t> verify_ids; EXPECT_EQ(ServiceWorkerDatabase::STATUS_OK, storage()->database_->GetUncommittedResourceIds(&verify_ids)); EXPECT_EQ(2u, verify_ids.size()); @@ -954,12 +956,12 @@ GURL script_; GURL import_; GURL document_url_; - int64 registration_id_; - int64 version_id_; - int64 resource_id1_; - uint64 resource_id1_size_; - int64 resource_id2_; - uint64 resource_id2_size_; + int64_t registration_id_; + int64_t version_id_; + int64_t resource_id1_; + uint64_t resource_id1_size_; + int64_t resource_id2_; + uint64_t resource_id2_size_; scoped_refptr<ServiceWorkerRegistration> registration_; }; @@ -977,7 +979,7 @@ WriteMetadataWithServiceWorkerResponseMetadataWriter) { const char kMetadata1[] = "Test metadata"; const char kMetadata2[] = "small"; - int64 new_resource_id_ = storage()->NewResourceId(); + int64_t new_resource_id_ = storage()->NewResourceId(); // Writing metadata to nonexistent resoirce ID must fail. EXPECT_GE(0, WriteResponseMetadata(storage(), new_resource_id_, kMetadata1)); @@ -1035,7 +1037,7 @@ TEST_F(ServiceWorkerResourceStorageTest, DeleteRegistration_NoLiveVersion) { bool was_called = false; ServiceWorkerStatusCode result = SERVICE_WORKER_ERROR_FAILED; - std::set<int64> verify_ids; + std::set<int64_t> verify_ids; registration_->SetWaitingVersion(NULL); registration_ = NULL; @@ -1067,7 +1069,7 @@ TEST_F(ServiceWorkerResourceStorageTest, DeleteRegistration_WaitingVersion) { bool was_called = false; ServiceWorkerStatusCode result = SERVICE_WORKER_ERROR_FAILED; - std::set<int64> verify_ids; + std::set<int64_t> verify_ids; // Deleting the registration should result in the resources being added to the // purgeable list and then doomed in the disk cache and removed from that @@ -1119,7 +1121,7 @@ bool was_called = false; ServiceWorkerStatusCode result = SERVICE_WORKER_ERROR_FAILED; - std::set<int64> verify_ids; + std::set<int64_t> verify_ids; // Deleting the registration should move the resources to the purgeable list // but keep them available. @@ -1170,7 +1172,7 @@ bool was_called = false; ServiceWorkerStatusCode result = SERVICE_WORKER_ERROR_FAILED; - std::set<int64> verify_ids; + std::set<int64_t> verify_ids; // Deleting the registration should move the resources to the purgeable list // but keep them available. @@ -1195,7 +1197,7 @@ EXPECT_TRUE(VerifyBasicResponse(storage(), resource_id2_, true)); // Also add an uncommitted resource. - int64 kStaleUncommittedResourceId = storage()->NewResourceId(); + int64_t kStaleUncommittedResourceId = storage()->NewResourceId(); storage()->StoreUncommittedResourceId(kStaleUncommittedResourceId); base::RunLoop().RunUntilIdle(); verify_ids.clear(); @@ -1224,7 +1226,7 @@ base::RunLoop().RunUntilIdle(); // Store a new uncommitted resource. This triggers stale resource cleanup. - int64 kNewResourceId = storage()->NewResourceId(); + int64_t kNewResourceId = storage()->NewResourceId(); WriteBasicResponse(storage(), kNewResourceId); storage()->StoreUncommittedResourceId(kNewResourceId); base::RunLoop().RunUntilIdle(); @@ -1341,7 +1343,7 @@ bool was_called = false; ServiceWorkerStatusCode result = SERVICE_WORKER_ERROR_FAILED; - std::set<int64> verify_ids; + std::set<int64_t> verify_ids; // Make an updated registration. scoped_refptr<ServiceWorkerVersion> live_version = new ServiceWorkerVersion( @@ -1396,8 +1398,8 @@ // Registration for "/scope/". const GURL kScope1("http://www.example.com/scope/"); const GURL kScript1("http://www.example.com/script1.js"); - const int64 kRegistrationId1 = 1; - const int64 kVersionId1 = 1; + const int64_t kRegistrationId1 = 1; + const int64_t kVersionId1 = 1; scoped_refptr<ServiceWorkerRegistration> live_registration1 = new ServiceWorkerRegistration( kScope1, kRegistrationId1, context_ptr_); @@ -1414,8 +1416,8 @@ // Registration for "/scope/foo". const GURL kScope2("http://www.example.com/scope/foo"); const GURL kScript2("http://www.example.com/script2.js"); - const int64 kRegistrationId2 = 2; - const int64 kVersionId2 = 2; + const int64_t kRegistrationId2 = 2; + const int64_t kVersionId2 = 2; scoped_refptr<ServiceWorkerRegistration> live_registration2 = new ServiceWorkerRegistration( kScope2, kRegistrationId2, context_ptr_); @@ -1432,8 +1434,8 @@ // Registration for "/scope/foobar". const GURL kScope3("http://www.example.com/scope/foobar"); const GURL kScript3("http://www.example.com/script3.js"); - const int64 kRegistrationId3 = 3; - const int64 kVersionId3 = 3; + const int64_t kRegistrationId3 = 3; + const int64_t kVersionId3 = 3; scoped_refptr<ServiceWorkerRegistration> live_registration3 = new ServiceWorkerRegistration( kScope3, kRegistrationId3, context_ptr_); @@ -1494,8 +1496,8 @@ // Registration 1 for http://www.example.com const GURL kScope1("http://www.example.com/scope/"); const GURL kScript1("http://www.example.com/script1.js"); - const int64 kRegistrationId1 = 1; - const int64 kVersionId1 = 1; + const int64_t kRegistrationId1 = 1; + const int64_t kVersionId1 = 1; scoped_refptr<ServiceWorkerRegistration> live_registration1 = new ServiceWorkerRegistration(kScope1, kRegistrationId1, context_ptr_); scoped_refptr<ServiceWorkerVersion> live_version1 = new ServiceWorkerVersion( @@ -1511,8 +1513,8 @@ // Registration 2 for http://www.example.com const GURL kScope2("http://www.example.com/scope/foo"); const GURL kScript2("http://www.example.com/script2.js"); - const int64 kRegistrationId2 = 2; - const int64 kVersionId2 = 2; + const int64_t kRegistrationId2 = 2; + const int64_t kVersionId2 = 2; scoped_refptr<ServiceWorkerRegistration> live_registration2 = new ServiceWorkerRegistration(kScope2, kRegistrationId2, context_ptr_); scoped_refptr<ServiceWorkerVersion> live_version2 = new ServiceWorkerVersion( @@ -1528,8 +1530,8 @@ // Registration for http://www.test.com const GURL kScope3("http://www.test.com/scope/foobar"); const GURL kScript3("http://www.test.com/script3.js"); - const int64 kRegistrationId3 = 3; - const int64 kVersionId3 = 3; + const int64_t kRegistrationId3 = 3; + const int64_t kVersionId3 = 3; scoped_refptr<ServiceWorkerRegistration> live_registration3 = new ServiceWorkerRegistration(kScope3, kRegistrationId3, context_ptr_); scoped_refptr<ServiceWorkerVersion> live_version3 = new ServiceWorkerVersion(
diff --git a/content/browser/service_worker/service_worker_unregister_job.cc b/content/browser/service_worker/service_worker_unregister_job.cc index 155d9fc..c0fc9dc4 100644 --- a/content/browser/service_worker/service_worker_unregister_job.cc +++ b/content/browser/service_worker/service_worker_unregister_job.cc
@@ -80,21 +80,21 @@ Complete(registration->id(), SERVICE_WORKER_OK); } -void ServiceWorkerUnregisterJob::Complete(int64 registration_id, +void ServiceWorkerUnregisterJob::Complete(int64_t registration_id, ServiceWorkerStatusCode status) { CompleteInternal(registration_id, status); context_->job_coordinator()->FinishJob(pattern_, this); } void ServiceWorkerUnregisterJob::CompleteInternal( - int64 registration_id, + int64_t registration_id, ServiceWorkerStatusCode status) { if (!is_promise_resolved_) ResolvePromise(registration_id, status); } void ServiceWorkerUnregisterJob::ResolvePromise( - int64 registration_id, + int64_t registration_id, ServiceWorkerStatusCode status) { DCHECK(!is_promise_resolved_); is_promise_resolved_ = true;
diff --git a/content/browser/service_worker/service_worker_unregister_job.h b/content/browser/service_worker/service_worker_unregister_job.h index 282167e..a614253 100644 --- a/content/browser/service_worker/service_worker_unregister_job.h +++ b/content/browser/service_worker/service_worker_unregister_job.h
@@ -5,8 +5,11 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_UNREGISTER_JOB_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_UNREGISTER_JOB_H_ +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/browser/service_worker/service_worker_register_job_base.h" #include "content/common/service_worker/service_worker_status_code.h" @@ -27,7 +30,7 @@ // ServiceWorkerRegistration itself. class ServiceWorkerUnregisterJob : public ServiceWorkerRegisterJobBase { public: - typedef base::Callback<void(int64 registration_id, + typedef base::Callback<void(int64_t registration_id, ServiceWorkerStatusCode status)> UnregistrationCallback; @@ -49,9 +52,10 @@ void OnRegistrationFound( ServiceWorkerStatusCode status, const scoped_refptr<ServiceWorkerRegistration>& registration); - void Complete(int64 registration_id, ServiceWorkerStatusCode status); - void CompleteInternal(int64 registration_id, ServiceWorkerStatusCode status); - void ResolvePromise(int64 registration_id, ServiceWorkerStatusCode status); + void Complete(int64_t registration_id, ServiceWorkerStatusCode status); + void CompleteInternal(int64_t registration_id, + ServiceWorkerStatusCode status); + void ResolvePromise(int64_t registration_id, ServiceWorkerStatusCode status); base::WeakPtr<ServiceWorkerContextCore> context_; const GURL pattern_;
diff --git a/content/browser/service_worker/service_worker_url_request_job.cc b/content/browser/service_worker/service_worker_url_request_job.cc index 277d775f..919602ba 100644 --- a/content/browser/service_worker/service_worker_url_request_job.cc +++ b/content/browser/service_worker/service_worker_url_request_job.cc
@@ -4,6 +4,7 @@ #include "content/browser/service_worker/service_worker_url_request_job.h" +#include <stddef.h> #include <stdint.h> #include <limits>
diff --git a/content/browser/service_worker/service_worker_url_request_job.h b/content/browser/service_worker/service_worker_url_request_job.h index 8a50a49d..ea2860df 100644 --- a/content/browser/service_worker/service_worker_url_request_job.h +++ b/content/browser/service_worker/service_worker_url_request_job.h
@@ -5,9 +5,12 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_URL_REQUEST_JOB_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_URL_REQUEST_JOB_H_ +#include <stdint.h> + #include <map> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" @@ -182,7 +185,7 @@ // Creates BlobDataHandle of the request body from |body_|. This handle // |request_body_blob_data_handle_| will be deleted when // ServiceWorkerURLRequestJob is deleted. - bool CreateRequestBodyBlob(std::string* blob_uuid, uint64* blob_size); + bool CreateRequestBodyBlob(std::string* blob_uuid, uint64_t* blob_size); // For FORWARD_TO_SERVICE_WORKER case. void DidPrepareFetchEvent();
diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc index 669e5dfd..74400a63 100644 --- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc +++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
@@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" @@ -490,7 +492,7 @@ // Responds to fetch events with a blob. class BlobResponder : public EmbeddedWorkerTestHelper { public: - BlobResponder(const std::string& blob_uuid, uint64 blob_size) + BlobResponder(const std::string& blob_uuid, uint64_t blob_size) : EmbeddedWorkerTestHelper(base::FilePath()), blob_uuid_(blob_uuid), blob_size_(blob_size) {} @@ -510,7 +512,7 @@ } std::string blob_uuid_; - uint64 blob_size_; + uint64_t blob_size_; private: DISALLOW_COPY_AND_ASSIGN(BlobResponder);
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc index 2635365b..10f9de5 100644 --- a/content/browser/service_worker/service_worker_version.cc +++ b/content/browser/service_worker/service_worker_version.cc
@@ -4,6 +4,8 @@ #include "content/browser/service_worker/service_worker_version.h" +#include <stddef.h> + #include <algorithm> #include <map> #include <string> @@ -11,6 +13,7 @@ #include "base/command_line.h" #include "base/guid.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_macros.h" #include "base/single_thread_task_runner.h" @@ -378,7 +381,7 @@ ServiceWorkerVersion::ServiceWorkerVersion( ServiceWorkerRegistration* registration, const GURL& script_url, - int64 version_id, + int64_t version_id, base::WeakPtr<ServiceWorkerContextCore> context) : version_id_(version_id), registration_id_(registration->id()), @@ -1464,7 +1467,7 @@ void ServiceWorkerVersion::OnSetCachedMetadata(const GURL& url, const std::vector<char>& data) { - int64 callback_id = base::TimeTicks::Now().ToInternalValue(); + int64_t callback_id = base::TimeTicks::Now().ToInternalValue(); TRACE_EVENT_ASYNC_BEGIN1("ServiceWorker", "ServiceWorkerVersion::OnSetCachedMetadata", callback_id, "URL", url.spec()); @@ -1473,7 +1476,7 @@ weak_factory_.GetWeakPtr(), callback_id)); } -void ServiceWorkerVersion::OnSetCachedMetadataFinished(int64 callback_id, +void ServiceWorkerVersion::OnSetCachedMetadataFinished(int64_t callback_id, int result) { TRACE_EVENT_ASYNC_END1("ServiceWorker", "ServiceWorkerVersion::OnSetCachedMetadata", @@ -1482,7 +1485,7 @@ } void ServiceWorkerVersion::OnClearCachedMetadata(const GURL& url) { - int64 callback_id = base::TimeTicks::Now().ToInternalValue(); + int64_t callback_id = base::TimeTicks::Now().ToInternalValue(); TRACE_EVENT_ASYNC_BEGIN1("ServiceWorker", "ServiceWorkerVersion::OnClearCachedMetadata", callback_id, "URL", url.spec()); @@ -1491,7 +1494,7 @@ weak_factory_.GetWeakPtr(), callback_id)); } -void ServiceWorkerVersion::OnClearCachedMetadataFinished(int64 callback_id, +void ServiceWorkerVersion::OnClearCachedMetadataFinished(int64_t callback_id, int result) { TRACE_EVENT_ASYNC_END1("ServiceWorker", "ServiceWorkerVersion::OnClearCachedMetadata",
diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h index cbeb655..3575f815 100644 --- a/content/browser/service_worker/service_worker_version.h +++ b/content/browser/service_worker/service_worker_version.h
@@ -5,16 +5,18 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_ +#include <stdint.h> + #include <map> #include <queue> #include <set> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/gtest_prod_util.h" #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" @@ -127,14 +129,13 @@ virtual ~Listener() {} }; - ServiceWorkerVersion( - ServiceWorkerRegistration* registration, - const GURL& script_url, - int64 version_id, - base::WeakPtr<ServiceWorkerContextCore> context); + ServiceWorkerVersion(ServiceWorkerRegistration* registration, + const GURL& script_url, + int64_t version_id, + base::WeakPtr<ServiceWorkerContextCore> context); - int64 version_id() const { return version_id_; } - int64 registration_id() const { return registration_id_; } + int64_t version_id() const { return version_id_; } + int64_t registration_id() const { return registration_id_; } const GURL& script_url() const { return script_url_; } const GURL& scope() const { return scope_; } RunningStatus running_status() const { @@ -486,9 +487,9 @@ const ServiceWorkerClientInfo& client_info); void OnSetCachedMetadata(const GURL& url, const std::vector<char>& data); - void OnSetCachedMetadataFinished(int64 callback_id, int result); + void OnSetCachedMetadataFinished(int64_t callback_id, int result); void OnClearCachedMetadata(const GURL& url); - void OnClearCachedMetadataFinished(int64 callback_id, int result); + void OnClearCachedMetadataFinished(int64_t callback_id, int result); void OnPostMessageToClient( const std::string& client_uuid, @@ -597,8 +598,8 @@ // event ended). void OnBeginEvent(); - const int64 version_id_; - const int64 registration_id_; + const int64_t version_id_; + const int64_t registration_id_; const GURL script_url_; const GURL scope_; std::vector<GURL> foreign_fetch_scopes_;
diff --git a/content/browser/service_worker/service_worker_version_unittest.cc b/content/browser/service_worker/service_worker_version_unittest.cc index 115722f..649d563 100644 --- a/content/browser/service_worker/service_worker_version_unittest.cc +++ b/content/browser/service_worker/service_worker_version_unittest.cc
@@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/run_loop.h" #include "content/browser/message_port_service.h" #include "content/browser/service_worker/embedded_worker_registry.h" @@ -253,7 +255,7 @@ ~MessageReceiverDisallowStart() override {} void OnStartWorker(int embedded_worker_id, - int64 service_worker_version_id, + int64_t service_worker_version_id, const GURL& scope, const GURL& script_url) override { // Do nothing.
diff --git a/content/browser/service_worker/service_worker_write_to_cache_job.cc b/content/browser/service_worker/service_worker_write_to_cache_job.cc index fc3074d..f0b6a52f 100644 --- a/content/browser/service_worker/service_worker_write_to_cache_job.cc +++ b/content/browser/service_worker/service_worker_write_to_cache_job.cc
@@ -59,8 +59,8 @@ base::WeakPtr<ServiceWorkerContextCore> context, ServiceWorkerVersion* version, int extra_load_flags, - int64 resource_id, - int64 incumbent_resource_id) + int64_t resource_id, + int64_t incumbent_resource_id) : net::URLRequestJob(request, network_delegate), resource_type_(resource_type), context_(context),
diff --git a/content/browser/service_worker/service_worker_write_to_cache_job.h b/content/browser/service_worker/service_worker_write_to_cache_job.h index e614912..8cb483cb 100644 --- a/content/browser/service_worker/service_worker_write_to_cache_job.h +++ b/content/browser/service_worker/service_worker_write_to_cache_job.h
@@ -5,9 +5,12 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_WRITE_TO_CACHE_JOB_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_WRITE_TO_CACHE_JOB_H_ +#include <stdint.h> + #include <string> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/browser/service_worker/service_worker_disk_cache.h" #include "content/browser/service_worker/service_worker_version.h" @@ -49,8 +52,8 @@ base::WeakPtr<ServiceWorkerContextCore> context, ServiceWorkerVersion* version, int extra_load_flags, - int64 resource_id, - int64 incumbent_resource_id); + int64_t resource_id, + int64_t incumbent_resource_id); private: FRIEND_TEST_ALL_PREFIXES(ServiceWorkerContextRequestHandlerTest, @@ -135,8 +138,8 @@ int io_buffer_bytes_; base::WeakPtr<ServiceWorkerContextCore> context_; GURL url_; - int64 resource_id_; - int64 incumbent_resource_id_; + int64_t resource_id_; + int64_t incumbent_resource_id_; scoped_ptr<net::URLRequest> net_request_; scoped_ptr<net::HttpResponseInfo> http_info_; scoped_ptr<ServiceWorkerResponseWriter> writer_;
diff --git a/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc b/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc index 48363838..f5fd757 100644 --- a/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc +++ b/content/browser/service_worker/service_worker_write_to_cache_job_unittest.cc
@@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/location.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" @@ -424,7 +428,7 @@ GURL script_url_; int next_provider_id_ = 1; - int64 next_version_id_ = 1L; + int64_t next_version_id_ = 1L; }; TEST_F(ServiceWorkerWriteToCacheJobTest, Normal) {
diff --git a/content/child/indexed_db/indexed_db_message_filter.h b/content/child/indexed_db/indexed_db_message_filter.h index 6ed9466..941d607c 100644 --- a/content/child/indexed_db/indexed_db_message_filter.h +++ b/content/child/indexed_db/indexed_db_message_filter.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_CHILD_INDEXED_DB_INDEXED_DB_MESSAGE_FILTER_H_ #define CONTENT_CHILD_INDEXED_DB_INDEXED_DB_MESSAGE_FILTER_H_ +#include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "content/child/worker_thread_message_filter.h"
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 86e34ae8..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 d5fcc801..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 13db94c9..475ffd3d 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 @@ 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 9eb6afbb..ee8bc428 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 @@ 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 @@ } 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 @@ 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..9092ecf1 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 @@ 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 @@ 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 @@ // 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 @@ 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..1a451ad6 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..b6680e086 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 @@ // 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 @@ 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 9e803011..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..0cf89389 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 @@ 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..be5d33757 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 dbe6cce2..b7b5e628 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 @@ // 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..d3a7798a 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 @@ // 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 @@ // 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 @@ 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 @@ // 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 @@ // 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 @@ 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 @@ // 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 89be2df1..13b395721c 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 @@ // 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 @@ 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 bd7af54a..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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 a4aca1d2..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 @@ // 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 @@ 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 @@ 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..38cf66f4 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..95e4fe6c 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 cf19bcbe..fabb2fee6 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 4be76e7d..78d18df4 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 @@ // 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 @@ // 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 af9d5481..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 @@ // 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 @@ 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..6d717218 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 954b03c07..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 2d4c6df5b..bb26529b 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..3fa762332 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..5f0f6280 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 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 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 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 @@ // 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 @@ // 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 @@ // 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::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..a5c04244 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 @@ // 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 @@ 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 be57cfa8..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 @@ 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 @@ // 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 6259b238..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 @@ 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 0db8b8a9..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 91deb56b..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 06fec611..4c69d95c 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 @@ 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 7a305188..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 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 @@ 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 0a3a2c7d..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 @@ 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 @@ // 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 @@ // 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 @@ 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 bfd3c42e..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..6f68c962 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 @@ // 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 @@ 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 @@ // 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 306f6eab..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::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 @@ // 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..5a55b72c 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..64d7cefb 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 4a29667f..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 c85893d7a..1b9ca362 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 ed09c925..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 @@ // 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 @@ 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 @@ 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 @@ 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..c77a1e8e 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..9975faf7 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 @@ // 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..88bcbe353 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 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 @@ 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 @@ 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 @@ 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 49a9c5d3..e836e1b8 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 9b1ecc07..17d160e3 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 a9e9acf0..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 @@ // 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 f3d89c94..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 @@ ~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 @@ // 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 9e006c08..2c80fd29 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 @@ // 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 @@ // 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 feb9ded70..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..913e9b26 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 @@ 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 02cd4394..9bb824cc 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 a03b9c13..975394a7 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 @@ // 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 bf17b1b6..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 @@ 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..e7b7c7a7 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 @@ 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 59e577cc..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 39e2cc88..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 3db53b36..73166212 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 @@ 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 98dd77ed..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..f76c44e6 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 @@ 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 3c592f72..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..8efe57db 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 faa5e70a..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 @@ 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..aec4e180 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..fd2f3af4 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 ceb10a0a..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 862c32ba..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..bd00e5bd 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 083007cf..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 @@ 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 70b296ff..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..f53ba65f9 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 @@ // 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 @@ 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..baa051f1 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..5eeb45b5 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 0ef30164..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 f51586d5..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 ccb16be7..b92cd4cc 100644 --- a/content/public/test/async_file_test_helper.cc +++ b/content/public/test/async_file_test_helper.cc
@@ -73,11 +73,11 @@ } 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 @@ } // namespace -const int64 AsyncFileTestHelper::kDontCheckSize = -1; +const int64_t AsyncFileTestHelper::kDontCheckSize = -1; base::File::Error AsyncFileTestHelper::Copy( storage::FileSystemContext* context, @@ -239,7 +239,7 @@ 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::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..562e5a52 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 @@ 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 @@ // 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 @@ 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 28689837..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 23abda8d..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 91bd0dfb..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 68ece153..19a00349 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 b81448f8..664eb69c 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 dcbd0854..225e57a4 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 @@ 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 @@ 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..c7e209588 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 @@ 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 @@ 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 @@ 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 @@ 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 914a4615..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..015ac0a2 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..41aba90f 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 @@ 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 @@ 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 @@ 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 @@ } 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 @@ 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 a55bceea..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 @@ // 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 @@ 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 @@ 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 @@ 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 5370dc34..076f028 100644 --- a/content/public/test/mock_render_process_host.cc +++ b/content/public/test/mock_render_process_host.cc
@@ -82,7 +82,7 @@ // 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 @@ 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 @@ 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 @@ 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 @@ // 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 @@ 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 @@ 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 ed9ae463..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 @@ 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 @@ 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 @@ ////////////////////////////////////////////////////////////////////////// // 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ struct MockOriginData { const char* origin; StorageType type; - int64 usage; + int64_t usage; }; // Mock storage class for testing. @@ -42,10 +46,12 @@ ~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 @@ 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..a282f7ff 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..5d8c3de5 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 @@ 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 @@ 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..27cea17e 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 @@ 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::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 @@ 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 9e52ee86..8d09d8b2 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 @@ 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 2edac67e..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 @@ } // 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 55501644..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..83b1985b 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..e19f4d86 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 0e854676..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..107cf1f8 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 @@ // 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 @@ *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..1b8cea017 100644 --- a/content/public/test/test_download_request_handler.h +++ b/content/public/test/test_download_request_handler.h
@@ -290,7 +290,7 @@ // // 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/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/ref_counted.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 @@ 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 @@ 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 @@ 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 @@ 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 597818dd..8052b986 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..3f399b00 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..1371ba32 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 007e6c67..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..9fe0e953 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 @@ 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 76d42aac..b2c93476 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..10791bab 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 b59cdd09..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 acafd1a3..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 {
diff --git a/content/renderer/accessibility/blink_ax_enum_conversion.cc b/content/renderer/accessibility/blink_ax_enum_conversion.cc index 72c8779..1c56d5a 100644 --- a/content/renderer/accessibility/blink_ax_enum_conversion.cc +++ b/content/renderer/accessibility/blink_ax_enum_conversion.cc
@@ -8,8 +8,8 @@ namespace content { -uint32 AXStateFromBlink(const blink::WebAXObject& o) { - uint32 state = 0; +uint32_t AXStateFromBlink(const blink::WebAXObject& o) { + uint32_t state = 0; if (o.isChecked()) state |= (1 << ui::AX_STATE_CHECKED);
diff --git a/content/renderer/accessibility/blink_ax_enum_conversion.h b/content/renderer/accessibility/blink_ax_enum_conversion.h index 84929d0..74cb2cdb 100644 --- a/content/renderer/accessibility/blink_ax_enum_conversion.h +++ b/content/renderer/accessibility/blink_ax_enum_conversion.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_ACCESSIBILITY_BLINK_AX_ENUM_CONVERSION_H_ #define CONTENT_RENDERER_ACCESSIBILITY_BLINK_AX_ENUM_CONVERSION_H_ +#include <stdint.h> + #include "third_party/WebKit/public/web/WebAXObject.h" #include "ui/accessibility/ax_enums.h" @@ -20,7 +22,7 @@ // accessors and a state bitmask stored in an AXNodeData. // (Note that some rare states are sent as boolean attributes // in AXNodeData instead.) -uint32 AXStateFromBlink(const blink::WebAXObject& o); +uint32_t AXStateFromBlink(const blink::WebAXObject& o); // Convert a Blink WebAXTextDirection to an AXTextDirection defined in // ui/accessibility.
diff --git a/content/renderer/accessibility/blink_ax_tree_source.cc b/content/renderer/accessibility/blink_ax_tree_source.cc index 4451834..eab8b34 100644 --- a/content/renderer/accessibility/blink_ax_tree_source.cc +++ b/content/renderer/accessibility/blink_ax_tree_source.cc
@@ -4,6 +4,8 @@ #include "content/renderer/accessibility/blink_ax_tree_source.h" +#include <stddef.h> + #include <set> #include "base/strings/string_number_conversions.h" @@ -99,7 +101,7 @@ void AddIntListAttributeFromWebObjects(ui::AXIntListAttribute attr, WebVector<WebAXObject> objects, AXContentNodeData* dst) { - std::vector<int32> ids; + std::vector<int32_t> ids; for(size_t i = 0; i < objects.size(); i++) ids.push_back(objects[i].axID()); if (ids.size() > 0) @@ -148,8 +150,8 @@ root.selection(anchor_object, anchor_offset, focus_object, focus_offset); if (!anchor_object.isNull() && !focus_object.isNull() && anchor_offset >= 0 && focus_offset >= 0) { - int32 anchor_id = anchor_object.axID(); - int32 focus_id = focus_object.axID(); + int32_t anchor_id = anchor_object.axID(); + int32_t focus_id = focus_object.axID(); tree_data.sel_anchor_object_id = anchor_id; tree_data.sel_anchor_offset = anchor_offset; tree_data.sel_focus_object_id = focus_id; @@ -181,11 +183,11 @@ return GetMainDocument().accessibilityObject(); } -blink::WebAXObject BlinkAXTreeSource::GetFromId(int32 id) const { +blink::WebAXObject BlinkAXTreeSource::GetFromId(int32_t id) const { return GetMainDocument().accessibilityObjectFromID(id); } -int32 BlinkAXTreeSource::GetId(blink::WebAXObject node) const { +int32_t BlinkAXTreeSource::GetId(blink::WebAXObject node) const { return node.axID(); } @@ -330,7 +332,7 @@ if (dst->role == ui::AX_ROLE_INLINE_TEXT_BOX) { WebVector<int> src_character_offsets; src.characterOffsets(src_character_offsets); - std::vector<int32> character_offsets; + std::vector<int32_t> character_offsets; character_offsets.reserve(src_character_offsets.size()); for (size_t i = 0; i < src_character_offsets.size(); ++i) character_offsets.push_back(src_character_offsets[i]); @@ -339,8 +341,8 @@ WebVector<int> src_word_starts; WebVector<int> src_word_ends; src.wordBoundaries(src_word_starts, src_word_ends); - std::vector<int32> word_starts; - std::vector<int32> word_ends; + std::vector<int32_t> word_starts; + std::vector<int32_t> word_ends; word_starts.reserve(src_word_starts.size()); word_ends.reserve(src_word_starts.size()); for (size_t i = 0; i < src_word_starts.size(); ++i) { @@ -436,7 +438,7 @@ WebVector<int> src_line_breaks; src.lineBreaks(src_line_breaks); if (src_line_breaks.size() > 0) { - std::vector<int32> line_breaks; + std::vector<int32_t> line_breaks; line_breaks.reserve(src_line_breaks.size()); for (size_t i = 0; i < src_line_breaks.size(); ++i) line_breaks.push_back(src_line_breaks[i]); @@ -524,9 +526,9 @@ int column_count = src.columnCount(); int row_count = src.rowCount(); if (column_count > 0 && row_count > 0) { - std::set<int32> unique_cell_id_set; - std::vector<int32> cell_ids; - std::vector<int32> unique_cell_ids; + std::set<int32_t> unique_cell_id_set; + std::vector<int32_t> cell_ids; + std::vector<int32_t> unique_cell_ids; dst->AddIntAttribute(ui::AX_ATTR_TABLE_COLUMN_COUNT, column_count); dst->AddIntAttribute(ui::AX_ATTR_TABLE_ROW_COUNT, row_count); WebAXObject header = src.headerContainerObject(); @@ -589,7 +591,7 @@ int child_count = src.childCount(); for (int i = 0; i < child_count; ++i) { WebAXObject child = src.childAt(i); - std::vector<int32> indirect_child_ids; + std::vector<int32_t> indirect_child_ids; if (!is_iframe && !child.isDetached() && !IsParentUnignoredOf(src, child)) indirect_child_ids.push_back(child.axID()); if (indirect_child_ids.size() > 0) {
diff --git a/content/renderer/accessibility/blink_ax_tree_source.h b/content/renderer/accessibility/blink_ax_tree_source.h index 16525b6..e7a7d4aa 100644 --- a/content/renderer/accessibility/blink_ax_tree_source.h +++ b/content/renderer/accessibility/blink_ax_tree_source.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_ACCESSIBILITY_BLINK_AX_TREE_SOURCE_H_ #define CONTENT_RENDERER_ACCESSIBILITY_BLINK_AX_TREE_SOURCE_H_ +#include <stdint.h> + #include "content/common/ax_content_node_data.h" #include "third_party/WebKit/public/web/WebAXObject.h" #include "ui/accessibility/ax_node_data.h" @@ -39,8 +41,8 @@ // AXTreeSource implementation. AXContentTreeData GetTreeData() const override; blink::WebAXObject GetRoot() const override; - blink::WebAXObject GetFromId(int32 id) const override; - int32 GetId(blink::WebAXObject node) const override; + blink::WebAXObject GetFromId(int32_t id) const override; + int32_t GetId(blink::WebAXObject node) const override; void GetChildren( blink::WebAXObject node, std::vector<blink::WebAXObject>* out_children) const override;
diff --git a/content/renderer/accessibility/renderer_accessibility.cc b/content/renderer/accessibility/renderer_accessibility.cc index 8ad43d6..0eab211 100644 --- a/content/renderer/accessibility/renderer_accessibility.cc +++ b/content/renderer/accessibility/renderer_accessibility.cc
@@ -4,6 +4,9 @@ #include "content/renderer/accessibility/renderer_accessibility.h" +#include <stddef.h> +#include <stdint.h> + #include <queue> #include "base/bind.h" @@ -11,6 +14,7 @@ #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "content/common/accessibility_messages.h" #include "content/renderer/accessibility/blink_ax_enum_conversion.h" #include "content/renderer/render_frame_impl.h" @@ -192,7 +196,7 @@ acc_event.event_type = event; // Discard duplicate accessibility events. - for (uint32 i = 0; i < pending_events_.size(); ++i) { + for (uint32_t i = 0; i < pending_events_.size(); ++i) { if (pending_events_[i].id == acc_event.id && pending_events_[i].event_type == acc_event.event_type) { return;
diff --git a/content/renderer/accessibility/renderer_accessibility.h b/content/renderer/accessibility/renderer_accessibility.h index 66670eafd..91bcd55 100644 --- a/content/renderer/accessibility/renderer_accessibility.h +++ b/content/renderer/accessibility/renderer_accessibility.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/common/ax_content_node_data.h" #include "content/public/renderer/render_frame_observer.h"
diff --git a/content/renderer/accessibility/renderer_accessibility_browsertest.cc b/content/renderer/accessibility/renderer_accessibility_browsertest.cc index 7f2747e..0c6958e 100644 --- a/content/renderer/accessibility/renderer_accessibility_browsertest.cc +++ b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
@@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "content/common/accessibility_messages.h" #include "content/common/frame_messages.h" #include "content/common/site_isolation_policy.h"
diff --git a/content/renderer/android/address_detector.h b/content/renderer/android/address_detector.h index 1db869e..5734c5b 100644 --- a/content/renderer/android/address_detector.h +++ b/content/renderer/android/address_detector.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_ANDROID_ADDRESS_DETECTOR_H_ #define CONTENT_RENDERER_ANDROID_ADDRESS_DETECTOR_H_ +#include <stddef.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/renderer/android/content_detector.h" #include "url/gurl.h"
diff --git a/content/renderer/android/content_detector.h b/content/renderer/android/content_detector.h index 28a153a..7294793 100644 --- a/content/renderer/android/content_detector.h +++ b/content/renderer/android/content_detector.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_ANDROID_CONTENT_DETECTOR_H_ #define CONTENT_RENDERER_ANDROID_CONTENT_DETECTOR_H_ +#include <stddef.h> + +#include "base/macros.h" #include "third_party/WebKit/public/web/WebRange.h" #include "url/gurl.h"
diff --git a/content/renderer/android/email_detector.h b/content/renderer/android/email_detector.h index 8d108492..d3544693 100644 --- a/content/renderer/android/email_detector.h +++ b/content/renderer/android/email_detector.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_ANDROID_EMAIL_DETECTOR_H_ #define CONTENT_RENDERER_ANDROID_EMAIL_DETECTOR_H_ +#include <stddef.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "content/renderer/android/content_detector.h"
diff --git a/content/renderer/android/email_detector_unittest.cc b/content/renderer/android/email_detector_unittest.cc index c695617..6dee428 100644 --- a/content/renderer/android/email_detector_unittest.cc +++ b/content/renderer/android/email_detector_unittest.cc
@@ -4,6 +4,8 @@ #include "content/renderer/android/email_detector.h" +#include <stddef.h> + #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/android/phone_number_detector.h b/content/renderer/android/phone_number_detector.h index 6503eee..2d6b4d27 100644 --- a/content/renderer/android/phone_number_detector.h +++ b/content/renderer/android/phone_number_detector.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_ANDROID_PHONE_NUMBER_DETECTOR_H_ #define CONTENT_RENDERER_ANDROID_PHONE_NUMBER_DETECTOR_H_ +#include <stddef.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "content/renderer/android/content_detector.h"
diff --git a/content/renderer/android/phone_number_detector_unittest.cc b/content/renderer/android/phone_number_detector_unittest.cc index d10744b..474003b0 100644 --- a/content/renderer/android/phone_number_detector_unittest.cc +++ b/content/renderer/android/phone_number_detector_unittest.cc
@@ -4,6 +4,8 @@ #include "content/renderer/android/phone_number_detector.h" +#include <stddef.h> + #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/android/renderer_date_time_picker.cc b/content/renderer/android/renderer_date_time_picker.cc index 7319c44..b936490b 100644 --- a/content/renderer/android/renderer_date_time_picker.cc +++ b/content/renderer/android/renderer_date_time_picker.cc
@@ -4,6 +4,8 @@ #include "content/renderer/android/renderer_date_time_picker.h" +#include <stddef.h> + #include "base/strings/string_util.h" #include "content/common/date_time_suggestion.h" #include "content/common/view_messages.h"
diff --git a/content/renderer/android/renderer_date_time_picker.h b/content/renderer/android/renderer_date_time_picker.h index 970f93b..d04016b 100644 --- a/content/renderer/android/renderer_date_time_picker.h +++ b/content/renderer/android/renderer_date_time_picker.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_ANDROID_RENDERER_DATE_TIME_PICKER_H_ #define CONTENT_RENDERER_ANDROID_RENDERER_DATE_TIME_PICKER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h"
diff --git a/content/renderer/android/synchronous_compositor_external_begin_frame_source.h b/content/renderer/android/synchronous_compositor_external_begin_frame_source.h index 32216095..cc3e9e53 100644 --- a/content/renderer/android/synchronous_compositor_external_begin_frame_source.h +++ b/content/renderer/android/synchronous_compositor_external_begin_frame_source.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_EXTERNAL_BEGIN_FRAME_SOURCE_H_ #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_EXTERNAL_BEGIN_FRAME_SOURCE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "cc/scheduler/begin_frame_source.h"
diff --git a/content/renderer/android/synchronous_compositor_filter.h b/content/renderer/android/synchronous_compositor_filter.h index 550bf1e..89d83002 100644 --- a/content/renderer/android/synchronous_compositor_filter.h +++ b/content/renderer/android/synchronous_compositor_filter.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FILTER_H_ #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FILTER_H_ +#include <stdint.h> + #include "base/containers/scoped_ptr_hash_map.h" #include "base/macros.h" #include "base/single_thread_task_runner.h"
diff --git a/content/renderer/android/synchronous_compositor_output_surface.cc b/content/renderer/android/synchronous_compositor_output_surface.cc index 59dd93a..567c2a2e 100644 --- a/content/renderer/android/synchronous_compositor_output_surface.cc +++ b/content/renderer/android/synchronous_compositor_output_surface.cc
@@ -6,6 +6,7 @@ #include "base/auto_reset.h" #include "base/logging.h" +#include "base/macros.h" #include "cc/output/compositor_frame.h" #include "cc/output/context_provider.h" #include "cc/output/output_surface_client.h"
diff --git a/content/renderer/android/synchronous_compositor_output_surface.h b/content/renderer/android/synchronous_compositor_output_surface.h index 16320cdb..c09ff98 100644 --- a/content/renderer/android/synchronous_compositor_output_surface.h +++ b/content/renderer/android/synchronous_compositor_output_surface.h
@@ -5,11 +5,13 @@ #ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_ #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_ +#include <stddef.h> + #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/content/renderer/android/synchronous_compositor_proxy.h b/content/renderer/android/synchronous_compositor_proxy.h index 07488ef..2d26036 100644 --- a/content/renderer/android/synchronous_compositor_proxy.h +++ b/content/renderer/android/synchronous_compositor_proxy.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_ #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "content/common/input/input_event_ack_state.h" #include "content/renderer/android/synchronous_compositor_external_begin_frame_source.h"
diff --git a/content/renderer/background_sync/background_sync_client_impl.cc b/content/renderer/background_sync/background_sync_client_impl.cc index d0a7e9f..7d9c405 100644 --- a/content/renderer/background_sync/background_sync_client_impl.cc +++ b/content/renderer/background_sync/background_sync_client_impl.cc
@@ -17,7 +17,7 @@ // static void BackgroundSyncClientImpl::Create( - int64 service_worker_registration_id, + int64_t service_worker_registration_id, mojo::InterfaceRequest<BackgroundSyncServiceClient> request) { new BackgroundSyncClientImpl(service_worker_registration_id, request.Pass()); } @@ -25,7 +25,7 @@ BackgroundSyncClientImpl::~BackgroundSyncClientImpl() {} BackgroundSyncClientImpl::BackgroundSyncClientImpl( - int64 service_worker_registration_id, + int64_t service_worker_registration_id, mojo::InterfaceRequest<BackgroundSyncServiceClient> request) : service_worker_registration_id_(service_worker_registration_id), binding_(this, request.Pass()),
diff --git a/content/renderer/background_sync/background_sync_client_impl.h b/content/renderer/background_sync/background_sync_client_impl.h index 18a53ee..78d1a1a4 100644 --- a/content/renderer/background_sync/background_sync_client_impl.h +++ b/content/renderer/background_sync/background_sync_client_impl.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_BACKGROUND_SYNC_BACKGROUND_SYNC_CLIENT_IMPL_H_ #define CONTENT_RENDERER_BACKGROUND_SYNC_BACKGROUND_SYNC_CLIENT_IMPL_H_ +#include <stdint.h> + #include <map> #include "base/compiler_specific.h"
diff --git a/content/renderer/battery_status/battery_status_dispatcher_unittest.cc b/content/renderer/battery_status/battery_status_dispatcher_unittest.cc index 2b16f6b3..435e92a 100644 --- a/content/renderer/battery_status/battery_status_dispatcher_unittest.cc +++ b/content/renderer/battery_status/battery_status_dispatcher_unittest.cc
@@ -4,6 +4,7 @@ #include "content/renderer/battery_status/battery_status_dispatcher.h" +#include "base/macros.h" #include "content/public/test/mock_render_thread.h" #include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/bluetooth/bluetooth_dispatcher.cc b/content/renderer/bluetooth/bluetooth_dispatcher.cc index 5f10eed..9ffca9e0 100644 --- a/content/renderer/bluetooth/bluetooth_dispatcher.cc +++ b/content/renderer/bluetooth/bluetooth_dispatcher.cc
@@ -4,6 +4,8 @@ #include "content/renderer/bluetooth/bluetooth_dispatcher.h" +#include <stddef.h> + #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" @@ -612,7 +614,7 @@ int thread_id, int request_id, const std::string& characteristic_instance_id, - uint32 characteristic_properties) { + uint32_t characteristic_properties) { DCHECK(pending_characteristic_requests_.Lookup(request_id)) << request_id; BluetoothCharacteristicRequest* request =
diff --git a/content/renderer/bluetooth/bluetooth_dispatcher.h b/content/renderer/bluetooth/bluetooth_dispatcher.h index ff6a0751..6dbd5ea 100644 --- a/content/renderer/bluetooth/bluetooth_dispatcher.h +++ b/content/renderer/bluetooth/bluetooth_dispatcher.h
@@ -5,10 +5,13 @@ #ifndef CONTENT_CHILD_BLUETOOTH_BLUETOOTH_DISPATCHER_H_ #define CONTENT_CHILD_BLUETOOTH_BLUETOOTH_DISPATCHER_H_ +#include <stdint.h> + #include <map> #include <queue> #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/bluetooth/bluetooth_device.h" #include "content/public/child/worker_thread.h" @@ -178,7 +181,7 @@ void OnGetCharacteristicSuccess(int thread_id, int request_id, const std::string& characteristic_instance_id, - uint32 characteristic_properties); + uint32_t characteristic_properties); void OnGetCharacteristicError(int thread_id, int request_id, blink::WebBluetoothError error);
diff --git a/content/renderer/bluetooth/bluetooth_message_filter.h b/content/renderer/bluetooth/bluetooth_message_filter.h index 5692dcce..365e21a 100644 --- a/content/renderer/bluetooth/bluetooth_message_filter.h +++ b/content/renderer/bluetooth/bluetooth_message_filter.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_CHILD_BLUETOOTH_BLUETOOTH_MESSAGE_FILTER_H_ #define CONTENT_CHILD_BLUETOOTH_BLUETOOTH_MESSAGE_FILTER_H_ +#include "base/macros.h" #include "content/child/worker_thread_message_filter.h" namespace content {
diff --git a/content/renderer/bluetooth/web_bluetooth_impl.h b/content/renderer/bluetooth/web_bluetooth_impl.h index f475c00..b5f85d47 100644 --- a/content/renderer/bluetooth/web_bluetooth_impl.h +++ b/content/renderer/bluetooth/web_bluetooth_impl.h
@@ -5,9 +5,12 @@ #ifndef CONTENT_CHILD_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_ #define CONTENT_CHILD_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_ +#include <stdint.h> + #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h"
diff --git a/content/renderer/bmp_image_decoder_unittest.cc b/content/renderer/bmp_image_decoder_unittest.cc index 14193ccc..59e4680e 100644 --- a/content/renderer/bmp_image_decoder_unittest.cc +++ b/content/renderer/bmp_image_decoder_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "content/test/image_decoder_test.h" #include "third_party/WebKit/public/web/WebImageDecoder.h" @@ -18,7 +20,7 @@ // Thus it is split into fast and slow versions. The threshold is // set to 10KB because the fast test can finish under Valgrind in // less than 30 seconds. - static const int64 kThresholdSize = 10240; + static const int64_t kThresholdSize = 10240; }; TEST_F(BMPImageDecoderTest, DecodingFast) {
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc index 60451d6..40110cd4 100644 --- a/content/renderer/browser_plugin/browser_plugin.cc +++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -4,6 +4,8 @@ #include "content/renderer/browser_plugin/browser_plugin.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/location.h" #include "base/single_thread_task_runner.h"
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h index 5069e87b..79907df 100644 --- a/content/renderer/browser_plugin/browser_plugin.h +++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -7,6 +7,7 @@ #include "third_party/WebKit/public/web/WebPlugin.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner_helpers.h"
diff --git a/content/renderer/browser_plugin/browser_plugin_manager.h b/content/renderer/browser_plugin/browser_plugin_manager.h index a762b88..4703fd8 100644 --- a/content/renderer/browser_plugin/browser_plugin_manager.h +++ b/content/renderer/browser_plugin/browser_plugin_manager.h
@@ -6,6 +6,7 @@ #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_ #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/renderer/render_process_observer.h" #include "ipc/ipc_sender.h"
diff --git a/content/renderer/browser_render_view_browsertest.cc b/content/renderer/browser_render_view_browsertest.cc index 9d878a9..19f57802 100644 --- a/content/renderer/browser_render_view_browsertest.cc +++ b/content/renderer/browser_render_view_browsertest.cc
@@ -6,7 +6,6 @@ // Note that these tests rely on single-process mode, and hence may be // disabled in some configurations (check gyp files). -#include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h"
diff --git a/content/renderer/cache_storage/cache_storage_dispatcher.cc b/content/renderer/cache_storage/cache_storage_dispatcher.cc index 70f0db3..9091468 100644 --- a/content/renderer/cache_storage/cache_storage_dispatcher.cc +++ b/content/renderer/cache_storage/cache_storage_dispatcher.cc
@@ -4,6 +4,8 @@ #include "content/renderer/cache_storage/cache_storage_dispatcher.h" +#include <stddef.h> + #include <map> #include <string> #include <utility>
diff --git a/content/renderer/cache_storage/cache_storage_dispatcher.h b/content/renderer/cache_storage/cache_storage_dispatcher.h index f08712c..a43757d 100644 --- a/content/renderer/cache_storage/cache_storage_dispatcher.h +++ b/content/renderer/cache_storage/cache_storage_dispatcher.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_H_ #define CONTENT_RENDERER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_H_ +#include <stdint.h> + #include <vector> #include "base/id_map.h" @@ -162,7 +164,7 @@ typedef IDMap<blink::WebServiceWorkerCacheStorage::CacheStorageMatchCallbacks, IDMapOwnPointer> StorageMatchCallbacksMap; - typedef base::hash_map<int32, base::TimeTicks> TimeMap; + typedef base::hash_map<int32_t, base::TimeTicks> TimeMap; typedef IDMap<blink::WebServiceWorkerCache::CacheMatchCallbacks, IDMapOwnPointer> MatchCallbacksMap; @@ -173,7 +175,7 @@ using BatchCallbacksMap = IDMap<blink::WebServiceWorkerCache::CacheBatchCallbacks, IDMapOwnPointer>; - static int32 CurrentWorkerId() { return WorkerThread::GetCurrentId(); } + static int32_t CurrentWorkerId() { return WorkerThread::GetCurrentId(); } void PopulateWebResponseFromResponse( const ServiceWorkerResponse& response,
diff --git a/content/renderer/cache_storage/cache_storage_message_filter.h b/content/renderer/cache_storage/cache_storage_message_filter.h index 5d92d696..28d0a41 100644 --- a/content/renderer/cache_storage/cache_storage_message_filter.h +++ b/content/renderer/cache_storage/cache_storage_message_filter.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_SERVICE_WORKER_CACHE_STORAGE_MESSAGE_FILTER_H_ #define CONTENT_RENDERER_SERVICE_WORKER_CACHE_STORAGE_MESSAGE_FILTER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/child/worker_thread_message_filter.h"
diff --git a/content/renderer/cache_storage/webserviceworkercachestorage_impl.h b/content/renderer/cache_storage/webserviceworkercachestorage_impl.h index 77f443d..cc6d8e8 100644 --- a/content/renderer/cache_storage/webserviceworkercachestorage_impl.h +++ b/content/renderer/cache_storage/webserviceworkercachestorage_impl.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_SERVICE_WORKER_WEB_SERVICE_WORKER_CACHE_STORAGE_IMPL_H_ #define CONTENT_RENDERER_SERVICE_WORKER_WEB_SERVICE_WORKER_CACHE_STORAGE_IMPL_H_ +#include "base/macros.h" #include "content/child/thread_safe_sender.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerCache.h"
diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc index e37d5ab..e931773 100644 --- a/content/renderer/child_frame_compositing_helper.cc +++ b/content/renderer/child_frame_compositing_helper.cc
@@ -183,7 +183,7 @@ void ChildFrameCompositingHelper::OnCompositorFrameSwapped( scoped_ptr<cc::CompositorFrame> frame, int route_id, - uint32 output_surface_id, + uint32_t output_surface_id, int host_id, base::SharedMemoryHandle handle) { cc::DelegatedFrameData* frame_data = frame->delegated_frame_data.get();
diff --git a/content/renderer/child_frame_compositing_helper.h b/content/renderer/child_frame_compositing_helper.h index 1f26c9f..d2d4e78 100644 --- a/content/renderer/child_frame_compositing_helper.h +++ b/content/renderer/child_frame_compositing_helper.h
@@ -5,9 +5,12 @@ #ifndef CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ #define CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" @@ -66,7 +69,7 @@ void OnContainerDestroy(); void OnCompositorFrameSwapped(scoped_ptr<cc::CompositorFrame> frame, int route_id, - uint32 output_surface_id, + uint32_t output_surface_id, int host_id, base::SharedMemoryHandle handle); void OnSetSurface(const cc::SurfaceId& surface_id, @@ -126,7 +129,7 @@ int host_routing_id_; int last_route_id_; - uint32 last_output_surface_id_; + uint32_t last_output_surface_id_; int last_host_id_; bool ack_pending_; bool opaque_;
diff --git a/content/renderer/context_menu_params_builder.cc b/content/renderer/context_menu_params_builder.cc index 6c7752a..12ff2ad 100644 --- a/content/renderer/context_menu_params_builder.cc +++ b/content/renderer/context_menu_params_builder.cc
@@ -4,6 +4,8 @@ #include "content/renderer/context_menu_params_builder.h" +#include <stddef.h> + #include "content/common/ssl_status_serialization.h" #include "content/public/common/context_menu_params.h" #include "content/public/renderer/content_renderer_client.h"
diff --git a/content/renderer/device_sensors/device_light_event_pump.h b/content/renderer/device_sensors/device_light_event_pump.h index b5dd1f43..3561484 100644 --- a/content/renderer/device_sensors/device_light_event_pump.h +++ b/content/renderer/device_sensors/device_light_event_pump.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_LIGHT_EVENT_PUMP_H_ #define CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_LIGHT_EVENT_PUMP_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/common/device_sensors/device_light_data.h" #include "content/renderer/device_sensors/device_sensor_event_pump.h"
diff --git a/content/renderer/device_sensors/device_light_event_pump_unittest.cc b/content/renderer/device_sensors/device_light_event_pump_unittest.cc index c5f1e7d4..8a4f30e 100644 --- a/content/renderer/device_sensors/device_light_event_pump_unittest.cc +++ b/content/renderer/device_sensors/device_light_event_pump_unittest.cc
@@ -5,6 +5,7 @@ #include "device_light_event_pump.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "content/common/device_sensors/device_light_hardware_buffer.h"
diff --git a/content/renderer/device_sensors/device_motion_event_pump.h b/content/renderer/device_sensors/device_motion_event_pump.h index 61b046d..7ae880e 100644 --- a/content/renderer/device_sensors/device_motion_event_pump.h +++ b/content/renderer/device_sensors/device_motion_event_pump.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_MOTION_EVENT_PUMP_H_ #define CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_MOTION_EVENT_PUMP_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/renderer/device_sensors/device_sensor_event_pump.h" #include "content/renderer/shared_memory_seqlock_reader.h"
diff --git a/content/renderer/device_sensors/device_motion_event_pump_unittest.cc b/content/renderer/device_sensors/device_motion_event_pump_unittest.cc index 9d8b7cd..35cc267 100644 --- a/content/renderer/device_sensors/device_motion_event_pump_unittest.cc +++ b/content/renderer/device_sensors/device_motion_event_pump_unittest.cc
@@ -6,6 +6,7 @@ #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h"
diff --git a/content/renderer/device_sensors/device_orientation_event_pump.h b/content/renderer/device_sensors/device_orientation_event_pump.h index 8f0ce5e..74ecacd 100644 --- a/content/renderer/device_sensors/device_orientation_event_pump.h +++ b/content/renderer/device_sensors/device_orientation_event_pump.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_ORIENTATION_EVENT_PUMP_H_ #define CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_ORIENTATION_EVENT_PUMP_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/renderer/device_sensors/device_sensor_event_pump.h" #include "content/renderer/shared_memory_seqlock_reader.h"
diff --git a/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc b/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc index d069d88..f46eb8d 100644 --- a/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc +++ b/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc
@@ -6,6 +6,7 @@ #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "content/common/device_sensors/device_orientation_hardware_buffer.h"
diff --git a/content/renderer/device_sensors/device_sensor_event_pump.h b/content/renderer/device_sensors/device_sensor_event_pump.h index 700f28e..46252a7 100644 --- a/content/renderer/device_sensors/device_sensor_event_pump.h +++ b/content/renderer/device_sensors/device_sensor_event_pump.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_SENSOR_EVENT_PUMP_H_ #define CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_SENSOR_EVENT_PUMP_H_ +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc index 0b9af90..6de2625 100644 --- a/content/renderer/devtools/devtools_agent.cc +++ b/content/renderer/devtools/devtools_agent.cc
@@ -4,6 +4,8 @@ #include "content/renderer/devtools/devtools_agent.h" +#include <stddef.h> + #include <map> #include "base/lazy_instance.h"
diff --git a/content/renderer/devtools/devtools_agent.h b/content/renderer/devtools/devtools_agent.h index 4ad9696..ca763b7c 100644 --- a/content/renderer/devtools/devtools_agent.h +++ b/content/renderer/devtools/devtools_agent.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "content/public/common/console_message_level.h"
diff --git a/content/renderer/devtools/devtools_agent_filter.cc b/content/renderer/devtools/devtools_agent_filter.cc index 94b9e0d4..a5e6b886 100644 --- a/content/renderer/devtools/devtools_agent_filter.cc +++ b/content/renderer/devtools/devtools_agent_filter.cc
@@ -75,24 +75,25 @@ } -void DevToolsAgentFilter::AddEmbeddedWorkerRouteOnMainThread(int32 routing_id) { +void DevToolsAgentFilter::AddEmbeddedWorkerRouteOnMainThread( + int32_t routing_id) { io_task_runner_->PostTask( FROM_HERE, base::Bind(&DevToolsAgentFilter::AddEmbeddedWorkerRoute, this, routing_id)); } void DevToolsAgentFilter::RemoveEmbeddedWorkerRouteOnMainThread( - int32 routing_id) { + int32_t routing_id) { io_task_runner_->PostTask( FROM_HERE, base::Bind(&DevToolsAgentFilter::RemoveEmbeddedWorkerRoute, this, routing_id)); } -void DevToolsAgentFilter::AddEmbeddedWorkerRoute(int32 routing_id) { +void DevToolsAgentFilter::AddEmbeddedWorkerRoute(int32_t routing_id) { embedded_worker_routes_.insert(routing_id); } -void DevToolsAgentFilter::RemoveEmbeddedWorkerRoute(int32 routing_id) { +void DevToolsAgentFilter::RemoveEmbeddedWorkerRoute(int32_t routing_id) { embedded_worker_routes_.erase(routing_id); }
diff --git a/content/renderer/devtools/devtools_agent_filter.h b/content/renderer/devtools/devtools_agent_filter.h index 9113ae2b..ce85638 100644 --- a/content/renderer/devtools/devtools_agent_filter.h +++ b/content/renderer/devtools/devtools_agent_filter.h
@@ -5,9 +5,12 @@ #ifndef CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_FILTER_H_ #define CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_AGENT_FILTER_H_ +#include <stdint.h> + #include <set> #include <string> +#include "base/macros.h" #include "ipc/message_filter.h" struct DevToolsMessageData; @@ -36,8 +39,8 @@ bool OnMessageReceived(const IPC::Message& message) override; // Called on the main thread. - void AddEmbeddedWorkerRouteOnMainThread(int32 routing_id); - void RemoveEmbeddedWorkerRouteOnMainThread(int32 routing_id); + void AddEmbeddedWorkerRouteOnMainThread(int32_t routing_id); + void RemoveEmbeddedWorkerRouteOnMainThread(int32_t routing_id); protected: ~DevToolsAgentFilter() override; @@ -46,14 +49,14 @@ void OnDispatchOnInspectorBackend(int session_id, const std::string& message); // Called on IO thread - void AddEmbeddedWorkerRoute(int32 routing_id); - void RemoveEmbeddedWorkerRoute(int32 routing_id); + void AddEmbeddedWorkerRoute(int32_t routing_id); + void RemoveEmbeddedWorkerRoute(int32_t routing_id); base::MessageLoop* render_thread_loop_; scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; int current_routing_id_; - std::set<int32> embedded_worker_routes_; + std::set<int32_t> embedded_worker_routes_; DISALLOW_COPY_AND_ASSIGN(DevToolsAgentFilter); };
diff --git a/content/renderer/devtools/devtools_client.h b/content/renderer/devtools/devtools_client.h index 0dba7f1..befa179 100644 --- a/content/renderer/devtools/devtools_client.h +++ b/content/renderer/devtools/devtools_client.h
@@ -5,9 +5,11 @@ #ifndef CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CLIENT_H_ #define CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CLIENT_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/renderer/render_frame_observer.h" #include "third_party/WebKit/public/web/WebDevToolsFrontendClient.h" @@ -43,7 +45,7 @@ bool isUnderTest() override; void OnDispatchOnInspectorFrontend(const std::string& message, - uint32 total_size); + uint32_t total_size); std::string compatibility_script_; scoped_ptr<blink::WebDevToolsFrontend> web_tools_frontend_;
diff --git a/content/renderer/devtools/devtools_cpu_throttler.cc b/content/renderer/devtools/devtools_cpu_throttler.cc index 9aa56dc4..f565067 100644 --- a/content/renderer/devtools/devtools_cpu_throttler.cc +++ b/content/renderer/devtools/devtools_cpu_throttler.cc
@@ -10,8 +10,10 @@ #endif #include "base/atomicops.h" +#include "base/macros.h" #include "base/synchronization/cancellation_flag.h" #include "base/threading/platform_thread.h" +#include "build/build_config.h" using base::subtle::Atomic32; using base::subtle::Acquire_Load;
diff --git a/content/renderer/devtools/devtools_cpu_throttler.h b/content/renderer/devtools/devtools_cpu_throttler.h index 34a9e83f..78c901a 100644 --- a/content/renderer/devtools/devtools_cpu_throttler.h +++ b/content/renderer/devtools/devtools_cpu_throttler.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CPU_THROTTLER_H_ #define CONTENT_RENDERER_DEVTOOLS_DEVTOOLS_CPU_THROTTLER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h"
diff --git a/content/renderer/devtools/lock_free_circular_queue.h b/content/renderer/devtools/lock_free_circular_queue.h index dfa780b..f8a4811 100644 --- a/content/renderer/devtools/lock_free_circular_queue.h +++ b/content/renderer/devtools/lock_free_circular_queue.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_DEVTOOLS_LOCK_FREE_CIRCULAR_QUEUE_H_ #define CONTENT_RENDERER_DEVTOOLS_LOCK_FREE_CIRCULAR_QUEUE_H_ +#include <stddef.h> + #include "base/atomicops.h" +#include "base/macros.h" #include "base/memory/aligned_memory.h" #define CACHELINE_ALIGNED ALIGNAS(64)
diff --git a/content/renderer/devtools/v8_sampling_profiler.cc b/content/renderer/devtools/v8_sampling_profiler.cc index 59d824c..1e43709f 100644 --- a/content/renderer/devtools/v8_sampling_profiler.cc +++ b/content/renderer/devtools/v8_sampling_profiler.cc
@@ -4,6 +4,22 @@ #include "content/renderer/devtools/v8_sampling_profiler.h" +#include <stdint.h> + +#include "base/format_macros.h" +#include "base/location.h" +#include "base/macros.h" +#include "base/strings/stringprintf.h" +#include "base/synchronization/cancellation_flag.h" +#include "base/thread_task_runner_handle.h" +#include "base/threading/platform_thread.h" +#include "base/trace_event/trace_event.h" +#include "base/trace_event/trace_event_argument.h" +#include "build/build_config.h" +#include "content/renderer/devtools/lock_free_circular_queue.h" +#include "content/renderer/render_thread_impl.h" +#include "v8/include/v8.h" + #if defined(OS_POSIX) #include <signal.h> #define USE_SIGNALS @@ -13,18 +29,6 @@ #include <windows.h> #endif -#include "base/format_macros.h" -#include "base/location.h" -#include "base/strings/stringprintf.h" -#include "base/synchronization/cancellation_flag.h" -#include "base/thread_task_runner_handle.h" -#include "base/threading/platform_thread.h" -#include "base/trace_event/trace_event.h" -#include "base/trace_event/trace_event_argument.h" -#include "content/renderer/devtools/lock_free_circular_queue.h" -#include "content/renderer/render_thread_impl.h" -#include "v8/include/v8.h" - using base::trace_event::ConvertableToTraceFormat; using base::trace_event::TraceLog; using base::trace_event::TracedValue; @@ -87,7 +91,7 @@ std::string PtrToString(const void* value) { return base::StringPrintf( - "0x%" PRIx64, static_cast<uint64>(reinterpret_cast<intptr_t>(value))); + "0x%" PRIx64, static_cast<uint64_t>(reinterpret_cast<intptr_t>(value))); } class SampleRecord {
diff --git a/content/renderer/devtools/v8_sampling_profiler.h b/content/renderer/devtools/v8_sampling_profiler.h index 2ead2f78..84fa97d25 100644 --- a/content/renderer/devtools/v8_sampling_profiler.h +++ b/content/renderer/devtools/v8_sampling_profiler.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_DEVTOOLS_V8_SAMPLING_PROFILER_H_ #define CONTENT_RENDERER_DEVTOOLS_V8_SAMPLING_PROFILER_H_ +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/waitable_event.h" #include "base/trace_event/trace_log.h"
diff --git a/content/renderer/devtools/v8_sampling_profiler_browsertest.cc b/content/renderer/devtools/v8_sampling_profiler_browsertest.cc index 1703d5d..9e7df0b 100644 --- a/content/renderer/devtools/v8_sampling_profiler_browsertest.cc +++ b/content/renderer/devtools/v8_sampling_profiler_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/json/json_reader.h" #include "base/run_loop.h" #include "base/trace_event/trace_buffer.h"
diff --git a/content/renderer/disambiguation_popup_helper.cc b/content/renderer/disambiguation_popup_helper.cc index 3bcd8a5d..246877a 100644 --- a/content/renderer/disambiguation_popup_helper.cc +++ b/content/renderer/disambiguation_popup_helper.cc
@@ -4,6 +4,8 @@ #include "content/renderer/disambiguation_popup_helper.h" +#include <stddef.h> + #include "third_party/WebKit/public/platform/WebRect.h" #include "ui/gfx/geometry/size_conversions.h"
diff --git a/content/renderer/disambiguation_popup_helper_unittest.cc b/content/renderer/disambiguation_popup_helper_unittest.cc index 65976e2..2157f29 100644 --- a/content/renderer/disambiguation_popup_helper_unittest.cc +++ b/content/renderer/disambiguation_popup_helper_unittest.cc
@@ -4,6 +4,8 @@ #include "content/renderer/disambiguation_popup_helper.h" +#include <stddef.h> + #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/public/platform/WebVector.h"
diff --git a/content/renderer/dom_automation_controller.h b/content/renderer/dom_automation_controller.h index 01efefd..67d98e2 100644 --- a/content/renderer/dom_automation_controller.h +++ b/content/renderer/dom_automation_controller.h
@@ -5,7 +5,9 @@ #ifndef CONTENT_RENDERER_DOM_AUTOMATION_CONTROLLER_H_ #define CONTENT_RENDERER_DOM_AUTOMATION_CONTROLLER_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "content/public/renderer/render_frame_observer.h" #include "gin/wrappable.h" @@ -92,7 +94,7 @@ // Makes the renderer send a javascript value to the app. // The value to be sent can be either of type String, - // Number (double casted to int32) or Boolean. Any other type or no + // Number (double casted to int32_t) or Boolean. Any other type or no // argument at all is ignored. bool SendMsg(const gin::Arguments& args);
diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index 1737cac9..a726d9c 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" @@ -10,6 +13,7 @@ #include "base/files/file_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" @@ -606,7 +610,7 @@ } private: - int32 render_view_routing_id_; + int32_t render_view_routing_id_; std::string serialized_contents_; bool serialization_reported_end_of_data_; };
diff --git a/content/renderer/dom_storage/dom_storage_cached_area.h b/content/renderer/dom_storage/dom_storage_cached_area.h index cf345fa2..6121914 100644 --- a/content/renderer/dom_storage/dom_storage_cached_area.h +++ b/content/renderer/dom_storage/dom_storage_cached_area.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_DOM_STORAGE_DOM_STORAGE_CACHED_AREA_H_ #define CONTENT_RENDERER_DOM_STORAGE_DOM_STORAGE_CACHED_AREA_H_ +#include <stddef.h> #include <stdint.h> #include <map>
diff --git a/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc b/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc index 631a281..4c433271 100644 --- a/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc +++ b/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc
@@ -4,6 +4,8 @@ #include "content/renderer/dom_storage/dom_storage_cached_area.h" +#include <stdint.h> + #include <list> #include "base/bind.h" @@ -118,7 +120,7 @@ kPageUrl("http://dom_storage/page") { } - const int64 kNamespaceId; + const int64_t kNamespaceId; const GURL kOrigin; const base::string16 kKey; const base::string16 kValue;
diff --git a/content/renderer/dom_storage/dom_storage_dispatcher.cc b/content/renderer/dom_storage/dom_storage_dispatcher.cc index a4d877f..29dbb04 100644 --- a/content/renderer/dom_storage/dom_storage_dispatcher.cc +++ b/content/renderer/dom_storage/dom_storage_dispatcher.cc
@@ -99,11 +99,11 @@ explicit ProxyImpl(RenderThreadImpl* sender); // Methods for use by DomStorageDispatcher directly. - DOMStorageCachedArea* OpenCachedArea( - int64 namespace_id, const GURL& origin); + DOMStorageCachedArea* OpenCachedArea(int64_t namespace_id, + const GURL& origin); void CloseCachedArea(DOMStorageCachedArea* area); - DOMStorageCachedArea* LookupCachedArea( - int64 namespace_id, const GURL& origin); + DOMStorageCachedArea* LookupCachedArea(int64_t namespace_id, + const GURL& origin); void CompleteOnePendingCallback(bool success); void Shutdown(); @@ -155,7 +155,7 @@ return callback; } - std::string GetCachedAreaKey(int64 namespace_id, const GURL& origin) { + std::string GetCachedAreaKey(int64_t namespace_id, const GURL& origin) { return base::Int64ToString(namespace_id) + origin.spec(); } @@ -179,7 +179,8 @@ } DOMStorageCachedArea* DomStorageDispatcher::ProxyImpl::OpenCachedArea( - int64 namespace_id, const GURL& origin) { + int64_t namespace_id, + const GURL& origin) { std::string key = GetCachedAreaKey(namespace_id, origin); if (CachedAreaHolder* holder = GetAreaHolder(key)) { ++(holder->open_count_); @@ -204,7 +205,8 @@ } DOMStorageCachedArea* DomStorageDispatcher::ProxyImpl::LookupCachedArea( - int64 namespace_id, const GURL& origin) { + int64_t namespace_id, + const GURL& origin) { std::string key = GetCachedAreaKey(namespace_id, origin); CachedAreaHolder* holder = GetAreaHolder(key); if (!holder) @@ -268,7 +270,9 @@ } scoped_refptr<DOMStorageCachedArea> DomStorageDispatcher::OpenCachedArea( - int connection_id, int64 namespace_id, const GURL& origin) { + int connection_id, + int64_t namespace_id, + const GURL& origin) { RenderThreadImpl::current()->Send( new DOMStorageHostMsg_OpenStorageArea( connection_id, namespace_id, origin));
diff --git a/content/renderer/dom_storage/dom_storage_dispatcher.h b/content/renderer/dom_storage/dom_storage_dispatcher.h index f395d57..0ff9644 100644 --- a/content/renderer/dom_storage/dom_storage_dispatcher.h +++ b/content/renderer/dom_storage/dom_storage_dispatcher.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_DOM_STORAGE_DOM_STORAGE_DISPATCHER_H_ #define CONTENT_RENDERER_DOM_STORAGE_DOM_STORAGE_DISPATCHER_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" class GURL; @@ -30,7 +32,7 @@ // Each call to open should be balanced with a call to close. scoped_refptr<DOMStorageCachedArea> OpenCachedArea(int connection_id, - int64 namespace_id, + int64_t namespace_id, const GURL& origin); void CloseCachedArea(int connection_id, DOMStorageCachedArea* area);
diff --git a/content/renderer/dom_storage/webstoragearea_impl.cc b/content/renderer/dom_storage/webstoragearea_impl.cc index c307535..dd20bece 100644 --- a/content/renderer/dom_storage/webstoragearea_impl.cc +++ b/content/renderer/dom_storage/webstoragearea_impl.cc
@@ -34,12 +34,11 @@ return g_all_areas_map.Pointer()->Lookup(id); } -WebStorageAreaImpl::WebStorageAreaImpl( - int64 namespace_id, const GURL& origin) +WebStorageAreaImpl::WebStorageAreaImpl(int64_t namespace_id, const GURL& origin) : connection_id_(g_all_areas_map.Pointer()->Add(this)), - cached_area_(dispatcher()-> - OpenCachedArea(connection_id_, namespace_id, origin)) { -} + cached_area_(dispatcher()->OpenCachedArea(connection_id_, + namespace_id, + origin)) {} WebStorageAreaImpl::~WebStorageAreaImpl() { g_all_areas_map.Pointer()->Remove(connection_id_);
diff --git a/content/renderer/dom_storage/webstoragearea_impl.h b/content/renderer/dom_storage/webstoragearea_impl.h index 61a8153..310250b 100644 --- a/content/renderer/dom_storage/webstoragearea_impl.h +++ b/content/renderer/dom_storage/webstoragearea_impl.h
@@ -5,7 +5,9 @@ #ifndef CONTENT_RENDERER_DOM_STORAGE_WEBSTORAGEAREA_IMPL_H_ #define CONTENT_RENDERER_DOM_STORAGE_WEBSTORAGEAREA_IMPL_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "third_party/WebKit/public/platform/WebStorageArea.h" #include "third_party/WebKit/public/platform/WebString.h" @@ -20,7 +22,7 @@ public: static WebStorageAreaImpl* FromConnectionId(int id); - WebStorageAreaImpl(int64 namespace_id, const GURL& origin); + WebStorageAreaImpl(int64_t namespace_id, const GURL& origin); ~WebStorageAreaImpl() override; // See WebStorageArea.h for documentation on these functions.
diff --git a/content/renderer/dom_storage/webstoragenamespace_impl.cc b/content/renderer/dom_storage/webstoragenamespace_impl.cc index 531263d..4c86057d 100644 --- a/content/renderer/dom_storage/webstoragenamespace_impl.cc +++ b/content/renderer/dom_storage/webstoragenamespace_impl.cc
@@ -20,8 +20,7 @@ : namespace_id_(kLocalStorageNamespaceId) { } -WebStorageNamespaceImpl::WebStorageNamespaceImpl( - int64 namespace_id) +WebStorageNamespaceImpl::WebStorageNamespaceImpl(int64_t namespace_id) : namespace_id_(namespace_id) { DCHECK_NE(kInvalidSessionStorageNamespaceId, namespace_id); }
diff --git a/content/renderer/dom_storage/webstoragenamespace_impl.h b/content/renderer/dom_storage/webstoragenamespace_impl.h index ecf3c74..d169df5 100644 --- a/content/renderer/dom_storage/webstoragenamespace_impl.h +++ b/content/renderer/dom_storage/webstoragenamespace_impl.h
@@ -5,7 +5,8 @@ #ifndef CONTENT_RENDERER_DOM_STORAGE_WEBSTORAGENAMESPACE_IMPL_H_ #define CONTENT_RENDERER_DOM_STORAGE_WEBSTORAGENAMESPACE_IMPL_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "third_party/WebKit/public/platform/WebStorageNamespace.h" namespace content { @@ -15,7 +16,7 @@ // The default constructor creates a local storage namespace, the second // constructor should be used for session storage namepaces. WebStorageNamespaceImpl(); - explicit WebStorageNamespaceImpl(int64 namespace_id); + explicit WebStorageNamespaceImpl(int64_t namespace_id); ~WebStorageNamespaceImpl() override; // See WebStorageNamespace.h for documentation on these functions. @@ -25,7 +26,7 @@ bool isSameNamespace(const WebStorageNamespace&) const override; private: - int64 namespace_id_; + int64_t namespace_id_; }; } // namespace content
diff --git a/content/renderer/drop_data_builder.cc b/content/renderer/drop_data_builder.cc index 37b7231..beb98b6d 100644 --- a/content/renderer/drop_data_builder.cc +++ b/content/renderer/drop_data_builder.cc
@@ -4,6 +4,8 @@ #include "content/renderer/drop_data_builder.h" +#include <stddef.h> + #include "base/strings/string_util.h" #include "content/public/common/drop_data.h" #include "third_party/WebKit/public/platform/WebDragData.h"
diff --git a/content/renderer/external_popup_menu.cc b/content/renderer/external_popup_menu.cc index f2363e3..7bb01a1d 100644 --- a/content/renderer/external_popup_menu.cc +++ b/content/renderer/external_popup_menu.cc
@@ -4,6 +4,9 @@ #include "content/renderer/external_popup_menu.h" +#include <stddef.h> + +#include "build/build_config.h" #include "content/common/frame_messages.h" #include "content/renderer/menu_item_builder.h" #include "content/renderer/render_frame_impl.h"
diff --git a/content/renderer/external_popup_menu.h b/content/renderer/external_popup_menu.h index c73e4d7..0d99eb7 100644 --- a/content/renderer/external_popup_menu.h +++ b/content/renderer/external_popup_menu.h
@@ -7,7 +7,8 @@ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" +#include "build/build_config.h" #include "third_party/WebKit/public/web/WebExternalPopupMenu.h" #include "third_party/WebKit/public/web/WebPopupMenuInfo.h" #include "ui/gfx/geometry/point_f.h"
diff --git a/content/renderer/external_popup_menu_browsertest.cc b/content/renderer/external_popup_menu_browsertest.cc index 885070e..d7f9312 100644 --- a/content/renderer/external_popup_menu_browsertest.cc +++ b/content/renderer/external_popup_menu_browsertest.cc
@@ -2,14 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "content/common/frame_messages.h" #include "content/public/test/render_view_test.h" #include "content/renderer/render_frame_impl.h" #include "content/renderer/render_view_impl.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/platform/WebSize.h" +#include "third_party/WebKit/public/web/WebView.h" // Tests for the external select popup menu (Mac specific).
diff --git a/content/renderer/fetchers/manifest_fetcher.h b/content/renderer/fetchers/manifest_fetcher.h index a75a660..bfb3b8c 100644 --- a/content/renderer/fetchers/manifest_fetcher.h +++ b/content/renderer/fetchers/manifest_fetcher.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "third_party/WebKit/public/platform/WebURLResponse.h"
diff --git a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h index de44ace..0b8671e6 100644 --- a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h +++ b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "url/gurl.h"
diff --git a/content/renderer/fetchers/resource_fetcher_impl.h b/content/renderer/fetchers/resource_fetcher_impl.h index b6c1c74..e260b0981 100644 --- a/content/renderer/fetchers/resource_fetcher_impl.h +++ b/content/renderer/fetchers/resource_fetcher_impl.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" #include "content/public/renderer/resource_fetcher.h"
diff --git a/content/renderer/fetchers/web_url_loader_client_impl.h b/content/renderer/fetchers/web_url_loader_client_impl.h index e51b3ce0..70fb7da 100644 --- a/content/renderer/fetchers/web_url_loader_client_impl.h +++ b/content/renderer/fetchers/web_url_loader_client_impl.h
@@ -5,8 +5,11 @@ #ifndef CONTENT_RENDERER_FETCHERS_WEB_URL_LOADER_CLIENT_IMPL_H_ #define CONTENT_RENDERER_FETCHERS_WEB_URL_LOADER_CLIENT_IMPL_H_ +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "third_party/WebKit/public/platform/WebURLResponse.h"
diff --git a/content/renderer/gamepad_shared_memory_reader.h b/content/renderer/gamepad_shared_memory_reader.h index 40af1b8..3aed543 100644 --- a/content/renderer/gamepad_shared_memory_reader.h +++ b/content/renderer/gamepad_shared_memory_reader.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_GAMEPAD_SHARED_MEMORY_READER_H_ #define CONTENT_RENDERER_GAMEPAD_SHARED_MEMORY_READER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "content/common/gamepad_messages.h"
diff --git a/content/renderer/gin_browsertest.cc b/content/renderer/gin_browsertest.cc index e536bd6..4244205 100644 --- a/content/renderer/gin_browsertest.cc +++ b/content/renderer/gin_browsertest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "content/public/common/content_switches.h" #include "content/public/test/render_view_test.h" #include "content/renderer/render_view_impl.h"
diff --git a/content/renderer/gpu/compositor_external_begin_frame_source.h b/content/renderer/gpu/compositor_external_begin_frame_source.h index 92f9184..d555832 100644 --- a/content/renderer/gpu/compositor_external_begin_frame_source.h +++ b/content/renderer/gpu/compositor_external_begin_frame_source.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_RENDERER_GPU_COMPOSITOR_EXTERNAL_BEGIN_FRAME_SOURCE_H_ #define CONTENT_RENDERER_GPU_COMPOSITOR_EXTERNAL_BEGIN_FRAME_SOURCE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "cc/scheduler/begin_frame_source.h" #include "content/renderer/gpu/compositor_forwarding_message_filter.h"
diff --git a/content/renderer/gpu/compositor_forwarding_message_filter.h b/content/renderer/gpu/compositor_forwarding_message_filter.h index 9e2afaf7b..92527cc 100644 --- a/content/renderer/gpu/compositor_forwarding_message_filter.h +++ b/content/renderer/gpu/compositor_forwarding_message_filter.h
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "base/task_runner.h" #include "base/threading/thread_checker.h"
diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc index eaea1d5..3a6e69929 100644 --- a/content/renderer/gpu/compositor_output_surface.cc +++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -8,6 +8,7 @@ #include "base/location.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "cc/output/compositor_frame.h" #include "cc/output/compositor_frame_ack.h" #include "cc/output/managed_memory_policy.h" @@ -26,8 +27,8 @@ namespace content { CompositorOutputSurface::CompositorOutputSurface( - int32 routing_id, - uint32 output_surface_id, + int32_t routing_id, + uint32_t output_surface_id, const scoped_refptr<ContextProviderCommandBuffer>& context_provider, const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider, scoped_ptr<cc::SoftwareOutputDevice> software_device, @@ -38,8 +39,8 @@ software_device.Pass()), output_surface_id_(output_surface_id), use_swap_compositor_frame_message_(use_swap_compositor_frame_message), - output_surface_filter_( - RenderThreadImpl::current()->compositor_message_filter()), + output_surface_filter_(RenderThreadImpl::current() + ->compositor_message_filter()), frame_swap_message_queue_(swap_frame_message_queue), routing_id_(routing_id), #if defined(OS_ANDROID) @@ -92,7 +93,7 @@ } void CompositorOutputSurface::ShortcutSwapAck( - uint32 output_surface_id, + uint32_t output_surface_id, scoped_ptr<cc::GLFrameData> gl_frame_data) { if (!layout_test_previous_frame_ack_) { layout_test_previous_frame_ack_.reset(new cc::CompositorFrameAck); @@ -175,7 +176,7 @@ CommitVSyncParameters(timebase, interval); } -void CompositorOutputSurface::OnSwapAck(uint32 output_surface_id, +void CompositorOutputSurface::OnSwapAck(uint32_t output_surface_id, const cc::CompositorFrameAck& ack) { // Ignore message if it's a stale one coming from a different output surface // (e.g. after a lost context). @@ -186,7 +187,7 @@ } void CompositorOutputSurface::OnReclaimResources( - uint32 output_surface_id, + uint32_t output_surface_id, const cc::CompositorFrameAck& ack) { // Ignore message if it's a stale one coming from a different output surface // (e.g. after a lost context).
diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h index 909bf5fb..cbbad42 100644 --- a/content/renderer/gpu/compositor_output_surface.h +++ b/content/renderer/gpu/compositor_output_surface.h
@@ -5,14 +5,17 @@ #ifndef CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ #define CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" #include "base/threading/platform_thread.h" #include "base/time/time.h" +#include "build/build_config.h" #include "cc/output/begin_frame_args.h" #include "cc/output/output_surface.h" #include "content/renderer/gpu/compositor_forwarding_message_filter.h" @@ -39,8 +42,8 @@ NON_EXPORTED_BASE(public base::NonThreadSafe) { public: CompositorOutputSurface( - int32 routing_id, - uint32 output_surface_id, + int32_t routing_id, + uint32_t output_surface_id, const scoped_refptr<ContextProviderCommandBuffer>& context_provider, const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider, @@ -59,13 +62,13 @@ void UpdateSmoothnessTakesPriority(bool prefer_smoothness) override; protected: - void ShortcutSwapAck(uint32 output_surface_id, + void ShortcutSwapAck(uint32_t output_surface_id, scoped_ptr<cc::GLFrameData> gl_frame_data); - virtual void OnSwapAck(uint32 output_surface_id, + virtual void OnSwapAck(uint32_t output_surface_id, const cc::CompositorFrameAck& ack); - virtual void OnReclaimResources(uint32 output_surface_id, + virtual void OnReclaimResources(uint32_t output_surface_id, const cc::CompositorFrameAck& ack); - uint32 output_surface_id_; + uint32_t output_surface_id_; private: class CompositorOutputSurfaceProxy :
diff --git a/content/renderer/gpu/delegated_compositor_output_surface.cc b/content/renderer/gpu/delegated_compositor_output_surface.cc index 6d02fab..9e8ad78a 100644 --- a/content/renderer/gpu/delegated_compositor_output_surface.cc +++ b/content/renderer/gpu/delegated_compositor_output_surface.cc
@@ -8,8 +8,8 @@ namespace content { DelegatedCompositorOutputSurface::DelegatedCompositorOutputSurface( - int32 routing_id, - uint32 output_surface_id, + int32_t routing_id, + uint32_t output_surface_id, const scoped_refptr<ContextProviderCommandBuffer>& context_provider, const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider, scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue)
diff --git a/content/renderer/gpu/delegated_compositor_output_surface.h b/content/renderer/gpu/delegated_compositor_output_surface.h index 061f1d3..f98d60a 100644 --- a/content/renderer/gpu/delegated_compositor_output_surface.h +++ b/content/renderer/gpu/delegated_compositor_output_surface.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_GPU_DELEGATED_COMPOSITOR_OUTPUT_SURFACE_H_ #define CONTENT_RENDERER_GPU_DELEGATED_COMPOSITOR_OUTPUT_SURFACE_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "content/renderer/gpu/compositor_output_surface.h" @@ -14,8 +16,8 @@ class DelegatedCompositorOutputSurface : public CompositorOutputSurface { public: DelegatedCompositorOutputSurface( - int32 routing_id, - uint32 output_surface_id, + int32_t routing_id, + uint32_t output_surface_id, const scoped_refptr<ContextProviderCommandBuffer>& context_provider, const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider,
diff --git a/content/renderer/gpu/frame_swap_message_queue.cc b/content/renderer/gpu/frame_swap_message_queue.cc index 7e7a75b..33ae9fc 100644 --- a/content/renderer/gpu/frame_swap_message_queue.cc +++ b/content/renderer/gpu/frame_swap_message_queue.cc
@@ -9,6 +9,7 @@ #include "base/containers/hash_tables.h" #include "base/logging.h" +#include "base/macros.h" #include "base/stl_util.h" #include "ipc/ipc_message.h"
diff --git a/content/renderer/gpu/frame_swap_message_queue.h b/content/renderer/gpu/frame_swap_message_queue.h index 87ce2d8..f45a36a 100644 --- a/content/renderer/gpu/frame_swap_message_queue.h +++ b/content/renderer/gpu/frame_swap_message_queue.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/auto_reset.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h"
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc index 1c7368db..dbed38e4 100644 --- a/content/renderer/gpu/gpu_benchmarking_extension.cc +++ b/content/renderer/gpu/gpu_benchmarking_extension.cc
@@ -4,11 +4,14 @@ #include "content/renderer/gpu/gpu_benchmarking_extension.h" +#include <stddef.h> + #include <string> #include "base/base64.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "cc/layers/layer.h" #include "content/common/input/synthetic_gesture_params.h"
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.h b/content/renderer/gpu/gpu_benchmarking_extension.h index 08d7f900..4da0448 100644 --- a/content/renderer/gpu/gpu_benchmarking_extension.h +++ b/content/renderer/gpu/gpu_benchmarking_extension.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_GPU_GPU_BENCHMARKING_EXTENSION_H_ #define CONTENT_RENDERER_GPU_GPU_BENCHMARKING_EXTENSION_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "gin/wrappable.h" namespace blink {
diff --git a/content/renderer/gpu/mailbox_output_surface.cc b/content/renderer/gpu/mailbox_output_surface.cc index de98102..19a7efdb 100644 --- a/content/renderer/gpu/mailbox_output_surface.cc +++ b/content/renderer/gpu/mailbox_output_surface.cc
@@ -23,8 +23,8 @@ namespace content { MailboxOutputSurface::MailboxOutputSurface( - int32 routing_id, - uint32 output_surface_id, + int32_t routing_id, + uint32_t output_surface_id, const scoped_refptr<ContextProviderCommandBuffer>& context_provider, const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider, scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue, @@ -152,7 +152,7 @@ 0); } -void MailboxOutputSurface::OnSwapAck(uint32 output_surface_id, +void MailboxOutputSurface::OnSwapAck(uint32_t output_surface_id, const cc::CompositorFrameAck& ack) { // Ignore message if it's a stale one coming from a different output surface // (e.g. after a lost context). @@ -189,7 +189,7 @@ // The browser always keeps one texture as the frontbuffer. // If it does not return a mailbox, it discarded the frontbuffer which is // the oldest texture we sent. - uint32 texture_id = pending_textures_.front().texture_id; + uint32_t texture_id = pending_textures_.front().texture_id; if (texture_id) context_provider_->ContextGL()->DeleteTextures(1, &texture_id); pending_textures_.pop_front(); @@ -224,7 +224,7 @@ MailboxOutputSurface::TransferableFrame::TransferableFrame() : texture_id(0) {} MailboxOutputSurface::TransferableFrame::TransferableFrame( - uint32 texture_id, + uint32_t texture_id, const gpu::Mailbox& mailbox, const gfx::Size size) : texture_id(texture_id), mailbox(mailbox), size(size) {}
diff --git a/content/renderer/gpu/mailbox_output_surface.h b/content/renderer/gpu/mailbox_output_surface.h index 148efa3..1d4b9555 100644 --- a/content/renderer/gpu/mailbox_output_surface.h +++ b/content/renderer/gpu/mailbox_output_surface.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_ #define CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_ +#include <stddef.h> +#include <stdint.h> + #include <queue> #include "base/memory/ref_counted.h" @@ -27,8 +30,8 @@ class MailboxOutputSurface : public CompositorOutputSurface { public: MailboxOutputSurface( - int32 routing_id, - uint32 output_surface_id, + int32_t routing_id, + uint32_t output_surface_id, const scoped_refptr<ContextProviderCommandBuffer>& context_provider, const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider, @@ -46,18 +49,18 @@ private: // CompositorOutputSurface overrides. - void OnSwapAck(uint32 output_surface_id, + void OnSwapAck(uint32_t output_surface_id, const cc::CompositorFrameAck& ack) override; size_t GetNumAcksPending(); struct TransferableFrame { TransferableFrame(); - TransferableFrame(uint32 texture_id, + TransferableFrame(uint32_t texture_id, const gpu::Mailbox& mailbox, const gfx::Size size); - uint32 texture_id; + uint32_t texture_id; gpu::Mailbox mailbox; gpu::SyncToken sync_token; gfx::Size size; @@ -67,7 +70,7 @@ std::deque<TransferableFrame> pending_textures_; std::queue<TransferableFrame> returned_textures_; - uint32 fbo_; + uint32_t fbo_; bool is_backbuffer_discarded_; cc::ResourceFormat format_; };
diff --git a/content/renderer/gpu/queue_message_swap_promise.cc b/content/renderer/gpu/queue_message_swap_promise.cc index 170243e8..5d8386d8 100644 --- a/content/renderer/gpu/queue_message_swap_promise.cc +++ b/content/renderer/gpu/queue_message_swap_promise.cc
@@ -67,7 +67,7 @@ #endif } -int64 QueueMessageSwapPromise::TraceId() const { +int64_t QueueMessageSwapPromise::TraceId() const { return 0; }
diff --git a/content/renderer/gpu/queue_message_swap_promise.h b/content/renderer/gpu/queue_message_swap_promise.h index 37198b2..a43626b 100644 --- a/content/renderer/gpu/queue_message_swap_promise.h +++ b/content/renderer/gpu/queue_message_swap_promise.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_GPU_QUEUE_MESSAGE_SWAP_PROMISE_H_ #define CONTENT_RENDERER_GPU_QUEUE_MESSAGE_SWAP_PROMISE_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "cc/output/swap_promise.h" @@ -28,7 +30,7 @@ void DidSwap(cc::CompositorFrameMetadata* metadata) override; void DidNotSwap(DidNotSwapReason reason) override; - int64 TraceId() const override; + int64_t TraceId() const override; private: void PromiseCompleted();
diff --git a/content/renderer/gpu/queue_message_swap_promise_unittest.cc b/content/renderer/gpu/queue_message_swap_promise_unittest.cc index 7f3837f..234ff77b 100644 --- a/content/renderer/gpu/queue_message_swap_promise_unittest.cc +++ b/content/renderer/gpu/queue_message_swap_promise_unittest.cc
@@ -4,8 +4,11 @@ #include "content/renderer/gpu/queue_message_swap_promise.h" +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "cc/output/swap_promise.h" #include "content/renderer/gpu/frame_swap_message_queue.h"
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc index 74aae79..aae1834 100644 --- a/content/renderer/gpu/render_widget_compositor.cc +++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -4,6 +4,8 @@ #include "content/renderer/gpu/render_widget_compositor.h" +#include <stddef.h> + #include <limits> #include <string> @@ -18,6 +20,7 @@ #include "base/thread_task_runner_handle.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "cc/animation/animation_host.h" #include "cc/animation/animation_timeline.h" #include "cc/base/switches.h"
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h index 3a37e50..0eac7cd 100644 --- a/content/renderer/gpu/render_widget_compositor.h +++ b/content/renderer/gpu/render_widget_compositor.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ +#include <stdint.h> + #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/content/renderer/gpu/render_widget_compositor_unittest.cc b/content/renderer/gpu/render_widget_compositor_unittest.cc index 18e48a5a..f202310 100644 --- a/content/renderer/gpu/render_widget_compositor_unittest.cc +++ b/content/renderer/gpu/render_widget_compositor_unittest.cc
@@ -5,6 +5,7 @@ #include "content/renderer/gpu/render_widget_compositor.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "cc/output/begin_frame_args.h"
diff --git a/content/renderer/gpu/stream_texture_host_android.cc b/content/renderer/gpu/stream_texture_host_android.cc index fe63557..41e96b7 100644 --- a/content/renderer/gpu/stream_texture_host_android.cc +++ b/content/renderer/gpu/stream_texture_host_android.cc
@@ -24,7 +24,7 @@ channel_->RemoveRoute(stream_id_); } -bool StreamTextureHost::BindToCurrentThread(int32 stream_id, +bool StreamTextureHost::BindToCurrentThread(int32_t stream_id, Listener* listener) { listener_ = listener; if (channel_.get() && stream_id && !stream_id_) {
diff --git a/content/renderer/gpu/stream_texture_host_android.h b/content/renderer/gpu/stream_texture_host_android.h index 871cb63..998cff548 100644 --- a/content/renderer/gpu/stream_texture_host_android.h +++ b/content/renderer/gpu/stream_texture_host_android.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_GPU_STREAM_TEXTURE_HOST_ANDROID_H_ #define CONTENT_RENDERER_GPU_STREAM_TEXTURE_HOST_ANDROID_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/common/android/surface_texture_peer.h" #include "ipc/ipc_listener.h" @@ -35,7 +38,7 @@ virtual ~Listener() {} }; - bool BindToCurrentThread(int32 stream_id, Listener* listener); + bool BindToCurrentThread(int32_t stream_id, Listener* listener); // IPC::Channel::Listener implementation: bool OnMessageReceived(const IPC::Message& message) override;
diff --git a/content/renderer/history_controller.h b/content/renderer/history_controller.h index f3da175..aeeae01 100644 --- a/content/renderer/history_controller.h +++ b/content/renderer/history_controller.h
@@ -36,6 +36,7 @@ #define CONTENT_RENDERER_HISTORY_CONTROLLER_H_ #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "content/renderer/history_entry.h"
diff --git a/content/renderer/history_controller_browsertest.cc b/content/renderer/history_controller_browsertest.cc index 5dc89a8b2..148c0c3 100644 --- a/content/renderer/history_controller_browsertest.cc +++ b/content/renderer/history_controller_browsertest.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/common/site_isolation_policy.h" #include "content/public/test/render_view_test.h" #include "content/renderer/history_controller.h"
diff --git a/content/renderer/history_serialization.cc b/content/renderer/history_serialization.cc index d015cf2..a8e3692b 100644 --- a/content/renderer/history_serialization.cc +++ b/content/renderer/history_serialization.cc
@@ -4,6 +4,8 @@ #include "content/renderer/history_serialization.h" +#include <stddef.h> + #include "content/common/page_state_serialization.h" #include "content/public/common/page_state.h" #include "content/renderer/history_entry.h"
diff --git a/content/renderer/idle_user_detector.h b/content/renderer/idle_user_detector.h index 58e7037..3e3beba 100644 --- a/content/renderer/idle_user_detector.h +++ b/content/renderer/idle_user_detector.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_IDLE_USER_DETECTOR_H_ #define CONTENT_RENDERER_IDLE_USER_DETECTOR_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/renderer/render_view_observer.h" namespace blink {
diff --git a/content/renderer/image_downloader/image_downloader_impl.h b/content/renderer/image_downloader/image_downloader_impl.h index 828c72d..888d839 100644 --- a/content/renderer/image_downloader/image_downloader_impl.h +++ b/content/renderer/image_downloader/image_downloader_impl.h
@@ -5,8 +5,11 @@ #ifndef CONTENT_RENDERER_IMAGE_DOWNLOADER_IMAGE_DOWNLOADER_IMPL_H_ #define CONTENT_RENDERER_IMAGE_DOWNLOADER_IMAGE_DOWNLOADER_IMPL_H_ +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "content/common/image_downloader/image_downloader.mojom.h" #include "content/public/renderer/render_frame_observer.h"
diff --git a/content/renderer/in_process_renderer_thread.cc b/content/renderer/in_process_renderer_thread.cc index 94a41e6..a2c8c5d 100644 --- a/content/renderer/in_process_renderer_thread.cc +++ b/content/renderer/in_process_renderer_thread.cc
@@ -4,6 +4,7 @@ #include "content/renderer/in_process_renderer_thread.h" +#include "build/build_config.h" #include "content/renderer/render_process.h" #include "content/renderer/render_process_impl.h" #include "content/renderer/render_thread_impl.h"
diff --git a/content/renderer/in_process_renderer_thread.h b/content/renderer/in_process_renderer_thread.h index 1156160..ab256f4a 100644 --- a/content/renderer/in_process_renderer_thread.h +++ b/content/renderer/in_process_renderer_thread.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/threading/thread.h" #include "content/common/content_export.h" #include "content/common/in_process_child_thread_params.h"
diff --git a/content/renderer/input/input_event_filter_unittest.cc b/content/renderer/input/input_event_filter_unittest.cc index d072303..1aace83d 100644 --- a/content/renderer/input/input_event_filter_unittest.cc +++ b/content/renderer/input/input_event_filter_unittest.cc
@@ -2,12 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <new> #include <utility> #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "content/common/input/synthetic_web_input_event_builders.h" #include "content/common/input_messages.h" #include "content/common/view_messages.h"
diff --git a/content/renderer/input/input_handler_manager_client.h b/content/renderer/input/input_handler_manager_client.h index 9455af3..cf4fe00 100644 --- a/content/renderer/input/input_handler_manager_client.h +++ b/content/renderer/input/input_handler_manager_client.h
@@ -5,9 +5,9 @@ #ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_CLIENT_H_ #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_CLIENT_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "content/common/input/input_event_ack_state.h" #include "ui/gfx/geometry/vector2d_f.h"
diff --git a/content/renderer/input/input_handler_wrapper.h b/content/renderer/input/input_handler_wrapper.h index 69ff5c671..0589a0f 100644 --- a/content/renderer/input/input_handler_wrapper.h +++ b/content/renderer/input/input_handler_wrapper.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_WRAPPER_H_ #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_WRAPPER_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" #include "content/renderer/input/input_handler_manager.h"
diff --git a/content/renderer/input/main_thread_input_event_filter.cc b/content/renderer/input/main_thread_input_event_filter.cc index cd6c2ea..61814c9 100644 --- a/content/renderer/input/main_thread_input_event_filter.cc +++ b/content/renderer/input/main_thread_input_event_filter.cc
@@ -29,7 +29,7 @@ } bool MainThreadInputEventFilter::GetSupportedMessageClasses( - std::vector<uint32>* supported_message_classes) const { + std::vector<uint32_t>* supported_message_classes) const { supported_message_classes->push_back(InputMsgStart); return true; }
diff --git a/content/renderer/input/main_thread_input_event_filter.h b/content/renderer/input/main_thread_input_event_filter.h index f540a9cd..5fc513a 100644 --- a/content/renderer/input/main_thread_input_event_filter.h +++ b/content/renderer/input/main_thread_input_event_filter.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_INPUT_MAIN_THREAD_INPUT_EVENT_FILTER_H_ #define CONTENT_RENDERER_INPUT_MAIN_THREAD_INPUT_EVENT_FILTER_H_ +#include <stdint.h> + #include "base/callback.h" #include "ipc/message_filter.h" @@ -31,7 +33,7 @@ // IPC::MessageFilter implementation. bool OnMessageReceived(const IPC::Message& message) override; bool GetSupportedMessageClasses( - std::vector<uint32>* supported_message_classes) const override; + std::vector<uint32_t>* supported_message_classes) const override; private: ~MainThreadInputEventFilter() override;
diff --git a/content/renderer/input/render_widget_input_handler.cc b/content/renderer/input/render_widget_input_handler.cc index 275b77e..78c6465 100644 --- a/content/renderer/input/render_widget_input_handler.cc +++ b/content/renderer/input/render_widget_input_handler.cc
@@ -4,9 +4,13 @@ #include "content/renderer/input/render_widget_input_handler.h" +#include <stddef.h> +#include <stdint.h> + #include "base/auto_reset.h" #include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event_synthetic_delay.h" +#include "build/build_config.h" #include "cc/trees/swap_promise_monitor.h" #include "components/scheduler/renderer/renderer_scheduler.h" #include "content/common/input/input_event_ack.h" @@ -47,7 +51,7 @@ // be spent in input hanlders before input starts getting throttled. const int kInputHandlingTimeThrottlingThresholdMicroseconds = 4166; -int64 GetEventLatencyMicros(double event_timestamp, base::TimeTicks now) { +int64_t GetEventLatencyMicros(double event_timestamp, base::TimeTicks now) { return (now - base::TimeDelta::FromSecondsD(event_timestamp)) .ToInternalValue(); } @@ -120,7 +124,7 @@ } } -void LogPassiveLatency(int64 latency) { +void LogPassiveLatency(int64_t latency) { UMA_HISTOGRAM_CUSTOM_COUNTS("Event.PassiveListeners.Latency", latency, 1, 10000000, 100); }
diff --git a/content/renderer/input/render_widget_input_handler.h b/content/renderer/input/render_widget_input_handler.h index a44e020..f8ff1d3 100644 --- a/content/renderer/input/render_widget_input_handler.h +++ b/content/renderer/input/render_widget_input_handler.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_INPUT_RENDER_WIDGET_INPUT_HANDLER_H_ #define CONTENT_RENDERER_INPUT_RENDER_WIDGET_INPUT_HANDLER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "content/common/input/did_overscroll_params.h"
diff --git a/content/renderer/internal_document_state_data.h b/content/renderer/internal_document_state_data.h index 47097805..23335a5 100644 --- a/content/renderer/internal_document_state_data.h +++ b/content/renderer/internal_document_state_data.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/supports_user_data.h" #include "third_party/WebKit/public/platform/WebURLRequest.h"
diff --git a/content/renderer/java/gin_java_bridge_dispatcher.h b/content/renderer/java/gin_java_bridge_dispatcher.h index 877e46f..05e1427 100644 --- a/content/renderer/java/gin_java_bridge_dispatcher.h +++ b/content/renderer/java/gin_java_bridge_dispatcher.h
@@ -9,6 +9,7 @@ #include <set> #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
diff --git a/content/renderer/java/gin_java_bridge_object.h b/content/renderer/java/gin_java_bridge_object.h index 55846c4..25d1840 100644 --- a/content/renderer/java/gin_java_bridge_object.h +++ b/content/renderer/java/gin_java_bridge_object.h
@@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/renderer/java/gin_java_bridge_dispatcher.h" #include "gin/handle.h"
diff --git a/content/renderer/java/gin_java_bridge_value_converter.cc b/content/renderer/java/gin_java_bridge_value_converter.cc index 2fdf658b..849ef6a 100644 --- a/content/renderer/java/gin_java_bridge_value_converter.cc +++ b/content/renderer/java/gin_java_bridge_value_converter.cc
@@ -4,8 +4,12 @@ #include "content/renderer/java/gin_java_bridge_value_converter.h" +#include <stddef.h> +#include <stdint.h> + #include <cmath> +#include "base/macros.h" #include "base/values.h" #include "content/common/android/gin_java_bridge_value.h" #include "content/renderer/java/gin_java_bridge_object.h"
diff --git a/content/renderer/java/gin_java_bridge_value_converter.h b/content/renderer/java/gin_java_bridge_value_converter.h index 33e3af5..5c4ee984 100644 --- a/content/renderer/java/gin_java_bridge_value_converter.h +++ b/content/renderer/java/gin_java_bridge_value_converter.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_JAVA_GIN_JAVA_BRIDGE_VALUE_CONVERTER_H_ #define CONTENT_RENDERER_JAVA_GIN_JAVA_BRIDGE_VALUE_CONVERTER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "content/public/child/v8_value_converter.h"
diff --git a/content/renderer/java/gin_java_bridge_value_converter_unittest.cc b/content/renderer/java/gin_java_bridge_value_converter_unittest.cc index 056aaeb..2de3e12 100644 --- a/content/renderer/java/gin_java_bridge_value_converter_unittest.cc +++ b/content/renderer/java/gin_java_bridge_value_converter_unittest.cc
@@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <cmath> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "content/common/android/gin_java_bridge_value.h"
diff --git a/content/renderer/java/gin_java_function_invocation_helper.h b/content/renderer/java/gin_java_function_invocation_helper.h index 2860820..823420d5 100644 --- a/content/renderer/java/gin_java_function_invocation_helper.h +++ b/content/renderer/java/gin_java_function_invocation_helper.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_JAVA_GIN_JAVA_FUNCTION_INVOCATION_HELPER_H_ #define CONTENT_RENDERER_JAVA_GIN_JAVA_FUNCTION_INVOCATION_HELPER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "content/renderer/java/gin_java_bridge_dispatcher.h"
diff --git a/content/renderer/manifest/manifest_manager.h b/content/renderer/manifest/manifest_manager.h index 16ce857..f78482f3 100644 --- a/content/renderer/manifest/manifest_manager.h +++ b/content/renderer/manifest/manifest_manager.h
@@ -8,6 +8,7 @@ #include <list> #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/common/manifest.h" #include "content/public/renderer/render_frame_observer.h"
diff --git a/content/renderer/manifest/manifest_parser.cc b/content/renderer/manifest/manifest_parser.cc index 417188d5..b43e712 100644 --- a/content/renderer/manifest/manifest_parser.cc +++ b/content/renderer/manifest/manifest_parser.cc
@@ -4,6 +4,8 @@ #include "content/renderer/manifest/manifest_parser.h" +#include <stddef.h> + #include "base/json/json_reader.h" #include "base/strings/nullable_string16.h" #include "base/strings/string_number_conversions.h" @@ -203,9 +205,10 @@ return Manifest::kInvalidOrMissingColor; } - // We do this here because Java does not have an unsigned int32 type so colors - // with high alpha values will be negative. Instead of doing the conversion - // after we pass over to Java, we do it here as it is easier and clearer. + // We do this here because Java does not have an unsigned int32_t type so + // colors with high alpha values will be negative. Instead of doing the + // conversion after we pass over to Java, we do it here as it is easier and + // clearer. int32_t signed_color = reinterpret_cast<int32_t&>(color); return static_cast<int64_t>(signed_color); }
diff --git a/content/renderer/manifest/manifest_parser.h b/content/renderer/manifest/manifest_parser.h index 581f76e..666f86d 100644 --- a/content/renderer/manifest/manifest_parser.h +++ b/content/renderer/manifest/manifest_parser.h
@@ -7,6 +7,7 @@ #include <stdint.h> +#include "base/macros.h" #include "base/strings/nullable_string16.h" #include "base/strings/string_piece.h" #include "content/common/content_export.h"
diff --git a/content/renderer/manifest/manifest_parser_unittest.cc b/content/renderer/manifest/manifest_parser_unittest.cc index d38a082..f98691c 100644 --- a/content/renderer/manifest/manifest_parser_unittest.cc +++ b/content/renderer/manifest/manifest_parser_unittest.cc
@@ -4,6 +4,9 @@ #include "content/renderer/manifest/manifest_parser.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/strings/string_util.h" #include "content/public/common/manifest.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/media/aec_dump_message_filter.h b/content/renderer/media/aec_dump_message_filter.h index 45df9be..0fb0cf930 100644 --- a/content/renderer/media/aec_dump_message_filter.h +++ b/content/renderer/media/aec_dump_message_filter.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_MEDIA_AEC_DUMP_MESSAGE_FILTER_H_ #define CONTENT_RENDERER_MEDIA_AEC_DUMP_MESSAGE_FILTER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "content/renderer/render_thread_impl.h"
diff --git a/content/renderer/media/android/audio_decoder_android.cc b/content/renderer/media/android/audio_decoder_android.cc index 6373ccd..2601fea4 100644 --- a/content/renderer/media/android/audio_decoder_android.cc +++ b/content/renderer/media/android/audio_decoder_android.cc
@@ -7,12 +7,14 @@ #include <errno.h> #include <fcntl.h> #include <limits.h> +#include <stdint.h> #include <sys/mman.h> #include <unistd.h> #include <vector> #include "base/file_descriptor_posix.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "base/posix/eintr_wrapper.h" #include "base/process/process_handle.h" @@ -106,7 +108,7 @@ // basic guide to the WAVE file format. class WAVEDecoder { public: - WAVEDecoder(const uint8* data, size_t data_size); + WAVEDecoder(const uint8_t* data, size_t data_size); ~WAVEDecoder(); // Try to decode the data as a WAVE file. If the data is a supported
diff --git a/content/renderer/media/android/audio_decoder_android.h b/content/renderer/media/android/audio_decoder_android.h index 983e8b4..3f4c45b 100644 --- a/content/renderer/media/android/audio_decoder_android.h +++ b/content/renderer/media/android/audio_decoder_android.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_MEDIA_ANDROID_AUDIO_DECODER_ANDROID_H_ #define CONTENT_RENDERER_MEDIA_ANDROID_AUDIO_DECODER_ANDROID_H_ +#include <stddef.h> + #include "content/child/thread_safe_sender.h" namespace blink {
diff --git a/content/renderer/media/android/media_info_loader.h b/content/renderer/media/android/media_info_loader.h index 81d8484b..d09ac13 100644 --- a/content/renderer/media/android/media_info_loader.h +++ b/content/renderer/media/android/media_info_loader.h
@@ -5,9 +5,12 @@ #ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_INFO_LOADER_H_ #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_INFO_LOADER_H_ +#include <stdint.h> + #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "content/common/content_export.h"
diff --git a/content/renderer/media/android/media_info_loader_unittest.cc b/content/renderer/media/android/media_info_loader_unittest.cc index c5fc8bd9..8438924 100644 --- a/content/renderer/media/android/media_info_loader_unittest.cc +++ b/content/renderer/media/android/media_info_loader_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "content/renderer/media/android/media_info_loader.h" #include "content/test/mock_webframeclient.h"
diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc index 1f45238a..8b23408 100644 --- a/content/renderer/media/android/media_source_delegate.cc +++ b/content/renderer/media/android/media_source_delegate.cc
@@ -35,7 +35,7 @@ // 4: approximately 64ms of content in 60 fps movies. const size_t kAccessUnitSizeForMediaSource = 4; -const uint8 kVorbisPadding[] = { 0xff, 0xff, 0xff, 0xff }; +const uint8_t kVorbisPadding[] = {0xff, 0xff, 0xff, 0xff}; } // namespace @@ -668,7 +668,7 @@ void MediaSourceDelegate::OnEncryptedMediaInitData( media::EmeInitDataType init_data_type, - const std::vector<uint8>& init_data) { + const std::vector<uint8_t>& init_data) { DCHECK(main_task_runner_->BelongsToCurrentThread()); if (encrypted_media_init_data_cb_.is_null()) return;
diff --git a/content/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h index ee5e1a4..9571d5a7 100644 --- a/content/renderer/media/android/media_source_delegate.h +++ b/content/renderer/media/android/media_source_delegate.h
@@ -5,10 +5,14 @@ #ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -139,7 +143,7 @@ void OnDemuxerOpened(); void OnEncryptedMediaInitData(media::EmeInitDataType init_data_type, - const std::vector<uint8>& init_data); + const std::vector<uint8_t>& init_data); void NotifyDemuxerReady(); // Stops and clears objects on the media thread.
diff --git a/content/renderer/media/android/renderer_demuxer_android.h b/content/renderer/media/android/renderer_demuxer_android.h index 29469ede..986b481 100644 --- a/content/renderer/media/android/renderer_demuxer_android.h +++ b/content/renderer/media/android/renderer_demuxer_android.h
@@ -7,6 +7,7 @@ #include "base/atomic_sequence_num.h" #include "base/id_map.h" +#include "base/macros.h" #include "ipc/message_filter.h" #include "media/base/android/demuxer_stream_player_params.h"
diff --git a/content/renderer/media/android/renderer_media_player_manager.h b/content/renderer/media/android/renderer_media_player_manager.h index 5e754bc..94cb9fd 100644 --- a/content/renderer/media/android/renderer_media_player_manager.h +++ b/content/renderer/media/android/renderer_media_player_manager.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/time/time.h" #include "content/common/media/media_player_messages_enums_android.h" #include "content/public/renderer/render_frame_observer.h"
diff --git a/content/renderer/media/android/stream_texture_factory.h b/content/renderer/media/android/stream_texture_factory.h index ae2ac3a..87977cf 100644 --- a/content/renderer/media/android/stream_texture_factory.h +++ b/content/renderer/media/android/stream_texture_factory.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_ #define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_H_ +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" @@ -29,7 +31,7 @@ // Initialize and bind to the loop, which becomes the thread that // a connected client will receive callbacks on. This can be called // on any thread, but must be called with the same loop every time. - virtual void BindToLoop(int32 stream_id, + virtual void BindToLoop(int32_t stream_id, cc::VideoFrameProvider::Client* client, scoped_refptr<base::SingleThreadTaskRunner> loop) = 0; @@ -60,7 +62,9 @@ // object for the given stream_id. After the the surface is created, // it will be passed back to the WebMediaPlayerAndroid object identified by // the player_id. - virtual void EstablishPeer(int32 stream_id, int player_id, int frame_id) = 0; + virtual void EstablishPeer(int32_t stream_id, + int player_id, + int frame_id) = 0; // Creates a StreamTexture and returns its id. Sets |*texture_id| to the // client-side id of the StreamTexture. The texture is produced into @@ -70,7 +74,7 @@ gpu::Mailbox* texture_mailbox) = 0; // Set the streamTexture size for the given stream Id. - virtual void SetStreamTextureSize(int32 texture_id, + virtual void SetStreamTextureSize(int32_t texture_id, const gfx::Size& size) = 0; virtual gpu::gles2::GLES2Interface* ContextGL() = 0;
diff --git a/content/renderer/media/android/stream_texture_factory_impl.cc b/content/renderer/media/android/stream_texture_factory_impl.cc index 740fed3c..945442e 100644 --- a/content/renderer/media/android/stream_texture_factory_impl.cc +++ b/content/renderer/media/android/stream_texture_factory_impl.cc
@@ -4,6 +4,7 @@ #include "content/renderer/media/android/stream_texture_factory_impl.h" +#include "base/macros.h" #include "cc/output/context_provider.h" #include "content/common/gpu/client/context_provider_command_buffer.h" #include "content/common/gpu/client/gpu_channel_host.h" @@ -23,7 +24,7 @@ ~StreamTextureProxyImpl() override; // StreamTextureProxy implementation: - void BindToLoop(int32 stream_id, + void BindToLoop(int32_t stream_id, cc::VideoFrameProvider::Client* client, scoped_refptr<base::SingleThreadTaskRunner> loop) override; void Release() override; @@ -33,7 +34,7 @@ void OnMatrixChanged(const float matrix[16]) override; private: - void BindOnThread(int32 stream_id); + void BindOnThread(int32_t stream_id); const scoped_ptr<StreamTextureHost> host_; @@ -67,7 +68,7 @@ } void StreamTextureProxyImpl::BindToLoop( - int32 stream_id, + int32_t stream_id, cc::VideoFrameProvider::Client* client, scoped_refptr<base::SingleThreadTaskRunner> loop) { DCHECK(loop.get()); @@ -91,7 +92,7 @@ stream_id)); } -void StreamTextureProxyImpl::BindOnThread(int32 stream_id) { +void StreamTextureProxyImpl::BindOnThread(int32_t stream_id) { host_->BindToCurrentThread(stream_id, this); } @@ -131,7 +132,7 @@ return new StreamTextureProxyImpl(host); } -void StreamTextureFactoryImpl::EstablishPeer(int32 stream_id, +void StreamTextureFactoryImpl::EstablishPeer(int32_t stream_id, int player_id, int frame_id) { DCHECK(channel_.get()); @@ -155,7 +156,7 @@ return stream_id; } -void StreamTextureFactoryImpl::SetStreamTextureSize(int32 stream_id, +void StreamTextureFactoryImpl::SetStreamTextureSize(int32_t stream_id, const gfx::Size& size) { channel_->Send(new GpuStreamTextureMsg_SetSize(stream_id, size)); }
diff --git a/content/renderer/media/android/stream_texture_factory_impl.h b/content/renderer/media/android/stream_texture_factory_impl.h index f39ba49..648f70fb 100644 --- a/content/renderer/media/android/stream_texture_factory_impl.h +++ b/content/renderer/media/android/stream_texture_factory_impl.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_IMPL_H_ #define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_IMPL_H_ +#include <stdint.h> + +#include "base/macros.h" #include "content/renderer/media/android/stream_texture_factory.h" namespace cc { @@ -30,11 +33,11 @@ // StreamTextureFactory implementation. StreamTextureProxy* CreateProxy() override; - void EstablishPeer(int32 stream_id, int player_id, int frame_id) override; + void EstablishPeer(int32_t stream_id, int player_id, int frame_id) override; unsigned CreateStreamTexture(unsigned texture_target, unsigned* texture_id, gpu::Mailbox* texture_mailbox) override; - void SetStreamTextureSize(int32 texture_id, const gfx::Size& size) override; + void SetStreamTextureSize(int32_t texture_id, const gfx::Size& size) override; gpu::gles2::GLES2Interface* ContextGL() override; void AddObserver(StreamTextureFactoryContextObserver* obs) override; void RemoveObserver(StreamTextureFactoryContextObserver* obs) override;
diff --git a/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc b/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc index 116fc011..44ae072b 100644 --- a/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc +++ b/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/process/process_handle.h" #include "base/single_thread_task_runner.h" @@ -34,13 +35,13 @@ ~StreamTextureProxyImpl() override; // StreamTextureProxy implementation: - void BindToLoop(int32 stream_id, + void BindToLoop(int32_t stream_id, cc::VideoFrameProvider::Client* client, scoped_refptr<base::SingleThreadTaskRunner> loop) override; void Release() override; private: - void BindOnThread(int32 stream_id); + void BindOnThread(int32_t stream_id); void OnFrameAvailable(); // Protects access to |client_| and |loop_|. @@ -84,7 +85,7 @@ } void StreamTextureProxyImpl::BindToLoop( - int32 stream_id, + int32_t stream_id, cc::VideoFrameProvider::Client* client, scoped_refptr<base::SingleThreadTaskRunner> loop) { DCHECK(loop.get()); @@ -108,7 +109,7 @@ stream_id)); } -void StreamTextureProxyImpl::BindOnThread(int32 stream_id) { +void StreamTextureProxyImpl::BindOnThread(int32_t stream_id) { surface_texture_ = context_provider_->GetSurfaceTexture(stream_id); if (!surface_texture_.get()) { LOG(ERROR) << "Failed to get SurfaceTexture for stream."; @@ -178,7 +179,7 @@ return new StreamTextureProxyImpl(context_provider_.get()); } -void StreamTextureFactorySynchronousImpl::EstablishPeer(int32 stream_id, +void StreamTextureFactorySynchronousImpl::EstablishPeer(int32_t stream_id, int player_id, int frame_id) { DCHECK(context_provider_.get()); @@ -210,7 +211,7 @@ } void StreamTextureFactorySynchronousImpl::SetStreamTextureSize( - int32 stream_id, + int32_t stream_id, const gfx::Size& size) {} gpu::gles2::GLES2Interface* StreamTextureFactorySynchronousImpl::ContextGL() {
diff --git a/content/renderer/media/android/stream_texture_factory_synchronous_impl.h b/content/renderer/media/android/stream_texture_factory_synchronous_impl.h index 6f1da28..cca38a8 100644 --- a/content/renderer/media/android/stream_texture_factory_synchronous_impl.h +++ b/content/renderer/media/android/stream_texture_factory_synchronous_impl.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_SYNCHRONOUS_IMPL_H_ #define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_SYNCHRONOUS_IMPL_H_ +#include <stdint.h> + #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "content/renderer/media/android/stream_texture_factory.h" @@ -28,9 +31,9 @@ class ContextProvider : public base::RefCountedThreadSafe<ContextProvider> { public: virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture( - uint32 stream_id) = 0; + uint32_t stream_id) = 0; - virtual uint32 CreateStreamTexture(uint32 texture_id) = 0; + virtual uint32_t CreateStreamTexture(uint32_t texture_id) = 0; virtual gpu::gles2::GLES2Interface* ContextGL() = 0; @@ -50,11 +53,11 @@ int frame_id); StreamTextureProxy* CreateProxy() override; - void EstablishPeer(int32 stream_id, int player_id, int frame_id) override; + void EstablishPeer(int32_t stream_id, int player_id, int frame_id) override; unsigned CreateStreamTexture(unsigned texture_target, unsigned* texture_id, gpu::Mailbox* texture_mailbox) override; - void SetStreamTextureSize(int32 stream_id, const gfx::Size& size) override; + void SetStreamTextureSize(int32_t stream_id, const gfx::Size& size) override; gpu::gles2::GLES2Interface* ContextGL() override; void AddObserver(StreamTextureFactoryContextObserver* obs) override; void RemoveObserver(StreamTextureFactoryContextObserver* obs) override;
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc index 93f1826..4a1f4f74 100644 --- a/content/renderer/media/android/webmediaplayer_android.cc +++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/android/webmediaplayer_android.h" +#include <stddef.h> + #include <limits> #include "base/android/build_info.h" @@ -66,7 +68,7 @@ #include "third_party/skia/include/gpu/SkGrPixelRef.h" #include "ui/gfx/image/image.h" -static const uint32 kGLTextureExternalOES = 0x8D65; +static const uint32_t kGLTextureExternalOES = 0x8D65; static const int kSDKVersionToSupportSecurityOriginCheck = 20; using blink::WebMediaPlayer; @@ -97,7 +99,7 @@ // File-static function is to allow it to run even after WMPA is deleted. void OnReleaseTexture( const scoped_refptr<content::StreamTextureFactory>& factories, - uint32 texture_id, + uint32_t texture_id, const gpu::SyncToken& sync_token) { GLES2Interface* gl = factories->ContextGL(); gl->WaitSyncTokenCHROMIUM(sync_token.GetConstData()); @@ -704,9 +706,8 @@ // Ensure the target of texture is set before copyTextureCHROMIUM, otherwise // an invalid texture target may be used for copy texture. - uint32 src_texture = - web_graphics_context->createAndConsumeTextureCHROMIUM( - mailbox_holder.texture_target, mailbox_holder.mailbox.name); + uint32_t src_texture = web_graphics_context->createAndConsumeTextureCHROMIUM( + mailbox_holder.texture_target, mailbox_holder.mailbox.name); // Application itself needs to take care of setting the right flip_y // value down to get the expected result. @@ -1765,7 +1766,7 @@ void WebMediaPlayerAndroid::OnKeyError(const std::string& session_id, media::MediaKeys::KeyError error_code, - uint32 system_code) { + uint32_t system_code) { EmeUMAHistogramEnumeration(current_key_system_, "KeyError", error_code, media::MediaKeys::kMaxKeyError); @@ -1786,7 +1787,7 @@ } void WebMediaPlayerAndroid::OnKeyMessage(const std::string& session_id, - const std::vector<uint8>& message, + const std::vector<uint8_t>& message, const GURL& destination_url) { DCHECK(destination_url.is_empty() || destination_url.is_valid()); @@ -1803,7 +1804,7 @@ void WebMediaPlayerAndroid::OnEncryptedMediaInitData( media::EmeInitDataType init_data_type, - const std::vector<uint8>& init_data) { + const std::vector<uint8_t>& init_data) { DCHECK(main_thread_checker_.CalledOnValidThread()); // Do not fire NeedKey event if encrypted media is not enabled.
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h index 5b41f2c8..51ba4af 100644 --- a/content/renderer/media/android/webmediaplayer_android.h +++ b/content/renderer/media/android/webmediaplayer_android.h
@@ -5,10 +5,12 @@ #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -253,15 +255,15 @@ void OnKeyAdded(const std::string& session_id); void OnKeyError(const std::string& session_id, media::MediaKeys::KeyError error_code, - uint32 system_code); + uint32_t system_code); void OnKeyMessage(const std::string& session_id, - const std::vector<uint8>& message, + const std::vector<uint8_t>& message, const GURL& destination_url); void OnMediaSourceOpened(blink::WebMediaSource* web_media_source); void OnEncryptedMediaInitData(media::EmeInitDataType init_data_type, - const std::vector<uint8>& init_data); + const std::vector<uint8_t>& init_data); // Called when a decoder detects that the key needed to decrypt the stream // is not available.
diff --git a/content/renderer/media/audio_decoder.cc b/content/renderer/media/audio_decoder.cc index b839744c..d6978fe5 100644 --- a/content/renderer/media/audio_decoder.cc +++ b/content/renderer/media/audio_decoder.cc
@@ -4,9 +4,10 @@ #include "content/renderer/media/audio_decoder.h" +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/strings/string_util.h" #include "base/time/time.h" #include "media/base/audio_bus.h" @@ -33,7 +34,7 @@ #if !defined(MEDIA_DISABLE_FFMPEG) // Uses the FFmpeg library for audio file reading. - InMemoryUrlProtocol url_protocol(reinterpret_cast<const uint8*>(data), + InMemoryUrlProtocol url_protocol(reinterpret_cast<const uint8_t*>(data), data_size, false); AudioFileReader reader(&url_protocol);
diff --git a/content/renderer/media/audio_decoder.h b/content/renderer/media/audio_decoder.h index 454a80a1..aebe89fd 100644 --- a/content/renderer/media/audio_decoder.h +++ b/content/renderer/media/audio_decoder.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_MEDIA_AUDIO_DECODER_H_ #define CONTENT_RENDERER_MEDIA_AUDIO_DECODER_H_ -#include "base/basictypes.h" +#include <stddef.h> namespace blink { class WebAudioBus; }
diff --git a/content/renderer/media/audio_device_factory.h b/content/renderer/media/audio_device_factory.h index e3f26310..1d6a53ad 100644 --- a/content/renderer/media/audio_device_factory.h +++ b/content/renderer/media/audio_device_factory.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h"
diff --git a/content/renderer/media/audio_input_message_filter.cc b/content/renderer/media/audio_input_message_filter.cc index 9c40772..09a4174 100644 --- a/content/renderer/media/audio_input_message_filter.cc +++ b/content/renderer/media/audio_input_message_filter.cc
@@ -39,7 +39,7 @@ int session_id, const media::AudioParameters& params, bool automatic_gain_control, - uint32 total_segments) override; + uint32_t total_segments) override; void RecordStream() override; void SetVolume(double volume) override; void CloseStream() override; @@ -126,8 +126,8 @@ int stream_id, base::SharedMemoryHandle handle, base::SyncSocket::TransitDescriptor socket_descriptor, - uint32 length, - uint32 total_segments) { + uint32_t length, + uint32_t total_segments) { DCHECK(io_task_runner_->BelongsToCurrentThread()); LogMessage(stream_id, "OnStreamCreated"); @@ -190,7 +190,7 @@ int session_id, const media::AudioParameters& params, bool automatic_gain_control, - uint32 total_segments) { + uint32_t total_segments) { DCHECK(filter_->io_task_runner_->BelongsToCurrentThread()); DCHECK(delegate);
diff --git a/content/renderer/media/audio_input_message_filter.h b/content/renderer/media/audio_input_message_filter.h index c4fd183..30a8d239 100644 --- a/content/renderer/media/audio_input_message_filter.h +++ b/content/renderer/media/audio_input_message_filter.h
@@ -5,10 +5,14 @@ #ifndef CONTENT_RENDERER_MEDIA_AUDIO_INPUT_MESSAGE_FILTER_H_ #define CONTENT_RENDERER_MEDIA_AUDIO_INPUT_MESSAGE_FILTER_H_ +#include <stdint.h> + #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "base/sync_socket.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "ipc/message_filter.h" #include "media/audio/audio_input_ipc.h" @@ -66,8 +70,8 @@ #else base::FileDescriptor socket_descriptor, #endif - uint32 length, - uint32 total_segments); + uint32_t length, + uint32_t total_segments); // Notification of volume property of an audio input stream. void OnStreamVolume(int stream_id, double volume);
diff --git a/content/renderer/media/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc index b3e4b2e..7ecf9b16 100644 --- a/content/renderer/media/audio_message_filter.cc +++ b/content/renderer/media/audio_message_filter.cc
@@ -200,7 +200,7 @@ int stream_id, base::SharedMemoryHandle handle, base::SyncSocket::TransitDescriptor socket_descriptor, - uint32 length) { + uint32_t length) { DCHECK(io_task_runner_->BelongsToCurrentThread()); WebRtcLogMessage(base::StringPrintf(
diff --git a/content/renderer/media/audio_message_filter.h b/content/renderer/media/audio_message_filter.h index 93ffc16..dcdc7cd 100644 --- a/content/renderer/media/audio_message_filter.h +++ b/content/renderer/media/audio_message_filter.h
@@ -5,8 +5,11 @@ #ifndef CONTENT_RENDERER_MEDIA_AUDIO_MESSAGE_FILTER_H_ #define CONTENT_RENDERER_MEDIA_AUDIO_MESSAGE_FILTER_H_ +#include <stdint.h> + #include "base/gtest_prod_util.h" #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "base/sync_socket.h" @@ -73,9 +76,10 @@ const media::AudioParameters& output_params); // Received when browser process has created an audio output stream. - void OnStreamCreated(int stream_id, base::SharedMemoryHandle handle, + void OnStreamCreated(int stream_id, + base::SharedMemoryHandle handle, base::SyncSocket::TransitDescriptor socket_descriptor, - uint32 length); + uint32_t length); // Received when internal state of browser process' audio output device has // changed.
diff --git a/content/renderer/media/audio_message_filter_unittest.cc b/content/renderer/media/audio_message_filter_unittest.cc index c82943e..46302a4 100644 --- a/content/renderer/media/audio_message_filter_unittest.cc +++ b/content/renderer/media/audio_message_filter_unittest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "content/common/media/audio_messages.h" #include "content/renderer/media/audio_message_filter.h" #include "media/audio/audio_output_ipc.h" @@ -68,7 +71,7 @@ bool created_received() { return created_received_; } base::SharedMemoryHandle handle() { return handle_; } - uint32 length() { return length_; } + uint32_t length() { return length_; } private: bool state_changed_received_; @@ -125,7 +128,7 @@ // AudioMsg_NotifyStreamCreated base::SyncSocket::TransitDescriptor socket_descriptor; - const uint32 kLength = 1024; + const uint32_t kLength = 1024; EXPECT_FALSE(delegate.created_received()); filter->OnMessageReceived(AudioMsg_NotifyStreamCreated( kStreamId, base::SharedMemory::NULLHandle(), socket_descriptor, kLength));
diff --git a/content/renderer/media/audio_renderer_mixer_manager.cc b/content/renderer/media/audio_renderer_mixer_manager.cc index 73d984a..95ca916 100644 --- a/content/renderer/media/audio_renderer_mixer_manager.cc +++ b/content/renderer/media/audio_renderer_mixer_manager.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "build/build_config.h" #include "content/renderer/media/audio_device_factory.h" #include "media/audio/audio_output_device.h" #include "media/base/audio_hardware_config.h"
diff --git a/content/renderer/media/audio_renderer_mixer_manager.h b/content/renderer/media/audio_renderer_mixer_manager.h index 9256013..fa8f9620 100644 --- a/content/renderer/media/audio_renderer_mixer_manager.h +++ b/content/renderer/media/audio_renderer_mixer_manager.h
@@ -9,6 +9,7 @@ #include <string> #include <utility> +#include "base/macros.h" #include "base/synchronization/lock.h" #include "content/common/content_export.h" #include "media/audio/audio_parameters.h"
diff --git a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc index bfc0f9f..b1371b22 100644 --- a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc +++ b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "content/renderer/media/audio_renderer_mixer_manager.h"
diff --git a/content/renderer/media/audio_repetition_detector.h b/content/renderer/media/audio_repetition_detector.h index 03d7eae..ce61dca 100644 --- a/content/renderer/media/audio_repetition_detector.h +++ b/content/renderer/media/audio_repetition_detector.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_MEDIA_AUDIO_REPETITION_DETECTOR_H_ #define CONTENT_RENDERER_MEDIA_AUDIO_REPETITION_DETECTOR_H_ +#include <stddef.h> + #include <vector> #include "base/callback.h"
diff --git a/content/renderer/media/audio_repetition_detector_unittest.cc b/content/renderer/media/audio_repetition_detector_unittest.cc index b9b9a54..487a7a0 100644 --- a/content/renderer/media/audio_repetition_detector_unittest.cc +++ b/content/renderer/media/audio_repetition_detector_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <map> #include "base/bind.h"
diff --git a/content/renderer/media/audio_track_recorder.cc b/content/renderer/media/audio_track_recorder.cc index dc624ac..99e3b5b 100644 --- a/content/renderer/media/audio_track_recorder.cc +++ b/content/renderer/media/audio_track_recorder.cc
@@ -4,7 +4,10 @@ #include "content/renderer/media/audio_track_recorder.h" +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/stl_util.h" #include "media/audio/audio_parameters.h" #include "media/base/audio_bus.h" @@ -230,7 +233,7 @@ out->resize(OPUS_MAX_PAYLOAD_SIZE); const opus_int32 result = opus_encode_float( opus_encoder_, buffer_.get(), frames_per_buffer_, - reinterpret_cast<uint8*>(string_as_array(out)), OPUS_MAX_PAYLOAD_SIZE); + reinterpret_cast<uint8_t*>(string_as_array(out)), OPUS_MAX_PAYLOAD_SIZE); if (result > 1) { // TODO(ajose): Investigate improving this. http://crbug.com/547918 out->resize(result);
diff --git a/content/renderer/media/audio_track_recorder_unittest.cc b/content/renderer/media/audio_track_recorder_unittest.cc index f000ea1..c28e008 100644 --- a/content/renderer/media/audio_track_recorder_unittest.cc +++ b/content/renderer/media/audio_track_recorder_unittest.cc
@@ -4,6 +4,9 @@ #include "content/renderer/media/audio_track_recorder.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" @@ -160,7 +163,7 @@ 1000, opus_decode_float( opus_decoder_, - reinterpret_cast<uint8*>(string_as_array(encoded_data.get())), + reinterpret_cast<uint8_t*>(string_as_array(encoded_data.get())), encoded_data->size(), buffer_.get(), max_frames_per_buffer_, 0)); DoOnEncodedAudio(params, *encoded_data, timestamp);
diff --git a/content/renderer/media/canvas_capture_handler.cc b/content/renderer/media/canvas_capture_handler.cc index 7e1e8e7..0f48508 100644 --- a/content/renderer/media/canvas_capture_handler.cc +++ b/content/renderer/media/canvas_capture_handler.cc
@@ -6,6 +6,7 @@ #include "base/base64.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/rand_util.h" #include "base/strings/utf_string_conversions.h" #include "content/public/renderer/render_thread.h"
diff --git a/content/renderer/media/canvas_capture_handler.h b/content/renderer/media/canvas_capture_handler.h index b2a5cc2e..adec2624 100644 --- a/content/renderer/media/canvas_capture_handler.h +++ b/content/renderer/media/canvas_capture_handler.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_MEDIA_CANVAS_CAPTURE_HANDLER_H_ #define CONTENT_RENDERER_MEDIA_CANVAS_CAPTURE_HANDLER_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" @@ -73,7 +76,7 @@ const blink::WebSize size_; gfx::Size last_size; - std::vector<uint8> temp_data_; + std::vector<uint8_t> temp_data_; size_t row_bytes_; SkImageInfo image_info_; media::VideoFramePool frame_pool_;
diff --git a/content/renderer/media/cdm/ppapi_decryptor.h b/content/renderer/media/cdm/ppapi_decryptor.h index 29a7a35..7aff248 100644 --- a/content/renderer/media/cdm/ppapi_decryptor.h +++ b/content/renderer/media/cdm/ppapi_decryptor.h
@@ -5,10 +5,12 @@ #ifndef CONTENT_RENDERER_MEDIA_CDM_PPAPI_DECRYPTOR_H_ #define CONTENT_RENDERER_MEDIA_CDM_PPAPI_DECRYPTOR_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/renderer/media/cdm/pepper_cdm_wrapper.h"
diff --git a/content/renderer/media/cdm/proxy_media_keys.cc b/content/renderer/media/cdm/proxy_media_keys.cc index 3e4a4bd6..d628c35 100644 --- a/content/renderer/media/cdm/proxy_media_keys.cc +++ b/content/renderer/media/cdm/proxy_media_keys.cc
@@ -6,7 +6,6 @@ #include <vector> -#include "base/basictypes.h" #include "base/logging.h" #include "base/stl_util.h" #include "content/renderer/media/cdm/renderer_cdm_manager.h"
diff --git a/content/renderer/media/cdm/proxy_media_keys.h b/content/renderer/media/cdm/proxy_media_keys.h index 7bfabe4..e809244 100644 --- a/content/renderer/media/cdm/proxy_media_keys.h +++ b/content/renderer/media/cdm/proxy_media_keys.h
@@ -5,13 +5,15 @@ #ifndef CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_ #define CONTENT_RENDERER_MEDIA_CDM_PROXY_MEDIA_KEYS_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" #include "base/containers/scoped_ptr_hash_map.h" +#include "base/macros.h" #include "media/base/cdm_context.h" #include "media/base/cdm_factory.h" #include "media/base/cdm_promise.h"
diff --git a/content/renderer/media/cdm/renderer_cdm_manager.cc b/content/renderer/media/cdm/renderer_cdm_manager.cc index f2f90d5..7c1a866 100644 --- a/content/renderer/media/cdm/renderer_cdm_manager.cc +++ b/content/renderer/media/cdm/renderer_cdm_manager.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/cdm/renderer_cdm_manager.h" +#include <stddef.h> + #include "base/stl_util.h" #include "content/common/media/cdm_messages.h" #include "content/renderer/media/cdm/proxy_media_keys.h" @@ -130,7 +132,7 @@ int cdm_id, const std::string& session_id, media::MediaKeys::MessageType message_type, - const std::vector<uint8>& message, + const std::vector<uint8_t>& message, const GURL& legacy_destination_url) { if (message.size() > kMaxSessionMessageLength) { NOTREACHED(); @@ -155,7 +157,7 @@ int cdm_id, const std::string& session_id, MediaKeys::Exception exception, - uint32 system_code, + uint32_t system_code, const std::string& error_message) { ProxyMediaKeys* media_keys = GetMediaKeys(cdm_id); if (media_keys)
diff --git a/content/renderer/media/cdm/renderer_cdm_manager.h b/content/renderer/media/cdm/renderer_cdm_manager.h index af2772f..e25ce556 100644 --- a/content/renderer/media/cdm/renderer_cdm_manager.h +++ b/content/renderer/media/cdm/renderer_cdm_manager.h
@@ -5,11 +5,13 @@ #ifndef CONTENT_RENDERER_MEDIA_CDM_RENDERER_CDM_MANAGER_H_ #define CONTENT_RENDERER_MEDIA_CDM_RENDERER_CDM_MANAGER_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "content/common/media/cdm_messages_enums.h" #include "content/public/renderer/render_frame_observer.h" #include "media/base/media_keys.h" @@ -42,13 +44,13 @@ bool use_hw_secure_codecs); void SetServerCertificate(int cdm_id, uint32_t promise_id, - const std::vector<uint8>& certificate); + const std::vector<uint8_t>& certificate); void CreateSessionAndGenerateRequest( int cdm_id, uint32_t promise_id, media::MediaKeys::SessionType session_type, CdmHostMsg_CreateSession_InitDataType init_data_type, - const std::vector<uint8>& init_data); + const std::vector<uint8_t>& init_data); void LoadSession(int cdm_id, uint32_t promise_id, media::MediaKeys::SessionType session_type, @@ -56,7 +58,7 @@ void UpdateSession(int cdm_id, uint32_t promise_id, const std::string& session_id, - const std::vector<uint8>& response); + const std::vector<uint8_t>& response); void CloseSession(int cdm_id, uint32_t promise_id, const std::string& session_id); @@ -79,13 +81,13 @@ void OnSessionMessage(int cdm_id, const std::string& session_id, media::MediaKeys::MessageType message_type, - const std::vector<uint8>& message, + const std::vector<uint8_t>& message, const GURL& legacy_destination_url); void OnSessionClosed(int cdm_id, const std::string& session_id); void OnLegacySessionError(int cdm_id, const std::string& session_id, media::MediaKeys::Exception exception, - uint32 system_code, + uint32_t system_code, const std::string& error_message); void OnSessionKeysChange( int cdm_id, @@ -107,7 +109,7 @@ const std::string& error_message); // CDM ID should be unique per renderer frame. - // TODO(xhwang): Use uint32 to prevent undefined overflow behavior. + // TODO(xhwang): Use uint32_t to prevent undefined overflow behavior. int next_cdm_id_; // CDM ID to ProxyMediaKeys mapping.
diff --git a/content/renderer/media/media_permission_dispatcher.h b/content/renderer/media/media_permission_dispatcher.h index 701afe6..7bed6fc 100644 --- a/content/renderer/media/media_permission_dispatcher.h +++ b/content/renderer/media/media_permission_dispatcher.h
@@ -10,8 +10,11 @@ #ifndef CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_DISPATCHER_H_ #define CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_DISPATCHER_H_ +#include <stdint.h> + #include <map> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "content/common/content_export.h"
diff --git a/content/renderer/media/media_permission_dispatcher_impl.h b/content/renderer/media/media_permission_dispatcher_impl.h index 5bb1128b..8aebc89 100644 --- a/content/renderer/media/media_permission_dispatcher_impl.h +++ b/content/renderer/media/media_permission_dispatcher_impl.h
@@ -11,8 +11,11 @@ #ifndef CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_DISPATCHER_IMPL_H_ #define CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_DISPATCHER_IMPL_H_ +#include <stdint.h> + #include <map> +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread_checker.h" #include "content/common/content_export.h"
diff --git a/content/renderer/media/media_permission_dispatcher_proxy.cc b/content/renderer/media/media_permission_dispatcher_proxy.cc index 693e5f0..e883ac9 100644 --- a/content/renderer/media/media_permission_dispatcher_proxy.cc +++ b/content/renderer/media/media_permission_dispatcher_proxy.cc
@@ -4,9 +4,12 @@ #include "content/renderer/media/media_permission_dispatcher_proxy.h" +#include <stdint.h> + #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/thread_task_runner_handle.h" #include "url/gurl.h"
diff --git a/content/renderer/media/media_permission_dispatcher_proxy.h b/content/renderer/media/media_permission_dispatcher_proxy.h index bf6babc..aa931e80 100644 --- a/content/renderer/media/media_permission_dispatcher_proxy.h +++ b/content/renderer/media/media_permission_dispatcher_proxy.h
@@ -9,6 +9,7 @@ #ifndef CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_PROXY_H_ #define CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_PROXY_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" #include "content/common/content_export.h"
diff --git a/content/renderer/media/media_recorder_handler.cc b/content/renderer/media/media_recorder_handler.cc index 8130693..7fc40dc 100644 --- a/content/renderer/media/media_recorder_handler.cc +++ b/content/renderer/media/media_recorder_handler.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_tokenizer.h" #include "base/strings/string_util.h" #include "content/renderer/media/audio_track_recorder.h"
diff --git a/content/renderer/media/media_recorder_handler.h b/content/renderer/media/media_recorder_handler.h index 453923b..cc50c84 100644 --- a/content/renderer/media/media_recorder_handler.h +++ b/content/renderer/media/media_recorder_handler.h
@@ -6,6 +6,7 @@ #define CONTENT_RENDERER_MEDIA_MEDIA_RECORDER_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_piece.h"
diff --git a/content/renderer/media/media_recorder_handler_unittest.cc b/content/renderer/media/media_recorder_handler_unittest.cc index 44d1296..e1aaeab2 100644 --- a/content/renderer/media/media_recorder_handler_unittest.cc +++ b/content/renderer/media/media_recorder_handler_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "content/child/child_process.h"
diff --git a/content/renderer/media/media_stream.h b/content/renderer/media/media_stream.h index 538fd6c..c702366 100644 --- a/content/renderer/media/media_stream.h +++ b/content/renderer/media/media_stream.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "content/common/content_export.h" #include "third_party/WebKit/public/platform/WebMediaStream.h"
diff --git a/content/renderer/media/media_stream_audio_processor.cc b/content/renderer/media/media_stream_audio_processor.cc index 5e4c1c0..40889700 100644 --- a/content/renderer/media/media_stream_audio_processor.cc +++ b/content/renderer/media/media_stream_audio_processor.cc
@@ -4,11 +4,15 @@ #include "content/renderer/media/media_stream_audio_processor.h" +#include <stddef.h> +#include <stdint.h> + #include "base/command_line.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "content/public/common/content_switches.h" #include "content/renderer/media/media_stream_audio_processor_options.h" #include "content/renderer/media/rtc_media_constraints.h" @@ -705,7 +709,7 @@ base::subtle::Atomic32 render_delay_ms = base::subtle::Acquire_Load(&render_delay_ms_); - int64 capture_delay_ms = capture_delay.InMilliseconds(); + int64_t capture_delay_ms = capture_delay.InMilliseconds(); DCHECK_LT(capture_delay_ms, std::numeric_limits<base::subtle::Atomic32>::max()); int total_delay_ms = capture_delay_ms + render_delay_ms;
diff --git a/content/renderer/media/media_stream_audio_processor.h b/content/renderer/media/media_stream_audio_processor.h index f5d5781..dabc42f 100644 --- a/content/renderer/media/media_stream_audio_processor.h +++ b/content/renderer/media/media_stream_audio_processor.h
@@ -8,6 +8,7 @@ #include "base/atomicops.h" #include "base/files/file.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" #include "base/time/time.h"
diff --git a/content/renderer/media/media_stream_audio_processor_options.cc b/content/renderer/media/media_stream_audio_processor_options.cc index 778676e..379f4ca 100644 --- a/content/renderer/media/media_stream_audio_processor_options.cc +++ b/content/renderer/media/media_stream_audio_processor_options.cc
@@ -4,15 +4,19 @@ #include "content/renderer/media/media_stream_audio_processor_options.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "content/common/media/media_stream_options.h" #include "content/renderer/media/media_stream_constraints_util.h" #include "content/renderer/media/media_stream_source.h"
diff --git a/content/renderer/media/media_stream_audio_processor_options.h b/content/renderer/media/media_stream_audio_processor_options.h index cf98b34..6a2048a 100644 --- a/content/renderer/media/media_stream_audio_processor_options.h +++ b/content/renderer/media/media_stream_audio_processor_options.h
@@ -8,6 +8,7 @@ #include <string> #include "base/files/file.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "content/public/common/media_stream_request.h" #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
diff --git a/content/renderer/media/media_stream_audio_processor_unittest.cc b/content/renderer/media/media_stream_audio_processor_unittest.cc index 6008601..a23d03e 100644 --- a/content/renderer/media/media_stream_audio_processor_unittest.cc +++ b/content/renderer/media/media_stream_audio_processor_unittest.cc
@@ -2,14 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/aligned_memory.h" #include "base/path_service.h" #include "base/time/time.h" +#include "build/build_config.h" #include "content/public/common/media_stream_request.h" #include "content/renderer/media/media_stream_audio_processor.h" #include "content/renderer/media/media_stream_audio_processor_options.h" @@ -60,7 +65,7 @@ .Append(FILE_PATH_LITERAL("data")) .Append(FILE_PATH_LITERAL("speech_16b_stereo_48kHz.raw")); DCHECK(base::PathExists(file)); - int64 data_file_size64 = 0; + int64_t data_file_size64 = 0; DCHECK(base::GetFileSize(file, &data_file_size64)); EXPECT_EQ(length, base::ReadFile(file, data, length)); DCHECK(data_file_size64 > length); @@ -88,7 +93,8 @@ const size_t length = packet_size * kNumberOfPacketsForTest; scoped_ptr<char[]> capture_data(new char[length]); ReadDataFromSpeechFile(capture_data.get(), length); - const int16* data_ptr = reinterpret_cast<const int16*>(capture_data.get()); + const int16_t* data_ptr = + reinterpret_cast<const int16_t*>(capture_data.get()); scoped_ptr<media::AudioBus> data_bus = media::AudioBus::Create( params.channels(), params.frames_per_buffer());
diff --git a/content/renderer/media/media_stream_audio_sink_owner.h b/content/renderer/media/media_stream_audio_sink_owner.h index f9fddf28..1cc98b9 100644 --- a/content/renderer/media/media_stream_audio_sink_owner.h +++ b/content/renderer/media/media_stream_audio_sink_owner.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/synchronization/lock.h" #include "content/renderer/media/media_stream_audio_track_sink.h"
diff --git a/content/renderer/media/media_stream_audio_source.h b/content/renderer/media/media_stream_audio_source.h index 7825226..e332b83e 100644 --- a/content/renderer/media/media_stream_audio_source.h +++ b/content/renderer/media/media_stream_audio_source.h
@@ -6,6 +6,7 @@ #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SOURCE_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "content/renderer/media/media_stream_source.h" #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
diff --git a/content/renderer/media/media_stream_audio_track.h b/content/renderer/media/media_stream_audio_track.h index 087c9d70..2175b4e 100644 --- a/content/renderer/media/media_stream_audio_track.h +++ b/content/renderer/media/media_stream_audio_track.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_TRACK_H_ #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_TRACK_H_ +#include "base/macros.h" #include "content/renderer/media/media_stream_track.h" namespace webrtc {
diff --git a/content/renderer/media/media_stream_center.cc b/content/renderer/media/media_stream_center.cc index 68e24992..ad7f8ddf 100644 --- a/content/renderer/media/media_stream_center.cc +++ b/content/renderer/media/media_stream_center.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/media_stream_center.h" +#include <stddef.h> + #include <string> #include "base/command_line.h"
diff --git a/content/renderer/media/media_stream_center.h b/content/renderer/media/media_stream_center.h index d3627557..2b1253b 100644 --- a/content/renderer/media/media_stream_center.h +++ b/content/renderer/media/media_stream_center.h
@@ -7,8 +7,8 @@ #include <map> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "content/common/media/media_stream_options.h" #include "content/public/renderer/render_process_observer.h"
diff --git a/content/renderer/media/media_stream_dispatcher.cc b/content/renderer/media/media_stream_dispatcher.cc index 86f508f..274c80a 100644 --- a/content/renderer/media/media_stream_dispatcher.cc +++ b/content/renderer/media/media_stream_dispatcher.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/media_stream_dispatcher.h" +#include <stddef.h> + #include "base/logging.h" #include "content/common/media/media_stream_messages.h" #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h index d451ccc..153746081 100644 --- a/content/renderer/media/media_stream_dispatcher.h +++ b/content/renderer/media/media_stream_dispatcher.h
@@ -9,8 +9,8 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/content/renderer/media/media_stream_dispatcher_unittest.cc b/content/renderer/media/media_stream_dispatcher_unittest.cc index d4dbec6..bc82587 100644 --- a/content/renderer/media/media_stream_dispatcher_unittest.cc +++ b/content/renderer/media/media_stream_dispatcher_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <string> #include "base/memory/ref_counted.h"
diff --git a/content/renderer/media/media_stream_renderer_factory_impl.h b/content/renderer/media/media_stream_renderer_factory_impl.h index a346227..75f15b18 100644 --- a/content/renderer/media/media_stream_renderer_factory_impl.h +++ b/content/renderer/media/media_stream_renderer_factory_impl.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_RENDERER_FACTORY_IMPL_H_ #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_RENDERER_FACTORY_IMPL_H_ +#include "base/macros.h" #include "content/public/renderer/media_stream_renderer_factory.h" namespace content {
diff --git a/content/renderer/media/media_stream_source.h b/content/renderer/media/media_stream_source.h index 5884a03..940efcc 100644 --- a/content/renderer/media/media_stream_source.h +++ b/content/renderer/media/media_stream_source.h
@@ -8,6 +8,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "content/common/media/media_stream_options.h" #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
diff --git a/content/renderer/media/media_stream_track.h b/content/renderer/media/media_stream_track.h index 9499511..d898e1b 100644 --- a/content/renderer/media/media_stream_track.h +++ b/content/renderer/media/media_stream_track.h
@@ -6,6 +6,7 @@ #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_TRACK_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "content/common/content_export.h" #include "media/audio/audio_parameters.h"
diff --git a/content/renderer/media/media_stream_video_capturer_source.cc b/content/renderer/media/media_stream_video_capturer_source.cc index d5e7f40..ca80b63 100644 --- a/content/renderer/media/media_stream_video_capturer_source.cc +++ b/content/renderer/media/media_stream_video_capturer_source.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "content/public/common/media_stream_request.h" #include "content/renderer/media/media_stream_constraints_util.h"
diff --git a/content/renderer/media/media_stream_video_capturer_source.h b/content/renderer/media/media_stream_video_capturer_source.h index 699c486..a2f48916 100644 --- a/content/renderer/media/media_stream_video_capturer_source.h +++ b/content/renderer/media/media_stream_video_capturer_source.h
@@ -6,6 +6,7 @@ #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_CAPTURER_SOURCE_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "content/common/media/video_capture.h"
diff --git a/content/renderer/media/media_stream_video_renderer_sink.h b/content/renderer/media/media_stream_video_renderer_sink.h index c0ec1ff5..ad3c9eb 100644 --- a/content/renderer/media/media_stream_video_renderer_sink.h +++ b/content/renderer/media/media_stream_video_renderer_sink.h
@@ -6,6 +6,7 @@ #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "content/common/media/video_capture.h"
diff --git a/content/renderer/media/media_stream_video_renderer_sink_unittest.cc b/content/renderer/media/media_stream_video_renderer_sink_unittest.cc index d04c141..9b3b35a 100644 --- a/content/renderer/media/media_stream_video_renderer_sink_unittest.cc +++ b/content/renderer/media/media_stream_video_renderer_sink_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "content/child/child_process.h"
diff --git a/content/renderer/media/media_stream_video_source.cc b/content/renderer/media/media_stream_video_source.cc index 1274ecf7..38f19b0 100644 --- a/content/renderer/media/media_stream_video_source.cc +++ b/content/renderer/media/media_stream_video_source.cc
@@ -9,6 +9,7 @@ #include <string> #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/trace_event/trace_event.h" #include "content/child/child_process.h"
diff --git a/content/renderer/media/media_stream_video_source.h b/content/renderer/media/media_stream_video_source.h index 50b4c84..cd403750 100644 --- a/content/renderer/media/media_stream_video_source.h +++ b/content/renderer/media/media_stream_video_source.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/threading/non_thread_safe.h"
diff --git a/content/renderer/media/media_stream_video_track.cc b/content/renderer/media/media_stream_video_track.cc index 15eeb83..bbb88f3 100644 --- a/content/renderer/media/media_stream_video_track.cc +++ b/content/renderer/media/media_stream_video_track.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h"
diff --git a/content/renderer/media/media_stream_video_track.h b/content/renderer/media/media_stream_video_track.h index 353ed2af..bfcf419f 100644 --- a/content/renderer/media/media_stream_video_track.h +++ b/content/renderer/media/media_stream_video_track.h
@@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "content/common/content_export.h" #include "content/public/renderer/media_stream_video_sink.h"
diff --git a/content/renderer/media/media_stream_video_track_unittest.cc b/content/renderer/media/media_stream_video_track_unittest.cc index 0e9e0d14..9959efeb 100644 --- a/content/renderer/media/media_stream_video_track_unittest.cc +++ b/content/renderer/media/media_stream_video_track_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" @@ -19,8 +21,8 @@ namespace content { -const uint8 kBlackValue = 0x00; -const uint8 kColorValue = 0xAB; +const uint8_t kBlackValue = 0x00; +const uint8_t kColorValue = 0xAB; ACTION_P(RunClosure, closure) { closure.Run();
diff --git a/content/renderer/media/midi_dispatcher.h b/content/renderer/media/midi_dispatcher.h index 582e0931..ab85d770 100644 --- a/content/renderer/media/midi_dispatcher.h +++ b/content/renderer/media/midi_dispatcher.h
@@ -6,6 +6,7 @@ #define CONTENT_RENDERER_MEDIA_MIDI_DISPATCHER_H_ #include "base/id_map.h" +#include "base/macros.h" #include "content/common/permission_service.mojom.h" #include "content/public/renderer/render_frame_observer.h" #include "third_party/WebKit/public/web/WebMIDIClient.h"
diff --git a/content/renderer/media/midi_message_filter.cc b/content/renderer/media/midi_message_filter.cc index 82bdc70..7bc0a54 100644 --- a/content/renderer/media/midi_message_filter.cc +++ b/content/renderer/media/midi_message_filter.cc
@@ -65,8 +65,8 @@ } } -void MidiMessageFilter::SendMidiData(uint32 port, - const uint8* data, +void MidiMessageFilter::SendMidiData(uint32_t port, + const uint8_t* data, size_t length, double timestamp) { DCHECK(main_task_runner_->BelongsToCurrentThread()); @@ -77,7 +77,7 @@ } unacknowledged_bytes_sent_ += length; - std::vector<uint8> v(data, data + length); + std::vector<uint8_t> v(data, data + length); io_task_runner_->PostTask( FROM_HERE, base::Bind(&MidiMessageFilter::SendMidiDataOnIOThread, this, port, v, timestamp)); @@ -89,8 +89,8 @@ Send(new MidiHostMsg_StartSession()); } -void MidiMessageFilter::SendMidiDataOnIOThread(uint32 port, - const std::vector<uint8>& data, +void MidiMessageFilter::SendMidiDataOnIOThread(uint32_t port, + const std::vector<uint8_t>& data, double timestamp) { DCHECK(io_task_runner_->BelongsToCurrentThread()); Send(new MidiHostMsg_SendData(port, data, timestamp)); @@ -166,7 +166,7 @@ base::Bind(&MidiMessageFilter::HandleAddOutputPort, this, info)); } -void MidiMessageFilter::OnSetInputPortState(uint32 port, +void MidiMessageFilter::OnSetInputPortState(uint32_t port, media::midi::MidiPortState state) { DCHECK(io_task_runner_->BelongsToCurrentThread()); main_task_runner_->PostTask( @@ -174,7 +174,7 @@ port, state)); } -void MidiMessageFilter::OnSetOutputPortState(uint32 port, +void MidiMessageFilter::OnSetOutputPortState(uint32_t port, media::midi::MidiPortState state) { DCHECK(io_task_runner_->BelongsToCurrentThread()); main_task_runner_->PostTask( @@ -182,8 +182,8 @@ port, state)); } -void MidiMessageFilter::OnDataReceived(uint32 port, - const std::vector<uint8>& data, +void MidiMessageFilter::OnDataReceived(uint32_t port, + const std::vector<uint8_t>& data, double timestamp) { TRACE_EVENT0("midi", "MidiMessageFilter::OnDataReceived"); DCHECK(io_task_runner_->BelongsToCurrentThread()); @@ -282,8 +282,8 @@ client->didAddOutputPort(id, manufacturer, name, version, state); } -void MidiMessageFilter::HandleDataReceived(uint32 port, - const std::vector<uint8>& data, +void MidiMessageFilter::HandleDataReceived(uint32_t port, + const std::vector<uint8_t>& data, double timestamp) { TRACE_EVENT0("midi", "MidiMessageFilter::HandleDataReceived"); DCHECK(main_task_runner_->BelongsToCurrentThread()); @@ -301,7 +301,7 @@ } void MidiMessageFilter::HandleSetInputPortState( - uint32 port, + uint32_t port, media::midi::MidiPortState state) { DCHECK(main_task_runner_->BelongsToCurrentThread()); inputs_[port].state = state; @@ -310,7 +310,7 @@ } void MidiMessageFilter::HandleSetOutputPortState( - uint32 port, + uint32_t port, media::midi::MidiPortState state) { DCHECK(main_task_runner_->BelongsToCurrentThread()); outputs_[port].state = state;
diff --git a/content/renderer/media/midi_message_filter.h b/content/renderer/media/midi_message_filter.h index 77cbb73..bf818ad 100644 --- a/content/renderer/media/midi_message_filter.h +++ b/content/renderer/media/midi_message_filter.h
@@ -5,9 +5,13 @@ #ifndef CONTENT_RENDERER_MEDIA_MIDI_MESSAGE_FILTER_H_ #define CONTENT_RENDERER_MEDIA_MIDI_MESSAGE_FILTER_H_ +#include <stddef.h> +#include <stdint.h> + #include <set> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "ipc/message_filter.h" @@ -34,8 +38,8 @@ // A client will only be able to call this method if it has a suitable // output port (from addOutputPort()). - void SendMidiData(uint32 port, - const uint8* data, + void SendMidiData(uint32_t port, + const uint8_t* data, size_t length, double timestamp); @@ -58,8 +62,8 @@ private: void StartSessionOnIOThread(); - void SendMidiDataOnIOThread(uint32 port, - const std::vector<uint8>& data, + void SendMidiDataOnIOThread(uint32_t port, + const std::vector<uint8_t>& data, double timestamp); void EndSessionOnIOThread(); @@ -88,13 +92,13 @@ // These functions are called to notify the recipient that a device that is // notified via OnAddInputPort() or OnAddOutputPort() gets disconnected, or // connected again. - void OnSetInputPortState(uint32 port, media::midi::MidiPortState state); - void OnSetOutputPortState(uint32 port, media::midi::MidiPortState state); + void OnSetInputPortState(uint32_t port, media::midi::MidiPortState state); + void OnSetOutputPortState(uint32_t port, media::midi::MidiPortState state); // Called when the browser process has sent MIDI data containing one or // more messages. - void OnDataReceived(uint32 port, - const std::vector<uint8>& data, + void OnDataReceived(uint32_t port, + const std::vector<uint8_t>& data, double timestamp); // From time-to-time, the browser incrementally informs us of how many bytes @@ -107,11 +111,12 @@ void HandleAddInputPort(media::midi::MidiPortInfo info); void HandleAddOutputPort(media::midi::MidiPortInfo info); - void HandleSetInputPortState(uint32 port, media::midi::MidiPortState state); - void HandleSetOutputPortState(uint32 port, media::midi::MidiPortState state); + void HandleSetInputPortState(uint32_t port, media::midi::MidiPortState state); + void HandleSetOutputPortState(uint32_t port, + media::midi::MidiPortState state); - void HandleDataReceived(uint32 port, - const std::vector<uint8>& data, + void HandleDataReceived(uint32_t port, + const std::vector<uint8_t>& data, double timestamp); void HandleAckknowledgeSentData(size_t bytes_sent);
diff --git a/content/renderer/media/mock_data_channel_impl.h b/content/renderer/media/mock_data_channel_impl.h index 919f4c2c..9b82669 100644 --- a/content/renderer/media/mock_data_channel_impl.h +++ b/content/renderer/media/mock_data_channel_impl.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_MEDIA_MOCK_DATA_CHANNEL_IMPL_H_ #define CONTENT_RENDERER_MEDIA_MOCK_DATA_CHANNEL_IMPL_H_ +#include <stdint.h> + #include <string> #include "base/macros.h"
diff --git a/content/renderer/media/mock_media_constraint_factory.cc b/content/renderer/media/mock_media_constraint_factory.cc index ad70b9c..1bed3456 100644 --- a/content/renderer/media/mock_media_constraint_factory.cc +++ b/content/renderer/media/mock_media_constraint_factory.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "content/renderer/media/media_stream_audio_processor_options.h"
diff --git a/content/renderer/media/mock_media_stream_dispatcher.h b/content/renderer/media/mock_media_stream_dispatcher.h index ffe9fb0d..f211ed2 100644 --- a/content/renderer/media/mock_media_stream_dispatcher.h +++ b/content/renderer/media/mock_media_stream_dispatcher.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "content/renderer/media/media_stream_dispatcher.h" #include "url/gurl.h"
diff --git a/content/renderer/media/mock_media_stream_video_source.h b/content/renderer/media/mock_media_stream_video_source.h index f9126014..e5e4d7e 100644 --- a/content/renderer/media/mock_media_stream_video_source.h +++ b/content/renderer/media/mock_media_stream_video_source.h
@@ -7,6 +7,7 @@ #include "content/renderer/media/media_stream_video_source.h" +#include "base/macros.h" #include "testing/gmock/include/gmock/gmock.h" namespace content {
diff --git a/content/renderer/media/mock_peer_connection_impl.cc b/content/renderer/media/mock_peer_connection_impl.cc index 4be2d77..cc8f0bb 100644 --- a/content/renderer/media/mock_peer_connection_impl.cc +++ b/content/renderer/media/mock_peer_connection_impl.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/mock_peer_connection_impl.h" +#include <stddef.h> + #include <vector> #include "base/logging.h"
diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h index 2787b99..dae0b9c 100644 --- a/content/renderer/media/mock_peer_connection_impl.h +++ b/content/renderer/media/mock_peer_connection_impl.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h"
diff --git a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h index 31b5a02..064665a 100644 --- a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h +++ b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/WebKit/public/platform/WebMediaStream.h" #include "third_party/WebKit/public/platform/WebRTCICECandidate.h"
diff --git a/content/renderer/media/peer_connection_identity_store.h b/content/renderer/media/peer_connection_identity_store.h index b920beef..82afbdc3 100644 --- a/content/renderer/media/peer_connection_identity_store.h +++ b/content/renderer/media/peer_connection_identity_store.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_MEDIA_PEER_CONNECTION_IDENTITY_STORE_H_ #define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_IDENTITY_STORE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread_checker.h" #include "third_party/libjingle/source/talk/app/webrtc/dtlsidentitystore.h"
diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc index af77250..63d6f56 100644 --- a/content/renderer/media/peer_connection_tracker.cc +++ b/content/renderer/media/peer_connection_tracker.cc
@@ -3,6 +3,9 @@ // found in the LICENSE file. #include "content/renderer/media/peer_connection_tracker.h" +#include <stddef.h> +#include <stdint.h> + #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" @@ -270,7 +273,8 @@ case StatsReport::Value::kBool: values->AppendBoolean(value->bool_val()); break; - case StatsReport::Value::kInt64: // int64 isn't supported, so use string. + case StatsReport::Value::kInt64: // int64_t isn't supported, so use + // string. case StatsReport::Value::kId: default: values->AppendString(value->ToString());
diff --git a/content/renderer/media/peer_connection_tracker.h b/content/renderer/media/peer_connection_tracker.h index 2e12a15c..63c55145 100644 --- a/content/renderer/media/peer_connection_tracker.h +++ b/content/renderer/media/peer_connection_tracker.h
@@ -8,6 +8,7 @@ #include <map> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "content/public/renderer/render_process_observer.h"
diff --git a/content/renderer/media/pepper_to_video_track_adapter.cc b/content/renderer/media/pepper_to_video_track_adapter.cc index 5f40798..c9fa038 100644 --- a/content/renderer/media/pepper_to_video_track_adapter.cc +++ b/content/renderer/media/pepper_to_video_track_adapter.cc
@@ -8,6 +8,7 @@ #include "base/base64.h" #include "base/logging.h" +#include "base/macros.h" #include "base/rand_util.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" @@ -40,7 +41,7 @@ // FrameWriterInterface implementation. // This method will be called by the Pepper host from render thread. - void PutFrame(PPB_ImageData_Impl* image_data, int64 time_stamp_ns) override; + void PutFrame(PPB_ImageData_Impl* image_data, int64_t time_stamp_ns) override; protected: // MediaStreamVideoSource implementation. @@ -145,7 +146,7 @@ // Note: PutFrame must copy or process image_data directly in this function, // because it may be overwritten as soon as we return from this function. void PpFrameWriter::PutFrame(PPB_ImageData_Impl* image_data, - int64 time_stamp_ns) { + int64_t time_stamp_ns) { DCHECK(CalledOnValidThread()); TRACE_EVENT0("video", "PpFrameWriter::PutFrame"); DVLOG(3) << "PpFrameWriter::PutFrame()"; @@ -167,7 +168,7 @@ return; } - const uint8* src_data = static_cast<uint8*>(bitmap->getPixels()); + const uint8_t* src_data = static_cast<uint8_t*>(bitmap->getPixels()); const int src_stride = static_cast<int>(bitmap->rowBytes()); const int width = bitmap->width(); const int height = bitmap->height(); @@ -213,7 +214,8 @@ ~PpFrameWriterProxy() override {} - void PutFrame(PPB_ImageData_Impl* image_data, int64 time_stamp_ns) override { + void PutFrame(PPB_ImageData_Impl* image_data, + int64_t time_stamp_ns) override { writer_->PutFrame(image_data, time_stamp_ns); }
diff --git a/content/renderer/media/pepper_to_video_track_adapter.h b/content/renderer/media/pepper_to_video_track_adapter.h index 46822186..2b9ea42 100644 --- a/content/renderer/media/pepper_to_video_track_adapter.h +++ b/content/renderer/media/pepper_to_video_track_adapter.h
@@ -5,10 +5,13 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_VIDEO_DESTINATION_HANDLER_H_ #define CONTENT_RENDERER_MEDIA_WEBRTC_VIDEO_DESTINATION_HANDLER_H_ +#include <stdint.h> + #include <string> #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" @@ -24,7 +27,7 @@ // The ownership of the |image_data| doesn't transfer. So the implementation // of this interface should make a copy of the |image_data| before return. virtual void PutFrame(PPB_ImageData_Impl* image_data, - int64 time_stamp_ns) = 0; + int64_t time_stamp_ns) = 0; virtual ~FrameWriterInterface() {} };
diff --git a/content/renderer/media/remote_media_stream_impl.cc b/content/renderer/media/remote_media_stream_impl.cc index 40aa0578..848d6bf 100644 --- a/content/renderer/media/remote_media_stream_impl.cc +++ b/content/renderer/media/remote_media_stream_impl.cc
@@ -4,12 +4,15 @@ #include "content/renderer/media/remote_media_stream_impl.h" +#include <stddef.h> + #include <string> #include <vector> #include "base/bind.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" #include "content/renderer/media/media_stream.h"
diff --git a/content/renderer/media/remote_media_stream_impl.h b/content/renderer/media/remote_media_stream_impl.h index 703e4e65..91b92940 100644 --- a/content/renderer/media/remote_media_stream_impl.h +++ b/content/renderer/media/remote_media_stream_impl.h
@@ -5,16 +5,16 @@ #ifndef CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_ #define CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread_checker.h" #include "content/common/content_export.h" -#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" #include "third_party/WebKit/public/platform/WebMediaStream.h" +#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" namespace content {
diff --git a/content/renderer/media/render_media_client.h b/content/renderer/media/render_media_client.h index dbc1db4..01d5189b 100644 --- a/content/renderer/media/render_media_client.h +++ b/content/renderer/media/render_media_client.h
@@ -6,6 +6,7 @@ #define CONTENT_RENDERER_MEDIA_RENDER_MEDIA_CLIENT_H_ #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" #include "base/time/tick_clock.h"
diff --git a/content/renderer/media/render_media_log.h b/content/renderer/media/render_media_log.h index b5e41a56..bc48630 100644 --- a/content/renderer/media/render_media_log.h +++ b/content/renderer/media/render_media_log.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/time/time.h" #include "content/common/content_export.h" #include "media/base/media_log.h"
diff --git a/content/renderer/media/render_media_log_unittest.cc b/content/renderer/media/render_media_log_unittest.cc index fd192639..a6a58a4c 100644 --- a/content/renderer/media/render_media_log_unittest.cc +++ b/content/renderer/media/render_media_log_unittest.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 "base/macros.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/test_mock_time_task_runner.h" #include "content/common/view_messages.h"
diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc index 8c403c6c..c3a0cd1c4 100644 --- a/content/renderer/media/renderer_gpu_video_accelerator_factories.cc +++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.cc
@@ -106,11 +106,11 @@ } bool RendererGpuVideoAcceleratorFactories::CreateTextures( - int32 count, + int32_t count, const gfx::Size& size, - std::vector<uint32>* texture_ids, + std::vector<uint32_t>* texture_ids, std::vector<gpu::Mailbox>* texture_mailboxes, - uint32 texture_target) { + uint32_t texture_target) { DCHECK(task_runner_->BelongsToCurrentThread()); DCHECK(texture_target); @@ -123,7 +123,7 @@ gles2->GenTextures(count, &texture_ids->at(0)); for (int i = 0; i < count; ++i) { gles2->ActiveTexture(GL_TEXTURE0); - uint32 texture_id = texture_ids->at(i); + uint32_t texture_id = texture_ids->at(i); gles2->BindTexture(texture_target, texture_id); gles2->TexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); gles2->TexParameteri(texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); @@ -154,7 +154,7 @@ return true; } -void RendererGpuVideoAcceleratorFactories::DeleteTexture(uint32 texture_id) { +void RendererGpuVideoAcceleratorFactories::DeleteTexture(uint32_t texture_id) { DCHECK(task_runner_->BelongsToCurrentThread()); if (CheckContextLost()) return;
diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.h b/content/renderer/media/renderer_gpu_video_accelerator_factories.h index 5f68546..b9bdd14 100644 --- a/content/renderer/media/renderer_gpu_video_accelerator_factories.h +++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.h
@@ -5,9 +5,12 @@ #ifndef CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ #define CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/waitable_event.h" @@ -60,12 +63,12 @@ override; // Creates textures and produces them into mailboxes. Returns true on success // or false on failure. - bool CreateTextures(int32 count, + bool CreateTextures(int32_t count, const gfx::Size& size, - std::vector<uint32>* texture_ids, + std::vector<uint32_t>* texture_ids, std::vector<gpu::Mailbox>* texture_mailboxes, - uint32 texture_target) override; - void DeleteTexture(uint32 texture_id) override; + uint32_t texture_target) override; + void DeleteTexture(uint32_t texture_id) override; void WaitSyncToken(const gpu::SyncToken& sync_token) override; scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
diff --git a/content/renderer/media/renderer_webaudiodevice_impl.cc b/content/renderer/media/renderer_webaudiodevice_impl.cc index a0dbd3e..a7e9408 100644 --- a/content/renderer/media/renderer_webaudiodevice_impl.cc +++ b/content/renderer/media/renderer_webaudiodevice_impl.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/renderer_webaudiodevice_impl.h" +#include <stddef.h> + #include <string> #include "base/command_line.h" @@ -11,6 +13,7 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" +#include "build/build_config.h" #include "content/renderer/media/audio_device_factory.h" #include "content/renderer/render_frame_impl.h" #include "media/audio/audio_output_device.h"
diff --git a/content/renderer/media/renderer_webaudiodevice_impl.h b/content/renderer/media/renderer_webaudiodevice_impl.h index 9dd2954e..e90c74bb 100644 --- a/content/renderer/media/renderer_webaudiodevice_impl.h +++ b/content/renderer/media/renderer_webaudiodevice_impl.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_MEDIA_RENDERER_WEBAUDIODEVICE_IMPL_H_ #define CONTENT_RENDERER_MEDIA_RENDERER_WEBAUDIODEVICE_IMPL_H_ +#include <stdint.h> + #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" #include "media/audio/audio_parameters.h"
diff --git a/content/renderer/media/renderer_webmediaplayer_delegate.cc b/content/renderer/media/renderer_webmediaplayer_delegate.cc index e811655e..081f774 100644 --- a/content/renderer/media/renderer_webmediaplayer_delegate.cc +++ b/content/renderer/media/renderer_webmediaplayer_delegate.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/renderer_webmediaplayer_delegate.h" +#include <stdint.h> + #include "content/common/frame_messages.h" #include "third_party/WebKit/public/platform/WebMediaPlayer.h" @@ -18,13 +20,13 @@ void RendererWebMediaPlayerDelegate::DidPlay(blink::WebMediaPlayer* player) { has_played_media_ = true; Send(new FrameHostMsg_MediaPlayingNotification( - routing_id(), reinterpret_cast<int64>(player), player->hasVideo(), + routing_id(), reinterpret_cast<int64_t>(player), player->hasVideo(), player->hasAudio(), player->isRemote())); } void RendererWebMediaPlayerDelegate::DidPause(blink::WebMediaPlayer* player) { Send(new FrameHostMsg_MediaPausedNotification( - routing_id(), reinterpret_cast<int64>(player))); + routing_id(), reinterpret_cast<int64_t>(player))); } void RendererWebMediaPlayerDelegate::PlayerGone(blink::WebMediaPlayer* player) {
diff --git a/content/renderer/media/renderer_webmidiaccessor_impl.h b/content/renderer/media/renderer_webmidiaccessor_impl.h index 2d4c3c04..07ea63d5 100644 --- a/content/renderer/media/renderer_webmidiaccessor_impl.h +++ b/content/renderer/media/renderer_webmidiaccessor_impl.h
@@ -5,8 +5,10 @@ #ifndef CONTENT_RENDERER_MEDIA_RENDERER_WEBMIDIACCESSOR_IMPL_H_ #define CONTENT_RENDERER_MEDIA_RENDERER_WEBMIDIACCESSOR_IMPL_H_ -#include "base/basictypes.h" +#include <stddef.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "third_party/WebKit/public/platform/WebMIDIAccessor.h" #include "third_party/WebKit/public/platform/WebMIDIAccessorClient.h"
diff --git a/content/renderer/media/rtc_certificate.h b/content/renderer/media/rtc_certificate.h index 0181b96..e38e9ae 100644 --- a/content/renderer/media/rtc_certificate.h +++ b/content/renderer/media/rtc_certificate.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_MEDIA_RTC_CERTIFICATE_H_ #define CONTENT_RENDERER_MEDIA_RTC_CERTIFICATE_H_ +#include <stdint.h> + #include "base/macros.h" #include "third_party/WebKit/public/platform/WebRTCCertificate.h" #include "third_party/WebKit/public/platform/WebRTCKeyParams.h"
diff --git a/content/renderer/media/rtc_certificate_generator.cc b/content/renderer/media/rtc_certificate_generator.cc index f7971814..83e17cb8 100644 --- a/content/renderer/media/rtc_certificate_generator.cc +++ b/content/renderer/media/rtc_certificate_generator.cc
@@ -6,6 +6,7 @@ #include <utility> +#include "base/macros.h" #include "content/renderer/media/peer_connection_identity_store.h" #include "content/renderer/media/rtc_certificate.h" #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
diff --git a/content/renderer/media/rtc_data_channel_handler.cc b/content/renderer/media/rtc_data_channel_handler.cc index 51fe9e6..9dba433 100644 --- a/content/renderer/media/rtc_data_channel_handler.cc +++ b/content/renderer/media/rtc_data_channel_handler.cc
@@ -84,7 +84,7 @@ } void RtcDataChannelHandler::Observer::OnBufferedAmountChange( - uint64 previous_amount) { + uint64_t previous_amount) { // Optimization: Only post a task if the change is a decrease, because the web // interface does not perform any action when there is an increase. if (previous_amount > channel_->buffered_amount()) {
diff --git a/content/renderer/media/rtc_data_channel_handler.h b/content/renderer/media/rtc_data_channel_handler.h index f93eeca5..1206d75 100644 --- a/content/renderer/media/rtc_data_channel_handler.h +++ b/content/renderer/media/rtc_data_channel_handler.h
@@ -5,14 +5,17 @@ #ifndef CONTENT_RENDERER_MEDIA_RTC_DATA_CHANNEL_HANDLER_H_ #define CONTENT_RENDERER_MEDIA_RTC_DATA_CHANNEL_HANDLER_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread_checker.h" #include "content/common/content_export.h" -#include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h" #include "third_party/WebKit/public/platform/WebRTCDataChannelHandler.h" #include "third_party/WebKit/public/platform/WebRTCDataChannelHandlerClient.h" +#include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h" namespace content { @@ -87,7 +90,7 @@ // webrtc::DataChannelObserver implementation. void OnStateChange() override; - void OnBufferedAmountChange(uint64 previous_amount) override; + void OnBufferedAmountChange(uint64_t previous_amount) override; void OnMessage(const webrtc::DataBuffer& buffer) override; void OnStateChangeImpl(webrtc::DataChannelInterface::DataState state);
diff --git a/content/renderer/media/rtc_data_channel_handler_unittest.cc b/content/renderer/media/rtc_data_channel_handler_unittest.cc index 7087095..3a40317 100644 --- a/content/renderer/media/rtc_data_channel_handler_unittest.cc +++ b/content/renderer/media/rtc_data_channel_handler_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "base/test/test_simple_task_runner.h" #include "content/renderer/media/mock_data_channel_impl.h"
diff --git a/content/renderer/media/rtc_dtmf_sender_handler.h b/content/renderer/media/rtc_dtmf_sender_handler.h index 1a9c3c2..6967d48 100644 --- a/content/renderer/media/rtc_dtmf_sender_handler.h +++ b/content/renderer/media/rtc_dtmf_sender_handler.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h"
diff --git a/content/renderer/media/rtc_media_constraints.cc b/content/renderer/media/rtc_media_constraints.cc index 7f8b79d..22226ce 100644 --- a/content/renderer/media/rtc_media_constraints.cc +++ b/content/renderer/media/rtc_media_constraints.cc
@@ -3,14 +3,16 @@ // found in the LICENSE file. #include "content/renderer/media/rtc_media_constraints.h" +#include <stddef.h> + #include <string> #include "base/logging.h" #include "base/strings/string_util.h" #include "content/common/media/media_stream_options.h" #include "content/renderer/media/media_stream_video_source.h" -#include "third_party/WebKit/public/platform/WebMediaConstraints.h" #include "third_party/WebKit/public/platform/WebCString.h" +#include "third_party/WebKit/public/platform/WebMediaConstraints.h" #include "third_party/WebKit/public/platform/WebString.h" namespace content {
diff --git a/content/renderer/media/rtc_peer_connection_handler.h b/content/renderer/media/rtc_peer_connection_handler.h index fa45d6a..25e3031 100644 --- a/content/renderer/media/rtc_peer_connection_handler.h +++ b/content/renderer/media/rtc_peer_connection_handler.h
@@ -5,11 +5,13 @@ #ifndef CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_ #define CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_ +#include <stddef.h> + #include <map> #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h"
diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc index ceb20f95..3ae6bb2 100644 --- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc +++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <string> #include <vector>
diff --git a/content/renderer/media/rtc_video_decoder.cc b/content/renderer/media/rtc_video_decoder.cc index 86ac8729..fff132c 100644 --- a/content/renderer/media/rtc_video_decoder.cc +++ b/content/renderer/media/rtc_video_decoder.cc
@@ -23,9 +23,9 @@ namespace content { -const int32 RTCVideoDecoder::ID_LAST = 0x3FFFFFFF; -const int32 RTCVideoDecoder::ID_HALF = 0x20000000; -const int32 RTCVideoDecoder::ID_INVALID = -1; +const int32_t RTCVideoDecoder::ID_LAST = 0x3FFFFFFF; +const int32_t RTCVideoDecoder::ID_HALF = 0x20000000; +const int32_t RTCVideoDecoder::ID_INVALID = -1; // Maximum number of concurrent VDA::Decode() operations RVD will maintain. // Higher values allow better pipelining in the GPU, but also require more @@ -38,7 +38,7 @@ // Maximum number of pending WebRTC buffers that are waiting for shared memory. static const size_t kMaxNumOfPendingBuffers = 8; -RTCVideoDecoder::BufferData::BufferData(int32 bitstream_buffer_id, +RTCVideoDecoder::BufferData::BufferData(int32_t bitstream_buffer_id, uint32_t timestamp, size_t size, const gfx::Rect& visible_rect) @@ -285,16 +285,16 @@ return WEBRTC_VIDEO_CODEC_OK; } -void RTCVideoDecoder::ProvidePictureBuffers(uint32 count, +void RTCVideoDecoder::ProvidePictureBuffers(uint32_t count, const gfx::Size& size, - uint32 texture_target) { + uint32_t texture_target) { DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent(); DVLOG(3) << "ProvidePictureBuffers. texture_target=" << texture_target; if (!vda_) return; - std::vector<uint32> texture_ids; + std::vector<uint32_t> texture_ids; std::vector<gpu::Mailbox> texture_mailboxes; decoder_texture_target_ = texture_target; if (!factories_->CreateTextures(count, @@ -319,11 +319,11 @@ vda_->AssignPictureBuffers(picture_buffers); } -void RTCVideoDecoder::DismissPictureBuffer(int32 id) { +void RTCVideoDecoder::DismissPictureBuffer(int32_t id) { DVLOG(3) << "DismissPictureBuffer. id=" << id; DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent(); - std::map<int32, media::PictureBuffer>::iterator it = + std::map<int32_t, media::PictureBuffer>::iterator it = assigned_picture_buffers_.find(id); if (it == assigned_picture_buffers_.end()) { NOTREACHED() << "Missing picture buffer: " << id; @@ -346,7 +346,7 @@ DVLOG(3) << "PictureReady"; DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent(); - std::map<int32, media::PictureBuffer>::iterator it = + std::map<int32_t, media::PictureBuffer>::iterator it = assigned_picture_buffers_.find(picture.picture_buffer_id()); if (it == assigned_picture_buffers_.end()) { NOTREACHED() << "Missing picture buffer: " << picture.picture_buffer_id(); @@ -420,11 +420,11 @@ return frame; } -void RTCVideoDecoder::NotifyEndOfBitstreamBuffer(int32 id) { +void RTCVideoDecoder::NotifyEndOfBitstreamBuffer(int32_t id) { DVLOG(3) << "NotifyEndOfBitstreamBuffer. id=" << id; DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent(); - std::map<int32, base::SharedMemory*>::iterator it = + std::map<int32_t, base::SharedMemory*>::iterator it = bitstream_buffers_in_decoder_.find(id); if (it == bitstream_buffers_in_decoder_.end()) { NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE); @@ -522,16 +522,17 @@ return bitstream_buffers_in_decoder_.size() < kMaxInFlightDecodes; } -bool RTCVideoDecoder::IsBufferAfterReset(int32 id_buffer, int32 id_reset) { +bool RTCVideoDecoder::IsBufferAfterReset(int32_t id_buffer, int32_t id_reset) { if (id_reset == ID_INVALID) return true; - int32 diff = id_buffer - id_reset; + int32_t diff = id_buffer - id_reset; if (diff <= 0) diff += ID_LAST + 1; return diff < ID_HALF; } -bool RTCVideoDecoder::IsFirstBufferAfterReset(int32 id_buffer, int32 id_reset) { +bool RTCVideoDecoder::IsFirstBufferAfterReset(int32_t id_buffer, + int32_t id_reset) { if (id_reset == ID_INVALID) return id_buffer == 0; return id_buffer == ((id_reset + 1) & ID_LAST); @@ -613,8 +614,8 @@ void RTCVideoDecoder::ReleaseMailbox( base::WeakPtr<RTCVideoDecoder> decoder, media::GpuVideoAcceleratorFactories* factories, - int64 picture_buffer_id, - uint32 texture_id, + int64_t picture_buffer_id, + uint32_t texture_id, const gpu::SyncToken& release_sync_token) { DCHECK(factories->GetTaskRunner()->BelongsToCurrentThread()); factories->WaitSyncToken(release_sync_token); @@ -628,14 +629,14 @@ factories->DeleteTexture(texture_id); } -void RTCVideoDecoder::ReusePictureBuffer(int64 picture_buffer_id) { +void RTCVideoDecoder::ReusePictureBuffer(int64_t picture_buffer_id) { DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent(); DVLOG(3) << "ReusePictureBuffer. id=" << picture_buffer_id; DCHECK(!picture_buffers_at_display_.empty()); PictureBufferTextureMap::iterator display_iterator = picture_buffers_at_display_.find(picture_buffer_id); - uint32 texture_id = display_iterator->second; + uint32_t texture_id = display_iterator->second; DCHECK(display_iterator != picture_buffers_at_display_.end()); picture_buffers_at_display_.erase(display_iterator); @@ -778,7 +779,7 @@ input_buffer_data_.pop_back(); } -void RTCVideoDecoder::GetBufferData(int32 bitstream_buffer_id, +void RTCVideoDecoder::GetBufferData(int32_t bitstream_buffer_id, uint32_t* timestamp, gfx::Rect* visible_rect) { for (const auto& buffer_data : input_buffer_data_) {
diff --git a/content/renderer/media/rtc_video_decoder.h b/content/renderer/media/rtc_video_decoder.h index db7668c..9728866 100644 --- a/content/renderer/media/rtc_video_decoder.h +++ b/content/renderer/media/rtc_video_decoder.h
@@ -5,14 +5,17 @@ #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_ #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <list> #include <map> #include <set> #include <utility> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" @@ -81,12 +84,12 @@ int32_t Reset() override; // VideoDecodeAccelerator::Client implementation. - void ProvidePictureBuffers(uint32 count, + void ProvidePictureBuffers(uint32_t count, const gfx::Size& size, - uint32 texture_target) override; - void DismissPictureBuffer(int32 id) override; + uint32_t texture_target) override; + void DismissPictureBuffer(int32_t id) override; void PictureReady(const media::Picture& picture) override; - void NotifyEndOfBitstreamBuffer(int32 id) override; + void NotifyEndOfBitstreamBuffer(int32_t id) override; void NotifyFlushDone() override; void NotifyResetDone() override; void NotifyError(media::VideoDecodeAccelerator::Error error) override; @@ -94,13 +97,13 @@ private: // Metadata of a bitstream buffer. struct BufferData { - BufferData(int32 bitstream_buffer_id, + BufferData(int32_t bitstream_buffer_id, uint32_t timestamp, size_t size, const gfx::Rect& visible_rect); BufferData(); ~BufferData(); - int32 bitstream_buffer_id; + int32_t bitstream_buffer_id; uint32_t timestamp; // in 90KHz size_t size; // buffer size gfx::Rect visible_rect; @@ -119,11 +122,11 @@ // Returns true if bitstream buffer id |id_buffer| comes after |id_reset|. // This handles the wraparound. - bool IsBufferAfterReset(int32 id_buffer, int32 id_reset); + bool IsBufferAfterReset(int32_t id_buffer, int32_t id_reset); // Returns true if bitstream buffer |id_buffer| is the first buffer after // |id_reset|. - bool IsFirstBufferAfterReset(int32 id_buffer, int32 id_reset); + bool IsFirstBufferAfterReset(int32_t id_buffer, int32_t id_reset); // Saves a WebRTC buffer in |decode_buffers_| for decode. void SaveToDecodeBuffers_Locked(const webrtc::EncodedImage& input_image, @@ -150,11 +153,11 @@ // Static method is to allow it to run even after RVD is deleted. static void ReleaseMailbox(base::WeakPtr<RTCVideoDecoder> decoder, media::GpuVideoAcceleratorFactories* factories, - int64 picture_buffer_id, - uint32 texture_id, + int64_t picture_buffer_id, + uint32_t texture_id, const gpu::SyncToken& release_sync_token); // Tells VDA that a picture buffer can be recycled. - void ReusePictureBuffer(int64 picture_buffer_id); + void ReusePictureBuffer(int64_t picture_buffer_id); // Create |vda_| on |vda_loop_proxy_|. void CreateVDA(media::VideoCodecProfile profile, base::WaitableEvent* waiter); @@ -176,7 +179,7 @@ // Stores the buffer metadata to |input_buffer_data_|. void RecordBufferData(const BufferData& buffer_data); // Gets the buffer metadata from |input_buffer_data_|. - void GetBufferData(int32 bitstream_buffer_id, + void GetBufferData(int32_t bitstream_buffer_id, uint32_t* timestamp, gfx::Rect* visible_rect); @@ -201,9 +204,9 @@ DECODE_ERROR, // Decoding error happened. }; - static const int32 ID_LAST; // maximum bitstream buffer id - static const int32 ID_HALF; // half of the maximum bitstream buffer id - static const int32 ID_INVALID; // indicates Reset or Release never occurred + static const int32_t ID_LAST; // maximum bitstream buffer id + static const int32_t ID_HALF; // half of the maximum bitstream buffer id + static const int32_t ID_INVALID; // indicates Reset or Release never occurred // The hardware video decoder. scoped_ptr<media::VideoDecodeAccelerator> vda_; @@ -217,27 +220,27 @@ media::GpuVideoAcceleratorFactories* const factories_; // The texture target used for decoded pictures. - uint32 decoder_texture_target_; + uint32_t decoder_texture_target_; // Metadata of the buffers that have been sent for decode. std::list<BufferData> input_buffer_data_; // A map from bitstream buffer IDs to bitstream buffers that are being // processed by VDA. The map owns SHM buffers. - std::map<int32, base::SharedMemory*> bitstream_buffers_in_decoder_; + std::map<int32_t, base::SharedMemory*> bitstream_buffers_in_decoder_; // A map from picture buffer IDs to texture-backed picture buffers. - std::map<int32, media::PictureBuffer> assigned_picture_buffers_; + std::map<int32_t, media::PictureBuffer> assigned_picture_buffers_; // PictureBuffers given to us by VDA via PictureReady, which we sent forward // as VideoFrames to be rendered via read_cb_, and which will be returned // to us via ReusePictureBuffer. - typedef std::map<int32 /* picture_buffer_id */, uint32 /* texture_id */> + typedef std::map<int32_t /* picture_buffer_id */, uint32_t /* texture_id */> PictureBufferTextureMap; PictureBufferTextureMap picture_buffers_at_display_; // The id that will be given to the next picture buffer. - int32 next_picture_buffer_id_; + int32_t next_picture_buffer_id_; // Protects |state_|, |decode_complete_callback_| , |num_shm_buffers_|, // |available_shm_segments_|, |pending_buffers_|, |decode_buffers_|, @@ -268,11 +271,11 @@ std::deque<std::pair<base::SharedMemory*, BufferData>> decode_buffers_; // The id that will be given to the next bitstream buffer. Guarded by |lock_|. - int32 next_bitstream_buffer_id_; + int32_t next_bitstream_buffer_id_; // A buffer that has an id less than this should be dropped because Reset or // Release has been called. Guarded by |lock_|. - int32 reset_bitstream_buffer_id_; + int32_t reset_bitstream_buffer_id_; // Minimum and maximum supported resolutions for the current profile/VDA. gfx::Size min_resolution_;
diff --git a/content/renderer/media/rtc_video_decoder_factory.h b/content/renderer/media/rtc_video_decoder_factory.h index ca797c1..c3475de 100644 --- a/content/renderer/media/rtc_video_decoder_factory.h +++ b/content/renderer/media/rtc_video_decoder_factory.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_FACTORY_H_ #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_FACTORY_H_ +#include "base/macros.h" #include "base/threading/thread.h" #include "content/common/content_export.h" #include "third_party/libjingle/source/talk/media/webrtc/webrtcvideodecoderfactory.h"
diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc index 1ce30d8..2aeb1ea 100644 --- a/content/renderer/media/rtc_video_decoder_unittest.cc +++ b/content/renderer/media/rtc_video_decoder_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" #include "base/location.h" #include "base/single_thread_task_runner.h"
diff --git a/content/renderer/media/rtc_video_encoder.cc b/content/renderer/media/rtc_video_encoder.cc index c19270e..6b6a420 100644 --- a/content/renderer/media/rtc_video_encoder.cc +++ b/content/renderer/media/rtc_video_encoder.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/metrics/histogram.h" #include "base/numerics/safe_conversions.h" @@ -109,7 +110,7 @@ // RTCVideoEncoder expects to be able to call this function synchronously from // its own thread, hence the |async_waiter| and |async_retval| arguments. void CreateAndInitializeVEA(const gfx::Size& input_visible_size, - uint32 bitrate, + uint32_t bitrate, media::VideoCodecProfile profile, base::WaitableEvent* async_waiter, int32_t* async_retval); @@ -124,10 +125,10 @@ // RTCVideoEncoder is given a buffer to be passed to WebRTC through the // RTCVideoEncoder::ReturnEncodedImage() function. When that is complete, // the buffer is returned to Impl by its index using this function. - void UseOutputBitstreamBufferId(int32 bitstream_buffer_id); + void UseOutputBitstreamBufferId(int32_t bitstream_buffer_id); // Request encoding parameter change for the underlying encoder. - void RequestEncodingParametersChange(uint32 bitrate, uint32 framerate); + void RequestEncodingParametersChange(uint32_t bitrate, uint32_t framerate); // Destroy this Impl's encoder. The destructor is not explicitly called, as // Impl is a base::RefCountedThreadSafe. @@ -137,7 +138,7 @@ void RequireBitstreamBuffers(unsigned int input_count, const gfx::Size& input_coded_size, size_t output_buffer_size) override; - void BitstreamBufferReady(int32 bitstream_buffer_id, + void BitstreamBufferReady(int32_t bitstream_buffer_id, size_t payload_size, bool key_frame) override; void NotifyError(media::VideoEncodeAccelerator::Error error) override; @@ -171,7 +172,7 @@ void SignalAsyncWaiter(int32_t retval); // Checks if the bitrate would overflow when passing from kbps to bps. - bool IsBitrateTooHigh(uint32 bitrate); + bool IsBitrateTooHigh(uint32_t bitrate); base::ThreadChecker thread_checker_; @@ -219,7 +220,7 @@ int output_buffers_free_count_; // 15 bits running index of the VP8 frames. See VP8 RTP spec for details. - uint16 picture_id_; + uint16_t picture_id_; DISALLOW_COPY_AND_ASSIGN(Impl); }; @@ -241,7 +242,7 @@ void RTCVideoEncoder::Impl::CreateAndInitializeVEA( const gfx::Size& input_visible_size, - uint32 bitrate, + uint32_t bitrate, media::VideoCodecProfile profile, base::WaitableEvent* async_waiter, int32_t* async_retval) { @@ -309,7 +310,7 @@ } void RTCVideoEncoder::Impl::UseOutputBitstreamBufferId( - int32 bitstream_buffer_id) { + int32_t bitstream_buffer_id) { DVLOG(3) << "Impl::UseOutputBitstreamBufferIndex(): " "bitstream_buffer_id=" << bitstream_buffer_id; DCHECK(thread_checker_.CalledOnValidThread()); @@ -322,8 +323,9 @@ } } -void RTCVideoEncoder::Impl::RequestEncodingParametersChange(uint32 bitrate, - uint32 framerate) { +void RTCVideoEncoder::Impl::RequestEncodingParametersChange( + uint32_t bitrate, + uint32_t framerate) { DVLOG(3) << "Impl::RequestEncodingParametersChange(): bitrate=" << bitrate << ", framerate=" << framerate; DCHECK(thread_checker_.CalledOnValidThread()); @@ -389,7 +391,7 @@ SignalAsyncWaiter(WEBRTC_VIDEO_CODEC_OK); } -void RTCVideoEncoder::Impl::BitstreamBufferReady(int32 bitstream_buffer_id, +void RTCVideoEncoder::Impl::BitstreamBufferReady(int32_t bitstream_buffer_id, size_t payload_size, bool key_frame) { DVLOG(3) << "Impl::BitstreamBufferReady(): " @@ -414,10 +416,10 @@ // Use webrtc timestamps to ensure correct RTP sender behavior. // TODO(hshi): obtain timestamp from the capturer, see crbug.com/350106. - const int64 capture_time_us = webrtc::TickTime::MicrosecondTimestamp(); + const int64_t capture_time_us = webrtc::TickTime::MicrosecondTimestamp(); // Derive the capture time (in ms) and RTP timestamp (in 90KHz ticks). - const int64 capture_time_ms = capture_time_us / 1000; + const int64_t capture_time_ms = capture_time_us / 1000; const uint32_t rtp_timestamp = static_cast<uint32_t>(capture_time_us * 90 / 1000); @@ -508,7 +510,7 @@ frame = media::VideoFrame::WrapExternalSharedMemory( media::PIXEL_FORMAT_I420, input_frame_coded_size_, gfx::Rect(input_visible_size_), input_visible_size_, - reinterpret_cast<uint8*>(input_buffer->memory()), + reinterpret_cast<uint8_t*>(input_buffer->memory()), input_buffer->mapped_size(), input_buffer->handle(), 0, base::TimeDelta()); if (!frame.get()) { @@ -571,8 +573,8 @@ async_waiter_ = NULL; } -bool RTCVideoEncoder::Impl::IsBitrateTooHigh(uint32 bitrate) { - if (base::IsValueInRangeForNumericType<uint32>(bitrate * UINT64_C(1000))) +bool RTCVideoEncoder::Impl::IsBitrateTooHigh(uint32_t bitrate) { + if (base::IsValueInRangeForNumericType<uint32_t>(bitrate * UINT64_C(1000))) return false; LogAndNotifyError(FROM_HERE, "Overflow converting bitrate from kbps to bps", media::VideoEncodeAccelerator::kInvalidArgumentError); @@ -713,8 +715,8 @@ } void RTCVideoEncoder::ReturnEncodedImage(scoped_ptr<webrtc::EncodedImage> image, - int32 bitstream_buffer_id, - uint16 picture_id) { + int32_t bitstream_buffer_id, + uint16_t picture_id) { DCHECK(thread_checker_.CalledOnValidThread()); DVLOG(3) << "ReturnEncodedImage(): " << "bitstream_buffer_id=" << bitstream_buffer_id
diff --git a/content/renderer/media/rtc_video_encoder.h b/content/renderer/media/rtc_video_encoder.h index c916d54..4997ad29 100644 --- a/content/renderer/media/rtc_video_encoder.h +++ b/content/renderer/media/rtc_video_encoder.h
@@ -5,8 +5,12 @@ #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_ENCODER_H_ #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_ENCODER_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -62,8 +66,8 @@ // Return an encoded output buffer to WebRTC. void ReturnEncodedImage(scoped_ptr<webrtc::EncodedImage> image, - int32 bitstream_buffer_id, - uint16 picture_id); + int32_t bitstream_buffer_id, + uint16_t picture_id); void NotifyError(int32_t error);
diff --git a/content/renderer/media/rtc_video_encoder_factory.h b/content/renderer/media/rtc_video_encoder_factory.h index 95707ba1..a4abe6f 100644 --- a/content/renderer/media/rtc_video_encoder_factory.h +++ b/content/renderer/media/rtc_video_encoder_factory.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "third_party/libjingle/source/talk/media/webrtc/webrtcvideoencoderfactory.h"
diff --git a/content/renderer/media/speech_recognition_audio_sink.cc b/content/renderer/media/speech_recognition_audio_sink.cc index 6b80dd27..6370df2 100644 --- a/content/renderer/media/speech_recognition_audio_sink.cc +++ b/content/renderer/media/speech_recognition_audio_sink.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/speech_recognition_audio_sink.h" +#include <stddef.h> + #include "base/logging.h" #include "base/memory/shared_memory.h" #include "base/time/time.h"
diff --git a/content/renderer/media/speech_recognition_audio_sink.h b/content/renderer/media/speech_recognition_audio_sink.h index d1200b2..c70420f 100644 --- a/content/renderer/media/speech_recognition_audio_sink.h +++ b/content/renderer/media/speech_recognition_audio_sink.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_MEDIA_SPEECH_RECOGNITION_AUDIO_SINK_H_ #define CONTENT_RENDERER_MEDIA_SPEECH_RECOGNITION_AUDIO_SINK_H_ +#include <stdint.h> + #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "base/sync_socket.h" @@ -103,7 +106,7 @@ bool track_stopped_; // Local counter of audio buffers for synchronization. - uint32 buffer_index_; + uint32_t buffer_index_; // Callback for the renderer client. Called when the audio track was stopped. const OnStoppedCB on_stopped_cb_;
diff --git a/content/renderer/media/speech_recognition_audio_sink_unittest.cc b/content/renderer/media/speech_recognition_audio_sink_unittest.cc index 8a05fab..3ea81a8d 100644 --- a/content/renderer/media/speech_recognition_audio_sink_unittest.cc +++ b/content/renderer/media/speech_recognition_audio_sink_unittest.cc
@@ -4,7 +4,11 @@ #include "content/renderer/media/speech_recognition_audio_sink.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "content/renderer/media/media_stream_audio_source.h" #include "content/renderer/media/mock_media_constraint_factory.h" @@ -49,7 +53,7 @@ struct SharedBuffer { SharedBuffer() : data(), start(0), length(0) {} - uint8 data[kSharedBufferSize]; + uint8_t data[kSharedBufferSize]; size_t start; size_t length; }; @@ -87,7 +91,7 @@ if (in_failure_mode_) return 0; - const uint8* b = static_cast<const uint8*>(buffer); + const uint8_t* b = static_cast<const uint8_t*>(buffer); for (size_t i = 0; i < length; ++i, ++buffer_->length) buffer_->data[buffer_->start + buffer_->length] = b[i]; @@ -96,7 +100,7 @@ } size_t MockSyncSocket::Receive(void* buffer, size_t length) { - uint8* b = static_cast<uint8*>(buffer); + uint8_t* b = static_cast<uint8_t*>(buffer); for (size_t i = buffer_->start; i < buffer_->length; ++i, ++buffer_->start) b[i] = buffer_->data[buffer_->start]; @@ -117,7 +121,7 @@ const media::AudioParameters& sink_params, base::SharedMemoryHandle* foreign_memory_handle) { // Shared memory is allocated, mapped and shared. - const uint32 kSharedMemorySize = + const uint32_t kSharedMemorySize = sizeof(media::AudioInputBufferParameters) + media::AudioBus::CalculateMemorySize(sink_params); shared_memory_.reset(new base::SharedMemory()); @@ -211,10 +215,10 @@ // Initializes the producer and consumer with specified audio parameters. // Returns the minimal number of input audio buffers which need to be captured // before they get sent to the consumer. - uint32 Initialize(int input_sample_rate, - int input_frames_per_buffer, - int output_sample_rate, - int output_frames_per_buffer) { + uint32_t Initialize(int input_sample_rate, + int input_frames_per_buffer, + int output_sample_rate, + int output_frames_per_buffer) { // Audio Environment setup. source_params_.Reset(kInputFormat, kInputChannelLayout, @@ -255,7 +259,7 @@ base::Unretained(this)))); // Return number of buffers needed to trigger resampling and consumption. - return static_cast<uint32>(std::ceil( + return static_cast<uint32_t>(std::ceil( static_cast<double>(output_frames_per_buffer * input_sample_rate) / (input_frames_per_buffer * output_sample_rate))); } @@ -295,8 +299,8 @@ } // Emulates an audio capture device capturing data from the source. - inline void CaptureAudio(const uint32 buffers) { - for (uint32 i = 0; i < buffers; ++i) { + inline void CaptureAudio(const uint32_t buffers) { + for (uint32_t i = 0; i < buffers; ++i) { const base::TimeTicks estimated_capture_time = first_frame_capture_time_ + (sample_frames_captured_ * base::TimeDelta::FromSeconds(1) / source_params_.sample_rate()); @@ -311,14 +315,15 @@ } // Helper method for verifying captured audio data has been consumed. - inline void AssertConsumedBuffers(const uint32 buffer_index) { + inline void AssertConsumedBuffers(const uint32_t buffer_index) { ASSERT_EQ(buffer_index, recognizer()->GetAudioInputBuffer()->params.size); } // Helper method for providing audio data to producer and verifying it was // consumed on the recognizer. - inline void CaptureAudioAndAssertConsumedBuffers(const uint32 buffers, - const uint32 buffer_index) { + inline void CaptureAudioAndAssertConsumedBuffers( + const uint32_t buffers, + const uint32_t buffer_index) { CaptureAudio(buffers); AssertConsumedBuffers(buffer_index); } @@ -330,15 +335,13 @@ const int input_frames_per_buffer, const int output_sample_rate, const int output_frames_per_buffer, - const uint32 consumptions) { - const uint32 buffers_per_notification = - Initialize(input_sample_rate, - input_frames_per_buffer, - output_sample_rate, - output_frames_per_buffer); + const uint32_t consumptions) { + const uint32_t buffers_per_notification = + Initialize(input_sample_rate, input_frames_per_buffer, + output_sample_rate, output_frames_per_buffer); AssertConsumedBuffers(0U); - for (uint32 i = 1U; i <= consumptions; ++i) { + for (uint32_t i = 1U; i <= consumptions; ++i) { CaptureAudio(buffers_per_notification); ASSERT_EQ(i, recognizer()->GetAudioInputBuffer()->params.size) << "Tested at rates: " @@ -371,7 +374,7 @@ WebRtcLocalAudioTrack* native_track_; base::TimeTicks first_frame_capture_time_; - int64 sample_frames_captured_; + int64_t sample_frames_captured_; DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionAudioSinkTest); }; @@ -433,12 +436,12 @@ // Input audio is sampled at 44.1 KHz with data chunks of 10ms. Desired output // is corresponding to the speech recognition engine requirements: 16 KHz with // 100 ms chunks (1600 frames per buffer). - const uint32 kSourceFrames = 441; - const uint32 buffers_per_notification = + const uint32_t kSourceFrames = 441; + const uint32_t buffers_per_notification = Initialize(44100, kSourceFrames, 16000, 1600); // Fill audio input frames with 0, 1, 2, 3, ..., 440. - int16 source_data[kSourceFrames * kInputChannels]; - for (uint32 i = 0; i < kSourceFrames; ++i) { + int16_t source_data[kSourceFrames * kInputChannels]; + for (uint32_t i = 0; i < kSourceFrames; ++i) { for (int c = 0; c < kInputChannels; ++c) source_data[i * kInputChannels + c] = i; } @@ -447,18 +450,18 @@ // Prepare sink audio bus and data for rendering. media::AudioBus* sink_bus = recognizer()->audio_bus(); - const uint32 kSinkDataLength = 1600 * kOutputChannels; - int16 sink_data[kSinkDataLength] = {0}; + const uint32_t kSinkDataLength = 1600 * kOutputChannels; + int16_t sink_data[kSinkDataLength] = {0}; // Render the audio data from the recognizer. sink_bus->ToInterleaved(sink_bus->frames(), sink_params().bits_per_sample() / 8, sink_data); // Checking only a fraction of the sink frames. - const uint32 kNumFramesToTest = 12; + const uint32_t kNumFramesToTest = 12; // Check all channels are zeroed out before we trigger resampling. - for (uint32 i = 0; i < kNumFramesToTest; ++i) { + for (uint32_t i = 0; i < kNumFramesToTest; ++i) { for (int c = 0; c < kOutputChannels; ++c) EXPECT_EQ(0, sink_data[i * kOutputChannels + c]); } @@ -472,11 +475,11 @@ sink_params().bits_per_sample() / 8, sink_data); // Resampled data expected frames. Extracted based on |source_data|. - const int16 kExpectedData[kNumFramesToTest] = {0, 2, 5, 8, 11, 13, - 16, 19, 22, 24, 27, 30}; + const int16_t kExpectedData[kNumFramesToTest] = {0, 2, 5, 8, 11, 13, + 16, 19, 22, 24, 27, 30}; // Check all channels have the same resampled data. - for (uint32 i = 0; i < kNumFramesToTest; ++i) { + for (uint32_t i = 0; i < kNumFramesToTest; ++i) { for (int c = 0; c < kOutputChannels; ++c) EXPECT_EQ(kExpectedData[i], sink_data[i * kOutputChannels + c]); } @@ -484,7 +487,7 @@ // Checks that the producer does not misbehave when a socket failure occurs. TEST_F(SpeechRecognitionAudioSinkTest, SyncSocketFailsSendingData) { - const uint32 buffers_per_notification = Initialize(44100, 441, 16000, 1600); + const uint32_t buffers_per_notification = Initialize(44100, 441, 16000, 1600); // Start with no problems on the socket. AssertConsumedBuffers(0U); CaptureAudioAndAssertConsumedBuffers(buffers_per_notification, 1U); @@ -499,7 +502,7 @@ // We check that the FIFO overflow does not occur and that the producer is able // to resume. TEST_F(SpeechRecognitionAudioSinkTest, RepeatedSycnhronizationLag) { - const uint32 buffers_per_notification = Initialize(44100, 441, 16000, 1600); + const uint32_t buffers_per_notification = Initialize(44100, 441, 16000, 1600); // Start with no synchronization problems. AssertConsumedBuffers(0U); @@ -520,7 +523,7 @@ // Checks that an OnStoppedCallback is issued when the track is stopped. TEST_F(SpeechRecognitionAudioSinkTest, OnReadyStateChangedOccured) { - const uint32 buffers_per_notification = Initialize(44100, 441, 16000, 1600); + const uint32_t buffers_per_notification = Initialize(44100, 441, 16000, 1600); AssertConsumedBuffers(0U); CaptureAudioAndAssertConsumedBuffers(buffers_per_notification, 1U); EXPECT_CALL(*this, StoppedCallback()).Times(1);
diff --git a/content/renderer/media/tagged_list.h b/content/renderer/media/tagged_list.h index 450f9f6..b58772c 100644 --- a/content/renderer/media/tagged_list.h +++ b/content/renderer/media/tagged_list.h
@@ -9,6 +9,7 @@ #include <list> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" namespace content {
diff --git a/content/renderer/media/user_media_client_impl.cc b/content/renderer/media/user_media_client_impl.cc index 5d0afa5..d60046a4 100644 --- a/content/renderer/media/user_media_client_impl.cc +++ b/content/renderer/media/user_media_client_impl.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/user_media_client_impl.h" +#include <stddef.h> + #include <utility> #include "base/hash.h"
diff --git a/content/renderer/media/user_media_client_impl.h b/content/renderer/media/user_media_client_impl.h index 1200cae2..04cc2e0 100644 --- a/content/renderer/media/user_media_client_impl.h +++ b/content/renderer/media/user_media_client_impl.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h"
diff --git a/content/renderer/media/user_media_client_impl_unittest.cc b/content/renderer/media/user_media_client_impl_unittest.cc index c2123214..624743c 100644 --- a/content/renderer/media/user_media_client_impl_unittest.cc +++ b/content/renderer/media/user_media_client_impl_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc index f9e13b6..67957d4 100644 --- a/content/renderer/media/video_capture_impl.cc +++ b/content/renderer/media/video_capture_impl.cc
@@ -11,7 +11,10 @@ #include "content/renderer/media/video_capture_impl.h" +#include <stddef.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/thread_task_runner_handle.h" #include "content/child/child_process.h" @@ -66,13 +69,13 @@ base::Unretained(this)))); bool rv = buffers_[i]->Map(); DCHECK(rv); - data_[i] = reinterpret_cast<uint8*>(buffers_[i]->memory(0u)); + data_[i] = reinterpret_cast<uint8_t*>(buffers_[i]->memory(0u)); strides_[i] = width; } } - uint8* data(int plane) const { return data_[plane]; } - int32 stride(int plane) const { return strides_[plane]; } + uint8_t* data(int plane) const { return data_[plane]; } + int32_t stride(int plane) const { return strides_[plane]; } std::vector<gfx::GpuMemoryBufferHandle> gpu_memory_buffer_handles() { return handles_; } @@ -90,8 +93,8 @@ const std::vector<gfx::GpuMemoryBufferHandle> handles_; const gfx::Size size_; ScopedVector<gfx::GpuMemoryBuffer> buffers_; - uint8* data_[media::VideoFrame::kMaxPlanes]; - int32 strides_[media::VideoFrame::kMaxPlanes]; + uint8_t* data_[media::VideoFrame::kMaxPlanes]; + int32_t strides_[media::VideoFrame::kMaxPlanes]; DISALLOW_COPY_AND_ASSIGN(ClientBuffer2); }; @@ -355,16 +358,11 @@ DCHECK(iter != client_buffers_.end()); const scoped_refptr<ClientBuffer> buffer = iter->second; frame = media::VideoFrame::WrapExternalSharedMemory( - pixel_format, - coded_size, - visible_rect, - gfx::Size(visible_rect.width(), - visible_rect.height()), - reinterpret_cast<uint8*>(buffer->buffer()->memory()), - buffer->buffer_size(), - buffer->buffer()->handle(), - 0 /* shared_memory_offset */, - timestamp - first_frame_timestamp_); + pixel_format, coded_size, visible_rect, + gfx::Size(visible_rect.width(), visible_rect.height()), + reinterpret_cast<uint8_t*>(buffer->buffer()->memory()), + buffer->buffer_size(), buffer->buffer()->handle(), + 0 /* shared_memory_offset */, timestamp - first_frame_timestamp_); buffer_finished_callback = media::BindToCurrentLoop( base::Bind(&VideoCaptureImpl::OnClientBufferFinished, weak_factory_.GetWeakPtr(), buffer_id, buffer)); @@ -465,7 +463,7 @@ device_formats_in_use_cb_queue_.clear(); } -void VideoCaptureImpl::OnDelegateAdded(int32 device_id) { +void VideoCaptureImpl::OnDelegateAdded(int32_t device_id) { DCHECK(io_task_runner_->BelongsToCurrentThread()); DVLOG(1) << "OnDelegateAdded: device_id " << device_id;
diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h index 52c2eb3b..cd2a8090 100644 --- a/content/renderer/media/video_capture_impl.h +++ b/content/renderer/media/video_capture_impl.h
@@ -5,9 +5,12 @@ #ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_ #define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_ +#include <stdint.h> + #include <list> #include <map> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "content/common/content_export.h" @@ -125,7 +128,7 @@ const media::VideoCaptureFormats& supported_formats) override; void OnDeviceFormatsInUseReceived( const media::VideoCaptureFormats& formats_in_use) override; - void OnDelegateAdded(int32 device_id) override; + void OnDelegateAdded(int32_t device_id) override; // Sends an IPC message to browser process when all clients are done with the // buffer. @@ -168,9 +171,9 @@ std::vector<VideoCaptureDeviceFormatsCB> device_formats_in_use_cb_queue_; // Buffers available for sending to the client. - typedef std::map<int32, scoped_refptr<ClientBuffer>> ClientBufferMap; + typedef std::map<int32_t, scoped_refptr<ClientBuffer>> ClientBufferMap; ClientBufferMap client_buffers_; - typedef std::map<int32, scoped_refptr<ClientBuffer2>> ClientBuffer2Map; + typedef std::map<int32_t, scoped_refptr<ClientBuffer2>> ClientBuffer2Map; ClientBuffer2Map client_buffer2s_; ClientInfoMap clients_;
diff --git a/content/renderer/media/video_capture_impl_manager.h b/content/renderer/media/video_capture_impl_manager.h index a28904db2..ef1a168 100644 --- a/content/renderer/media/video_capture_impl_manager.h +++ b/content/renderer/media/video_capture_impl_manager.h
@@ -8,6 +8,7 @@ #include <map> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/renderer/media/video_capture_impl_manager_unittest.cc b/content/renderer/media/video_capture_impl_manager_unittest.cc index bec544a..3bb923e 100644 --- a/content/renderer/media/video_capture_impl_manager_unittest.cc +++ b/content/renderer/media/video_capture_impl_manager_unittest.cc
@@ -4,6 +4,7 @@ #include "base/bind.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h"
diff --git a/content/renderer/media/video_capture_impl_unittest.cc b/content/renderer/media/video_capture_impl_unittest.cc index 80bca695..1f0ad49a 100644 --- a/content/renderer/media/video_capture_impl_unittest.cc +++ b/content/renderer/media/video_capture_impl_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "base/message_loop/message_loop.h" #include "content/child/child_process.h"
diff --git a/content/renderer/media/video_capture_message_filter.h b/content/renderer/media/video_capture_message_filter.h index c8cb872..9088cd3 100644 --- a/content/renderer/media/video_capture_message_filter.h +++ b/content/renderer/media/video_capture_message_filter.h
@@ -10,8 +10,11 @@ #ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MESSAGE_FILTER_H_ #define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MESSAGE_FILTER_H_ +#include <stdint.h> + #include <map> +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "base/values.h" #include "content/common/content_export.h" @@ -68,7 +71,7 @@ // Called when the delegate has been added to filter's delegate list. // |device_id| is the device id for the delegate. - virtual void OnDelegateAdded(int32 device_id) = 0; + virtual void OnDelegateAdded(int32_t device_id) = 0; protected: virtual ~Delegate() {} @@ -95,7 +98,7 @@ ~VideoCaptureMessageFilter() override; private: - typedef std::map<int32, Delegate*> Delegates; + typedef std::map<int32_t, Delegate*> Delegates; // Receive a newly created buffer from browser process. void OnBufferCreated(int device_id, @@ -136,7 +139,7 @@ // A map of device ids to delegates. Delegates delegates_; Delegates pending_delegates_; - int32 last_device_id_; + int32_t last_device_id_; IPC::Sender* sender_;
diff --git a/content/renderer/media/video_capture_message_filter_unittest.cc b/content/renderer/media/video_capture_message_filter_unittest.cc index a3d4e903..edf0e60 100644 --- a/content/renderer/media/video_capture_message_filter_unittest.cc +++ b/content/renderer/media/video_capture_message_filter_unittest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/memory/shared_memory.h" #include "base/process/process_handle.h" +#include "build/build_config.h" #include "content/common/media/video_capture_messages.h" #include "content/renderer/media/video_capture_message_filter.h" #include "ipc/ipc_test_sink.h" @@ -52,7 +55,7 @@ MOCK_METHOD1(OnDeviceFormatsInUseReceived, void(const media::VideoCaptureFormats& formats_in_use)); - void OnDelegateAdded(int32 device_id) override { + void OnDelegateAdded(int32_t device_id) override { ASSERT_TRUE(device_id != 0); ASSERT_TRUE(device_id_ == 0); device_id_ = device_id;
diff --git a/content/renderer/media/video_track_adapter.cc b/content/renderer/media/video_track_adapter.cc index 46cd40e45f..9f4e2ab 100644 --- a/content/renderer/media/video_track_adapter.cc +++ b/content/renderer/media/video_track_adapter.cc
@@ -11,6 +11,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/location.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" #include "base/trace_event/trace_event.h" @@ -490,7 +491,7 @@ void VideoTrackAdapter::CheckFramesReceivedOnIO( const OnMutedCallback& set_muted_state_callback, - uint64 old_frame_counter_snapshot) { + uint64_t old_frame_counter_snapshot) { DCHECK(io_task_runner_->BelongsToCurrentThread()); if (!monitoring_frame_rate_)
diff --git a/content/renderer/media/video_track_adapter.h b/content/renderer/media/video_track_adapter.h index a63b6e1..ddd73ef 100644 --- a/content/renderer/media/video_track_adapter.h +++ b/content/renderer/media/video_track_adapter.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_MEDIA_VIDEO_TRACK_ADAPTER_H_ #define CONTENT_RENDERER_MEDIA_VIDEO_TRACK_ADAPTER_H_ +#include <stdint.h> + #include <vector> #include "base/macros.h" @@ -84,7 +86,7 @@ // Compare |frame_counter_snapshot| with the current |frame_counter_|, and // inform of the situation (muted, not muted) via |set_muted_state_callback|. void CheckFramesReceivedOnIO(const OnMutedCallback& set_muted_state_callback, - uint64 old_frame_counter_snapshot); + uint64_t old_frame_counter_snapshot); // |thread_checker_| is bound to the main render thread. base::ThreadChecker thread_checker_; @@ -112,7 +114,7 @@ bool muted_state_; // Running frame counter, accessed on the IO-thread. - uint64 frame_counter_; + uint64_t frame_counter_; // Frame rate configured on the video source, accessed on the IO-thread. float source_frame_rate_;
diff --git a/content/renderer/media/video_track_recorder.cc b/content/renderer/media/video_track_recorder.cc index a33d44d..21b563d 100644 --- a/content/renderer/media/video_track_recorder.cc +++ b/content/renderer/media/video_track_recorder.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/sys_info.h" #include "base/threading/thread.h" #include "base/time/time.h"
diff --git a/content/renderer/media/video_track_recorder_unittest.cc b/content/renderer/media/video_track_recorder_unittest.cc index ddddf2bb..6605bb6 100644 --- a/content/renderer/media/video_track_recorder_unittest.cc +++ b/content/renderer/media/video_track_recorder_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/location.h" #include "base/macros.h"
diff --git a/content/renderer/media/video_track_to_pepper_adapter.cc b/content/renderer/media/video_track_to_pepper_adapter.cc index 6a5947d3..c59155f 100644 --- a/content/renderer/media/video_track_to_pepper_adapter.cc +++ b/content/renderer/media/video_track_to_pepper_adapter.cc
@@ -7,6 +7,7 @@ #include <string> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" #include "base/trace_event/trace_event.h"
diff --git a/content/renderer/media/video_track_to_pepper_adapter.h b/content/renderer/media/video_track_to_pepper_adapter.h index 424c901..fc78de97 100644 --- a/content/renderer/media/video_track_to_pepper_adapter.h +++ b/content/renderer/media/video_track_to_pepper_adapter.h
@@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/content/renderer/media/webaudio_capturer_source.h b/content/renderer/media/webaudio_capturer_source.h index 1e682576a..b0ee262 100644 --- a/content/renderer/media/webaudio_capturer_source.h +++ b/content/renderer/media/webaudio_capturer_source.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBAUDIO_CAPTURER_SOURCE_H_ #define CONTENT_RENDERER_MEDIA_WEBAUDIO_CAPTURER_SOURCE_H_ +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h"
diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc index 6173f06..392d20e 100644 --- a/content/renderer/media/webmediaplayer_ms.cc +++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -4,11 +4,14 @@ #include "content/renderer/media/webmediaplayer_ms.h" +#include <stddef.h> + #include <limits> #include <string> #include "base/bind.h" #include "base/callback.h" +#include "build/build_config.h" #include "cc/blink/context_provider_web_context.h" #include "cc/blink/web_layer_impl.h" #include "cc/layers/video_frame_provider_client_impl.h"
diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h index bfeaff4..24b2d6b 100644 --- a/content/renderer/media/webmediaplayer_ms.h +++ b/content/renderer/media/webmediaplayer_ms.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h"
diff --git a/content/renderer/media/webmediaplayer_ms_compositor.cc b/content/renderer/media/webmediaplayer_ms_compositor.cc index 095f548..ae58a3e 100644 --- a/content/renderer/media/webmediaplayer_ms_compositor.cc +++ b/content/renderer/media/webmediaplayer_ms_compositor.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/webmediaplayer_ms_compositor.h" +#include <stdint.h> + #include "base/command_line.h" #include "base/hash.h" #include "base/single_thread_task_runner.h" @@ -59,7 +61,7 @@ // GPU Process crashed. bitmap.eraseColor(SK_ColorTRANSPARENT); } - libyuv::ARGBToI420(reinterpret_cast<uint8*>(bitmap.getPixels()), + libyuv::ARGBToI420(reinterpret_cast<uint8_t*>(bitmap.getPixels()), bitmap.rowBytes(), new_frame->data(media::VideoFrame::kYPlane), new_frame->stride(media::VideoFrame::kYPlane), @@ -124,7 +126,7 @@ } // Just for logging purpose. - const uint32 hash_value = base::Hash(url.string().utf8()); + const uint32_t hash_value = base::Hash(url.string().utf8()); serial_ = (hash_value << 1) | (remote_video ? 1 : 0); }
diff --git a/content/renderer/media/webmediaplayer_ms_compositor.h b/content/renderer/media/webmediaplayer_ms_compositor.h index 28adb03..884a003 100644 --- a/content/renderer/media/webmediaplayer_ms_compositor.h +++ b/content/renderer/media/webmediaplayer_ms_compositor.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H +#include <stddef.h> + #include <map> #include <vector>
diff --git a/content/renderer/media/webmediaplayer_ms_unittest.cc b/content/renderer/media/webmediaplayer_ms_unittest.cc index 5169505..af4cf20d 100644 --- a/content/renderer/media/webmediaplayer_ms_unittest.cc +++ b/content/renderer/media/webmediaplayer_ms_unittest.cc
@@ -1,6 +1,9 @@ // Copyright 2015 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. + +#include <stddef.h> + #include "content/public/renderer/media_stream_renderer_factory.h" #include "content/renderer/media/webmediaplayer_ms.h" #include "content/renderer/media/webmediaplayer_ms_compositor.h"
diff --git a/content/renderer/media/webrtc/media_stream_remote_audio_track.cc b/content/renderer/media/webrtc/media_stream_remote_audio_track.cc index 7a0b52f..179a1fd 100644 --- a/content/renderer/media/webrtc/media_stream_remote_audio_track.cc +++ b/content/renderer/media/webrtc/media_stream_remote_audio_track.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/webrtc/media_stream_remote_audio_track.h" +#include <stddef.h> + #include <list> #include "base/logging.h"
diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.cc b/content/renderer/media/webrtc/media_stream_remote_video_source.cc index b8013f3..05cc12a 100644 --- a/content/renderer/media/webrtc/media_stream_remote_video_source.cc +++ b/content/renderer/media/webrtc/media_stream_remote_video_source.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/webrtc/media_stream_remote_video_source.h" +#include <stdint.h> + #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h"
diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.h b/content/renderer/media/webrtc/media_stream_remote_video_source.h index 0c4f44a..1f24c75b 100644 --- a/content/renderer/media/webrtc/media_stream_remote_video_source.h +++ b/content/renderer/media/webrtc/media_stream_remote_video_source.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_REMOTE_VIDEO_SOURCE_H_ #define CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_REMOTE_VIDEO_SOURCE_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" #include "content/common/content_export.h"
diff --git a/content/renderer/media/webrtc/media_stream_track_metrics.cc b/content/renderer/media/webrtc/media_stream_track_metrics.cc index 0ec4444..3353692 100644 --- a/content/renderer/media/webrtc/media_stream_track_metrics.cc +++ b/content/renderer/media/webrtc/media_stream_track_metrics.cc
@@ -366,9 +366,9 @@ } } -uint64 MediaStreamTrackMetrics::MakeUniqueIdImpl(uint64 pc_id, - const std::string& track_id, - StreamType stream_type) { +uint64_t MediaStreamTrackMetrics::MakeUniqueIdImpl(uint64_t pc_id, + const std::string& track_id, + StreamType stream_type) { // We use a hash over the |track| pointer and the PeerConnection ID, // plus a boolean flag indicating whether the track is remote (since // you might conceivably have a remote track added back as a sent @@ -389,15 +389,14 @@ base::MD5Digest digest; base::MD5Final(&digest, &ctx); - static_assert(sizeof(digest.a) > sizeof(uint64), "need a bigger digest"); - return *reinterpret_cast<uint64*>(digest.a); + static_assert(sizeof(digest.a) > sizeof(uint64_t), "need a bigger digest"); + return *reinterpret_cast<uint64_t*>(digest.a); } -uint64 MediaStreamTrackMetrics::MakeUniqueId(const std::string& track_id, - StreamType stream_type) { +uint64_t MediaStreamTrackMetrics::MakeUniqueId(const std::string& track_id, + StreamType stream_type) { return MakeUniqueIdImpl( - reinterpret_cast<uint64>(reinterpret_cast<void*>(this)), - track_id, + reinterpret_cast<uint64_t>(reinterpret_cast<void*>(this)), track_id, stream_type); }
diff --git a/content/renderer/media/webrtc/media_stream_track_metrics.h b/content/renderer/media/webrtc/media_stream_track_metrics.h index aaf669d0..4f2cd0e 100644 --- a/content/renderer/media/webrtc/media_stream_track_metrics.h +++ b/content/renderer/media/webrtc/media_stream_track_metrics.h
@@ -5,7 +5,8 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_TRACK_METRICS_H_ #define CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_TRACK_METRICS_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/memory/scoped_vector.h" #include "base/threading/non_thread_safe.h" #include "content/common/content_export.h" @@ -81,14 +82,14 @@ // |this| pointer to a 64-bit integer, which is usable as a unique // ID for the PeerConnection this object is attached to (since there // is a one-to-one relationship). - uint64 MakeUniqueIdImpl(uint64 pc_id, - const std::string& track, - StreamType stream_type); + uint64_t MakeUniqueIdImpl(uint64_t pc_id, + const std::string& track, + StreamType stream_type); private: // Make a unique ID for the given track, that is valid while the // track object and the PeerConnection it is attached to both exist. - uint64 MakeUniqueId(const std::string& track, StreamType stream_type); + uint64_t MakeUniqueId(const std::string& track, StreamType stream_type); typedef ScopedVector<MediaStreamTrackMetricsObserver> ObserverVector; ObserverVector observers_;
diff --git a/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc b/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc index df840835..8f10d55 100644 --- a/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc +++ b/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h"
diff --git a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc index 1f8f475..1e1d749c 100644 --- a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc +++ b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h" +#include <stddef.h> + #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "content/renderer/media/mock_peer_connection_impl.h"
diff --git a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h index 0b015034..c3b7835 100644 --- a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h +++ b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" #include "third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.h" #include "third_party/libjingle/source/talk/media/base/videorenderer.h"
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc index 465bb4b..cfd82f5 100644 --- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc +++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
@@ -4,16 +4,20 @@ #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" +#include <stddef.h> + #include <utility> #include <vector> #include "base/command_line.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" +#include "build/build_config.h" #include "content/common/media/media_stream_messages.h" #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h"
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.h b/content/renderer/media/webrtc/peer_connection_dependency_factory.h index def4738..a5bdb34 100644 --- a/content/renderer/media/webrtc/peer_connection_dependency_factory.h +++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/files/file.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread.h" #include "content/common/content_export.h"
diff --git a/content/renderer/media/webrtc/track_observer.h b/content/renderer/media/webrtc/track_observer.h index 0a39805b..c0a6ad42 100644 --- a/content/renderer/media/webrtc/track_observer.h +++ b/content/renderer/media/webrtc/track_observer.h
@@ -6,6 +6,7 @@ #define CONTENT_RENDERER_MEDIA_WEBRTC_TRACK_OBSERVER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/single_thread_task_runner.h" #include "content/common/content_export.h"
diff --git a/content/renderer/media/webrtc/webrtc_audio_sink_adapter.cc b/content/renderer/media/webrtc/webrtc_audio_sink_adapter.cc index 914f704..715309e7 100644 --- a/content/renderer/media/webrtc/webrtc_audio_sink_adapter.cc +++ b/content/renderer/media/webrtc/webrtc_audio_sink_adapter.cc
@@ -45,7 +45,7 @@ params_ = params; const int num_pcm16_data_elements = params_.frames_per_buffer() * params_.channels(); - interleaved_data_.reset(new int16[num_pcm16_data_elements]); + interleaved_data_.reset(new int16_t[num_pcm16_data_elements]); } } // namespace content
diff --git a/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h b/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h index 3b837a31..4e70d19 100644 --- a/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h +++ b/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_AUDIO_SINK_ADAPTER_H_ #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_AUDIO_SINK_ADAPTER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/renderer/media_stream_audio_sink.h" #include "media/audio/audio_parameters.h" @@ -37,7 +40,7 @@ webrtc::AudioTrackSinkInterface* const sink_; media::AudioParameters params_; - scoped_ptr<int16[]> interleaved_data_; + scoped_ptr<int16_t[]> interleaved_data_; DISALLOW_COPY_AND_ASSIGN(WebRtcAudioSinkAdapter); };
diff --git a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc index ea13f14..6a8f6db 100644 --- a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc +++ b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "content/renderer/media/mock_media_constraint_factory.h" #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h" #include "content/renderer/media/webrtc_audio_capturer.h"
diff --git a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc index 6e4ca3f..d23cfa9 100644 --- a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc +++ b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "content/child/child_process.h"
diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc index 4e5dd05f..c3b407b4 100644 --- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc +++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
@@ -49,7 +49,7 @@ captured_frame_.rotation = webrtc::kVideoRotation_0; captured_frame_.data = NULL; captured_frame_.data_size = cricket::CapturedFrame::kUnknownDataSize; - captured_frame_.fourcc = static_cast<uint32>(cricket::FOURCC_ANY); + captured_frame_.fourcc = static_cast<uint32_t>(cricket::FOURCC_ANY); frame_ = frame; } @@ -183,7 +183,7 @@ } bool WebRtcVideoCapturerAdapter::GetPreferredFourccs( - std::vector<uint32>* fourccs) { + std::vector<uint32_t>* fourccs) { DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!fourccs || fourccs->empty()); if (fourccs)
diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h index c16b5b0..92293540 100644 --- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h +++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h
@@ -5,9 +5,12 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_ #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_ +#include <stdint.h> + #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "content/common/content_export.h" #include "media/base/video_capture_types.h" @@ -42,7 +45,7 @@ const cricket::VideoFormat& capture_format) override; void Stop() override; bool IsRunning() override; - bool GetPreferredFourccs(std::vector<uint32>* fourccs) override; + bool GetPreferredFourccs(std::vector<uint32_t>* fourccs) override; bool GetBestCaptureFormat(const cricket::VideoFormat& desired, cricket::VideoFormat* best_format) override; bool IsScreencast() const override;
diff --git a/content/renderer/media/webrtc/webrtc_video_frame_adapter.h b/content/renderer/media/webrtc/webrtc_video_frame_adapter.h index 79287949..61555d03 100644 --- a/content/renderer/media/webrtc/webrtc_video_frame_adapter.h +++ b/content/renderer/media/webrtc/webrtc_video_frame_adapter.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_ #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_FRAME_ADAPTER_H_ +#include <stdint.h> + #include "media/base/video_frame.h" #include "third_party/webrtc/common_video/include/video_frame_buffer.h"
diff --git a/content/renderer/media/webrtc_audio_capturer.cc b/content/renderer/media/webrtc_audio_capturer.cc index f6605eb..113233e 100644 --- a/content/renderer/media/webrtc_audio_capturer.cc +++ b/content/renderer/media/webrtc_audio_capturer.cc
@@ -6,9 +6,11 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "content/child/child_process.h" #include "content/renderer/media/audio_device_factory.h" #include "content/renderer/media/media_stream_audio_processor.h"
diff --git a/content/renderer/media/webrtc_audio_capturer.h b/content/renderer/media/webrtc_audio_capturer.h index df566c0..afa5f9e 100644 --- a/content/renderer/media/webrtc_audio_capturer.h +++ b/content/renderer/media/webrtc_audio_capturer.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h"
diff --git a/content/renderer/media/webrtc_audio_capturer_unittest.cc b/content/renderer/media/webrtc_audio_capturer_unittest.cc index 92d291f..306ca98 100644 --- a/content/renderer/media/webrtc_audio_capturer_unittest.cc +++ b/content/renderer/media/webrtc_audio_capturer_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" +#include "build/build_config.h" #include "content/public/renderer/media_stream_audio_sink.h" #include "content/renderer/media/mock_media_constraint_factory.h" #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc index 8931f75..9ee3da7 100644 --- a/content/renderer/media/webrtc_audio_device_impl.cc +++ b/content/renderer/media/webrtc_audio_device_impl.cc
@@ -90,7 +90,7 @@ // webrtc::AudioTransport source. Keep reading until our internal buffer // is full. int accumulated_audio_frames = 0; - int16* audio_data = &render_buffer_[0]; + int16_t* audio_data = &render_buffer_[0]; while (accumulated_audio_frames < audio_bus->frames()) { // Get 10ms and append output to temporary byte buffer. int64_t elapsed_time_ms = -1;
diff --git a/content/renderer/media/webrtc_audio_device_impl.h b/content/renderer/media/webrtc_audio_device_impl.h index e9e9d856..a3bbf6b 100644 --- a/content/renderer/media/webrtc_audio_device_impl.h +++ b/content/renderer/media/webrtc_audio_device_impl.h
@@ -5,13 +5,15 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_IMPL_H_ #define CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_IMPL_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" @@ -402,7 +404,7 @@ // Buffer used for temporary storage during render callback. // It is only accessed by the audio render thread. - std::vector<int16> render_buffer_; + std::vector<int16_t> render_buffer_; DISALLOW_COPY_AND_ASSIGN(WebRtcAudioDeviceImpl); };
diff --git a/content/renderer/media/webrtc_audio_device_not_impl.h b/content/renderer/media/webrtc_audio_device_not_impl.h index 1ba1b078..e755b61 100644 --- a/content/renderer/media/webrtc_audio_device_not_impl.h +++ b/content/renderer/media/webrtc_audio_device_not_impl.h
@@ -5,8 +5,10 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_NOT_IMPL_H_ #define CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_NOT_IMPL_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "content/common/content_export.h" #include "third_party/webrtc/modules/audio_device/include/audio_device.h"
diff --git a/content/renderer/media/webrtc_audio_renderer.cc b/content/renderer/media/webrtc_audio_renderer.cc index 9714b237..5b48a37 100644 --- a/content/renderer/media/webrtc_audio_renderer.cc +++ b/content/renderer/media/webrtc_audio_renderer.cc
@@ -8,6 +8,7 @@ #include "base/metrics/histogram.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "content/renderer/media/audio_device_factory.h" #include "content/renderer/media/media_stream_audio_track.h" #include "content/renderer/media/media_stream_dispatcher.h"
diff --git a/content/renderer/media/webrtc_audio_renderer.h b/content/renderer/media/webrtc_audio_renderer.h index 1502fb9..29d02fba 100644 --- a/content/renderer/media/webrtc_audio_renderer.h +++ b/content/renderer/media/webrtc_audio_renderer.h
@@ -5,10 +5,13 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_RENDERER_H_ #define CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_RENDERER_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h"
diff --git a/content/renderer/media/webrtc_audio_renderer_unittest.cc b/content/renderer/media/webrtc_audio_renderer_unittest.cc index 14680883..8260874 100644 --- a/content/renderer/media/webrtc_audio_renderer_unittest.cc +++ b/content/renderer/media/webrtc_audio_renderer_unittest.cc
@@ -7,6 +7,7 @@ #include "base/run_loop.h" #include "base/single_thread_task_runner.h" +#include "build/build_config.h" #include "content/public/renderer/media_stream_audio_renderer.h" #include "content/renderer/media/audio_device_factory.h" #include "content/renderer/media/audio_message_filter.h"
diff --git a/content/renderer/media/webrtc_identity_service.h b/content/renderer/media/webrtc_identity_service.h index 33bbfb2..6092f8a 100644 --- a/content/renderer/media/webrtc_identity_service.h +++ b/content/renderer/media/webrtc_identity_service.h
@@ -8,8 +8,8 @@ #include <deque> #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "content/common/media/webrtc_identity_messages.h" #include "content/public/renderer/render_process_observer.h"
diff --git a/content/renderer/media/webrtc_local_audio_renderer.h b/content/renderer/media/webrtc_local_audio_renderer.h index 6a06984..d33c384 100644 --- a/content/renderer/media/webrtc_local_audio_renderer.h +++ b/content/renderer/media/webrtc_local_audio_renderer.h
@@ -5,10 +5,13 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_RENDERER_H_ #define CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_RENDERER_H_ +#include <stdint.h> + #include <string> #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h"
diff --git a/content/renderer/media/webrtc_local_audio_source_provider.h b/content/renderer/media/webrtc_local_audio_source_provider.h index 12c51d0..9a9cc8e 100644 --- a/content/renderer/media/webrtc_local_audio_source_provider.h +++ b/content/renderer/media/webrtc_local_audio_source_provider.h
@@ -5,8 +5,11 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_SOURCE_PROVIDER_H_ #define CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_SOURCE_PROVIDER_H_ +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h"
diff --git a/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc b/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc index e921bc9..28acddd 100644 --- a/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc +++ b/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "content/renderer/media/mock_media_constraint_factory.h"
diff --git a/content/renderer/media/webrtc_local_audio_track.cc b/content/renderer/media/webrtc_local_audio_track.cc index 26a88bd..cb48668e 100644 --- a/content/renderer/media/webrtc_local_audio_track.cc +++ b/content/renderer/media/webrtc_local_audio_track.cc
@@ -4,6 +4,8 @@ #include "content/renderer/media/webrtc_local_audio_track.h" +#include <stdint.h> + #include <limits> #include "content/public/renderer/media_stream_audio_sink.h" @@ -60,13 +62,14 @@ // post-processed data that may be all zeros even though the signal contained // energy before the processing. In this case, report nonzero energy even if // the energy of the data in |audio_bus| is zero. - const float minimum_signal_level = force_report_nonzero_energy ? - 1.0f / std::numeric_limits<int16>::max() : 0.0f; + const float minimum_signal_level = + force_report_nonzero_energy ? 1.0f / std::numeric_limits<int16_t>::max() + : 0.0f; const float signal_level = std::max( minimum_signal_level, std::min(1.0f, level_calculator_->Calculate(audio_bus))); const int signal_level_as_pcm16 = - static_cast<int>(signal_level * std::numeric_limits<int16>::max() + + static_cast<int>(signal_level * std::numeric_limits<int16_t>::max() + 0.5f /* rounding to nearest int */); adapter_->SetSignalLevel(signal_level_as_pcm16);
diff --git a/content/renderer/media/webrtc_local_audio_track.h b/content/renderer/media/webrtc_local_audio_track.h index a4dd9ed..2eafbd1 100644 --- a/content/renderer/media/webrtc_local_audio_track.h +++ b/content/renderer/media/webrtc_local_audio_track.h
@@ -8,6 +8,7 @@ #include <list> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h"
diff --git a/content/renderer/media/webrtc_local_audio_track_unittest.cc b/content/renderer/media/webrtc_local_audio_track_unittest.cc index f09ee8b..feb1dbc 100644 --- a/content/renderer/media/webrtc_local_audio_track_unittest.cc +++ b/content/renderer/media/webrtc_local_audio_track_unittest.cc
@@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" +#include "build/build_config.h" #include "content/public/renderer/media_stream_audio_sink.h" #include "content/renderer/media/media_stream_audio_source.h" #include "content/renderer/media/mock_media_constraint_factory.h"
diff --git a/content/renderer/media/webrtc_uma_histograms.h b/content/renderer/media/webrtc_uma_histograms.h index 74fd401..39e703c 100644 --- a/content/renderer/media/webrtc_uma_histograms.h +++ b/content/renderer/media/webrtc_uma_histograms.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_UMA_HISTOGRAMS_H_ #define CONTENT_RENDERER_MEDIA_WEBRTC_UMA_HISTOGRAMS_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/threading/non_thread_safe.h" #include "content/common/content_export.h"
diff --git a/content/renderer/memory_benchmarking_extension.cc b/content/renderer/memory_benchmarking_extension.cc index 391dcf77..be554c3 100644 --- a/content/renderer/memory_benchmarking_extension.cc +++ b/content/renderer/memory_benchmarking_extension.cc
@@ -4,6 +4,7 @@ #include "content/renderer/memory_benchmarking_extension.h" +#include "build/build_config.h" #include "content/common/memory_benchmark_messages.h" #include "content/public/renderer/chrome_object_extensions_utils.h" #include "content/renderer/render_thread_impl.h"
diff --git a/content/renderer/memory_benchmarking_extension.h b/content/renderer/memory_benchmarking_extension.h index afbaf24b..af7f4f2 100644 --- a/content/renderer/memory_benchmarking_extension.h +++ b/content/renderer/memory_benchmarking_extension.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_MEMORY_BENCHMARKING_EXTENSION_H_ #define CONTENT_RENDERER_MEMORY_BENCHMARKING_EXTENSION_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "gin/wrappable.h" namespace blink {
diff --git a/content/renderer/menu_item_builder.cc b/content/renderer/menu_item_builder.cc index 7db3592..d6507d86 100644 --- a/content/renderer/menu_item_builder.cc +++ b/content/renderer/menu_item_builder.cc
@@ -4,6 +4,8 @@ #include "content/renderer/menu_item_builder.h" +#include <stddef.h> + #include "content/public/common/menu_item.h" namespace content {
diff --git a/content/renderer/mojo/service_registry_js_wrapper.h b/content/renderer/mojo/service_registry_js_wrapper.h index 2be7f95..73046862 100644 --- a/content/renderer/mojo/service_registry_js_wrapper.h +++ b/content/renderer/mojo/service_registry_js_wrapper.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "content/common/content_export.h" #include "gin/handle.h" #include "gin/object_template_builder.h"
diff --git a/content/renderer/mojo_context_state.cc b/content/renderer/mojo_context_state.cc index 27de0721..2d3bdea 100644 --- a/content/renderer/mojo_context_state.cc +++ b/content/renderer/mojo_context_state.cc
@@ -4,6 +4,8 @@ #include "content/renderer/mojo_context_state.h" +#include <stddef.h> + #include "base/bind.h" #include "base/stl_util.h" #include "content/public/renderer/render_frame.h"
diff --git a/content/renderer/mouse_lock_dispatcher.h b/content/renderer/mouse_lock_dispatcher.h index 29b8e4f1..546088e 100644 --- a/content/renderer/mouse_lock_dispatcher.h +++ b/content/renderer/mouse_lock_dispatcher.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_MOUSE_LOCK_DISPATCHER_H_ #define CONTENT_RENDERER_MOUSE_LOCK_DISPATCHER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/common/content_export.h" namespace blink {
diff --git a/content/renderer/mus/render_widget_window_tree_client_factory.cc b/content/renderer/mus/render_widget_window_tree_client_factory.cc index f2d1402..4bc5805 100644 --- a/content/renderer/mus/render_widget_window_tree_client_factory.cc +++ b/content/renderer/mus/render_widget_window_tree_client_factory.cc
@@ -4,6 +4,8 @@ #include "content/renderer/mus/render_widget_window_tree_client_factory.h" +#include <stdint.h> + #include "base/logging.h" #include "base/macros.h" #include "components/mus/public/interfaces/window_tree.mojom.h"
diff --git a/content/renderer/navigation_state_impl.h b/content/renderer/navigation_state_impl.h index 07b7688..0a7d772 100644 --- a/content/renderer/navigation_state_impl.h +++ b/content/renderer/navigation_state_impl.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "content/common/navigation_params.h" #include "content/public/renderer/navigation_state.h"
diff --git a/content/renderer/notification_permission_dispatcher.h b/content/renderer/notification_permission_dispatcher.h index bb3430f..df23dee1 100644 --- a/content/renderer/notification_permission_dispatcher.h +++ b/content/renderer/notification_permission_dispatcher.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_NOTIFICATION_PERMISSION_DISPATCHER_H_ #define CONTENT_RENDERER_NOTIFICATION_PERMISSION_DISPATCHER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/common/permission_service.mojom.h" #include "content/public/renderer/render_frame_observer.h"
diff --git a/content/renderer/npapi/plugin_channel_host.cc b/content/renderer/npapi/plugin_channel_host.cc index d552ff8..3f9eaf9 100644 --- a/content/renderer/npapi/plugin_channel_host.cc +++ b/content/renderer/npapi/plugin_channel_host.cc
@@ -4,8 +4,11 @@ #include "content/renderer/npapi/plugin_channel_host.h" +#include <stddef.h> + #include "base/metrics/histogram.h" #include "base/time/time.h" +#include "build/build_config.h" #include "content/child/child_process.h" #include "content/child/npapi/npobject_base.h" #include "content/child/plugin_messages.h"
diff --git a/content/renderer/npapi/plugin_channel_host.h b/content/renderer/npapi/plugin_channel_host.h index 6c6f8e259..8494f640 100644 --- a/content/renderer/npapi/plugin_channel_host.h +++ b/content/renderer/npapi/plugin_channel_host.h
@@ -6,6 +6,8 @@ #define CONTENT_RENDERER_NPAPI_PLUGIN_CHANNEL_HOST_H_ #include "base/containers/hash_tables.h" +#include "base/macros.h" +#include "build/build_config.h" #include "content/child/npapi/np_channel_base.h" #include "ipc/ipc_channel_handle.h"
diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc index a77e844..8f43e6b 100644 --- a/content/renderer/npapi/webplugin_delegate_proxy.cc +++ b/content/renderer/npapi/webplugin_delegate_proxy.cc
@@ -4,13 +4,15 @@ #include "content/renderer/npapi/webplugin_delegate_proxy.h" +#include <stddef.h> + #include <algorithm> #include "base/auto_reset.h" -#include "base/basictypes.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/process/process.h" @@ -18,6 +20,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/version.h" +#include "build/build_config.h" #include "cc/resources/shared_bitmap.h" #include "content/child/child_process.h" #include "content/child/child_shared_bitmap_manager.h" @@ -110,8 +113,8 @@ void DidReceiveResponse(const std::string& mime_type, const std::string& headers, - uint32 expected_length, - uint32 last_modified, + uint32_t expected_length, + uint32_t last_modified, bool request_is_seekable) override { DCHECK(channel_.get() != NULL); PluginMsg_DidReceiveResponseParams params; @@ -493,11 +496,12 @@ // window_rect becomes either a window in native windowing system // coords, or a backing buffer. In either case things will go bad // if the rectangle is very large. - if (window_rect.width() < 0 || window_rect.width() > kMaxPluginSideLength || + if (window_rect.width() < 0 || window_rect.width() > kMaxPluginSideLength || window_rect.height() < 0 || window_rect.height() > kMaxPluginSideLength || // We know this won't overflow due to above checks. - static_cast<uint32>(window_rect.width()) * - static_cast<uint32>(window_rect.height()) > kMaxPluginSize) { + static_cast<uint32_t>(window_rect.width()) * + static_cast<uint32_t>(window_rect.height()) > + kMaxPluginSize) { return; } @@ -552,7 +556,7 @@ } bool WebPluginDelegateProxy::CreateLocalBitmap( - std::vector<uint8>* memory, + std::vector<uint8_t>* memory, scoped_ptr<skia::PlatformCanvas>* canvas) { const size_t size = BitmapSizeForPluginRect(plugin_rect_); memory->resize(size); @@ -942,10 +946,10 @@ skia::PlatformCanvasStrideForWidth(plugin_rect_.width()); const size_t chunk_size = 4 * rect.width(); DCHECK(back_buffer_bitmap() != NULL); - uint8* source_data = + uint8_t* source_data = back_buffer_bitmap()->pixels() + rect.y() * stride + 4 * rect.x(); DCHECK(front_buffer_bitmap() != NULL); - uint8* target_data = + uint8_t* target_data = front_buffer_bitmap()->pixels() + rect.y() * stride + 4 * rect.x(); for (int row = 0; row < rect.height(); ++row) { memcpy(target_data, source_data, chunk_size); @@ -1037,9 +1041,9 @@ } void WebPluginDelegateProxy::OnAcceleratedPluginAllocatedIOSurface( - int32 width, - int32 height, - uint32 surface_id) { + int32_t width, + int32_t height, + uint32_t surface_id) { if (plugin_) plugin_->AcceleratedPluginAllocatedIOSurface(width, height, surface_id); }
diff --git a/content/renderer/npapi/webplugin_delegate_proxy.h b/content/renderer/npapi/webplugin_delegate_proxy.h index ad9a66b8..62fa840 100644 --- a/content/renderer/npapi/webplugin_delegate_proxy.h +++ b/content/renderer/npapi/webplugin_delegate_proxy.h
@@ -5,13 +5,17 @@ #ifndef CONTENT_RENDERER_NPAPI_WEBPLUGIN_DELEGATE_PROXY_H_ #define CONTENT_RENDERER_NPAPI_WEBPLUGIN_DELEGATE_PROXY_H_ +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner_helpers.h" +#include "build/build_config.h" #include "content/child/npapi/webplugin_delegate.h" #include "content/public/common/webplugininfo.h" #include "ipc/ipc_listener.h" @@ -153,9 +157,9 @@ void OnStartIme(); // Accelerated (Core Animation) plugin implementation. void OnAcceleratedPluginEnabledRendering(); - void OnAcceleratedPluginAllocatedIOSurface(int32 width, - int32 height, - uint32 surface_id); + void OnAcceleratedPluginAllocatedIOSurface(int32_t width, + int32_t height, + uint32_t surface_id); void OnAcceleratedPluginSwappedIOSurface(); #endif #if defined(OS_WIN) @@ -204,7 +208,7 @@ #if !defined(OS_WIN) // Creates a process-local memory section and canvas. PlatformCanvas on // Windows only works with a DIB, not arbitrary memory. - bool CreateLocalBitmap(std::vector<uint8>* memory, + bool CreateLocalBitmap(std::vector<uint8_t>* memory, scoped_ptr<SkCanvas>* canvas); #endif
diff --git a/content/renderer/npapi/webplugin_impl.cc b/content/renderer/npapi/webplugin_impl.cc index 1c9c7981..f5b0273 100644 --- a/content/renderer/npapi/webplugin_impl.cc +++ b/content/renderer/npapi/webplugin_impl.cc
@@ -16,6 +16,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "cc/blink/web_layer_impl.h" #include "cc/layers/io_surface_layer.h" #include "content/child/appcache/web_application_cache_host_impl.h" @@ -113,7 +114,7 @@ // response. void didReceiveResponse(WebURLLoader*, const WebURLResponse& response) override { - int64 byte_range_upper_bound, instance_size; + int64_t byte_range_upper_bound, instance_size; if (!MultipartResponseDelegate::ReadContentRanges( response, &byte_range_lower_bound_, @@ -143,7 +144,7 @@ private: // The lower bound of the byte range. - int64 byte_range_lower_bound_; + int64_t byte_range_lower_bound_; // The handler for the data. WebPluginResourceClient* resource_client_; }; @@ -189,8 +190,8 @@ struct ResponseInfo { GURL url; std::string mime_type; - uint32 last_modified; - uint32 expected_length; + uint32_t last_modified; + uint32_t expected_length; }; void GetResponseInfo(const WebURLResponse& response, @@ -200,13 +201,13 @@ // Measured in seconds since 12:00 midnight GMT, January 1, 1970. response_info->last_modified = - static_cast<uint32>(response.lastModifiedDate()); + static_cast<uint32_t>(response.lastModifiedDate()); // If the length comes in as -1, then it indicates that it was not // read off the HTTP headers. We replicate Safari webkit behavior here, // which is to set it to 0. response_info->expected_length = - static_cast<uint32>(std::max(response.expectedContentLength(), 0LL)); + static_cast<uint32_t>(std::max(response.expectedContentLength(), 0LL)); WebString content_encoding = response.httpHeaderField(WebString::fromUTF8("Content-Encoding")); @@ -230,7 +231,7 @@ linked_ptr<blink::WebURLLoader> loader; bool notify_redirects; bool is_plugin_src_load; - int64 data_offset; + int64_t data_offset; }; bool WebPluginImpl::initialize(WebPluginContainer* container) { @@ -568,8 +569,8 @@ } bool WebPluginImpl::SetPostData(WebURLRequest* request, - const char *buf, - uint32 length) { + const char* buf, + uint32_t length) { std::vector<std::string> names; std::vector<std::string> values; std::vector<char> body; @@ -778,9 +779,9 @@ void WebPluginImpl::AcceleratedPluginEnabledRendering() { } -void WebPluginImpl::AcceleratedPluginAllocatedIOSurface(int32 width, - int32 height, - uint32 surface_id) { +void WebPluginImpl::AcceleratedPluginAllocatedIOSurface(int32_t width, + int32_t height, + uint32_t surface_id) { next_io_surface_allocated_ = true; next_io_surface_width_ = width; next_io_surface_height_ = height;
diff --git a/content/renderer/npapi/webplugin_impl.h b/content/renderer/npapi/webplugin_impl.h index 39e3226..a7408cb6 100644 --- a/content/renderer/npapi/webplugin_impl.h +++ b/content/renderer/npapi/webplugin_impl.h
@@ -5,14 +5,18 @@ #ifndef CONTENT_RENDERER_NPAPI_WEBPLUGIN_IMPL_H_ #define CONTENT_RENDERER_NPAPI_WEBPLUGIN_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "content/child/npapi/webplugin.h" #include "content/common/content_export.h" #include "content/common/webplugin_geometry.h" @@ -62,7 +66,7 @@ // Helper function for sorting post data. CONTENT_EXPORT static bool SetPostData(blink::WebURLRequest* request, const char* buf, - uint32 length); + uint32_t length); blink::WebFrame* webframe() { return webframe_; } @@ -124,9 +128,9 @@ WebPluginAcceleratedSurface* GetAcceleratedSurface( gfx::GpuPreference gpu_preference) override; void AcceleratedPluginEnabledRendering() override; - void AcceleratedPluginAllocatedIOSurface(int32 width, - int32 height, - uint32 surface_id) override; + void AcceleratedPluginAllocatedIOSurface(int32_t width, + int32_t height, + uint32_t surface_id) override; void AcceleratedPluginSwappedIOSurface() override; #endif @@ -231,9 +235,9 @@ gfx::PluginWindowHandle window_; #if defined(OS_MACOSX) bool next_io_surface_allocated_; - int32 next_io_surface_width_; - int32 next_io_surface_height_; - uint32 next_io_surface_id_; + int32_t next_io_surface_width_; + int32_t next_io_surface_height_; + uint32_t next_io_surface_id_; scoped_refptr<cc::IOSurfaceLayer> io_surface_layer_; scoped_ptr<blink::WebLayer> web_layer_; #endif
diff --git a/content/renderer/npapi/webplugin_impl_unittest.cc b/content/renderer/npapi/webplugin_impl_unittest.cc index 760c874..2cec6b82 100644 --- a/content/renderer/npapi/webplugin_impl_unittest.cc +++ b/content/renderer/npapi/webplugin_impl_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/strings/string_util.h" #include "content/renderer/npapi/webplugin_impl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -56,7 +59,7 @@ WebURLRequest request; request.initialize(); bool rv = WebPluginImpl::SetPostData(&request, ex1, - static_cast<uint32>(strlen(ex1))); + static_cast<uint32_t>(strlen(ex1))); EXPECT_TRUE(rv); EXPECT_EQ("bar", GetHeader(request, "foo")); EXPECT_EQ(0U, GetHeader(request, "bar").length()); @@ -70,7 +73,7 @@ WebURLRequest request; request.initialize(); bool rv = WebPluginImpl::SetPostData(&request, ex1, - static_cast<uint32>(strlen(ex1))); + static_cast<uint32_t>(strlen(ex1))); EXPECT_TRUE(rv); EXPECT_EQ(100U, GetHeader(request, "foo").length()); } @@ -81,7 +84,7 @@ WebURLRequest request; request.initialize(); bool rv = WebPluginImpl::SetPostData(&request, ex1, - static_cast<uint32>(strlen(ex1))); + static_cast<uint32_t>(strlen(ex1))); EXPECT_TRUE(rv); EXPECT_EQ("h1", GetHeader(request, "h1")); EXPECT_EQ("h2", GetHeader(request, "h2")); @@ -104,7 +107,7 @@ WebURLRequest request; request.initialize(); bool rv = WebPluginImpl::SetPostData(&request, ex1, - static_cast<uint32>(strlen(ex1))); + static_cast<uint32_t>(strlen(ex1))); EXPECT_TRUE(rv); } @@ -114,7 +117,7 @@ WebURLRequest request; request.initialize(); bool rv = WebPluginImpl::SetPostData(&request, ex1, - static_cast<uint32>(strlen(ex1))); + static_cast<uint32_t>(strlen(ex1))); EXPECT_TRUE(rv); EXPECT_EQ(0U, GetHeader(request, "foo").length()); EXPECT_EQ(0U, GetHeader(request, "bar").length()); @@ -128,7 +131,7 @@ WebURLRequest request; request.initialize(); bool rv = WebPluginImpl::SetPostData(&request, ex1, - static_cast<uint32>(strlen(ex1))); + static_cast<uint32_t>(strlen(ex1))); EXPECT_TRUE(rv); EXPECT_EQ("bar", GetHeader(request, "foo")); EXPECT_EQ(0U, GetHeader(request, "bar").length()); @@ -142,7 +145,7 @@ WebURLRequest request; request.initialize(); bool rv = WebPluginImpl::SetPostData(&request, ex1, - static_cast<uint32>(strlen(ex1))); + static_cast<uint32_t>(strlen(ex1))); EXPECT_TRUE(rv); EXPECT_EQ(GetBodyText(request), "\n\nabcdefg\n\nabcdefg"); } @@ -153,7 +156,7 @@ WebURLRequest request; request.initialize(); bool rv = WebPluginImpl::SetPostData(&request, ex1, - static_cast<uint32>(strlen(ex1))); + static_cast<uint32_t>(strlen(ex1))); EXPECT_TRUE(rv); } @@ -163,7 +166,7 @@ WebURLRequest request; request.initialize(); bool rv = WebPluginImpl::SetPostData(&request, ex1, - static_cast<uint32>(strlen(ex1))); + static_cast<uint32_t>(strlen(ex1))); EXPECT_TRUE(rv); } @@ -173,7 +176,7 @@ WebURLRequest request; request.initialize(); bool rv = WebPluginImpl::SetPostData(&request, ex1, - static_cast<uint32>(strlen(ex1))); + static_cast<uint32_t>(strlen(ex1))); EXPECT_TRUE(rv); EXPECT_EQ("bar", GetHeader(request, "foo")); EXPECT_EQ("body", GetBodyText(request)); @@ -185,7 +188,7 @@ WebURLRequest request; request.initialize(); bool rv = WebPluginImpl::SetPostData(&request, ex1, - static_cast<uint32>(strlen(ex1))); + static_cast<uint32_t>(strlen(ex1))); EXPECT_TRUE(rv); EXPECT_EQ("bar", GetHeader(request, "foo")); EXPECT_EQ(0U, GetHeader(request, "bar").length()); @@ -198,7 +201,7 @@ WebURLRequest request; request.initialize(); bool rv = WebPluginImpl::SetPostData(&request, ex1, - static_cast<uint32>(strlen(ex1))); + static_cast<uint32_t>(strlen(ex1))); EXPECT_TRUE(rv); EXPECT_EQ("bar", GetHeader(request, "foo")); EXPECT_EQ(0U, GetHeader(request, "bar").length());
diff --git a/content/renderer/p2p/empty_network_manager.h b/content/renderer/p2p/empty_network_manager.h index d53cc734..a256cb99 100644 --- a/content/renderer/p2p/empty_network_manager.h +++ b/content/renderer/p2p/empty_network_manager.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_P2P_EMPTY_NETWORK_MANAGER_H_ #define CONTENT_RENDERER_P2P_EMPTY_NETWORK_MANAGER_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "content/common/content_export.h"
diff --git a/content/renderer/p2p/filtering_network_manager.h b/content/renderer/p2p/filtering_network_manager.h index 8eb7bba5d..c7c68bf 100644 --- a/content/renderer/p2p/filtering_network_manager.h +++ b/content/renderer/p2p/filtering_network_manager.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_P2P_FILTERING_NETWORK_MANAGER_H_ #define CONTENT_RENDERER_P2P_FILTERING_NETWORK_MANAGER_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "base/time/time.h"
diff --git a/content/renderer/p2p/filtering_network_manager_unittest.cc b/content/renderer/p2p/filtering_network_manager_unittest.cc index 37a13f92..c5bb5e9b 100644 --- a/content/renderer/p2p/filtering_network_manager_unittest.cc +++ b/content/renderer/p2p/filtering_network_manager_unittest.cc
@@ -4,6 +4,8 @@ #include "content/renderer/p2p/filtering_network_manager.h" +#include <stddef.h> + #include "base/logging.h" #include "base/macros.h" #include "base/memory/ref_counted.h"
diff --git a/content/renderer/p2p/host_address_request.h b/content/renderer/p2p/host_address_request.h index 1fb0b7d9..1734d2a1 100644 --- a/content/renderer/p2p/host_address_request.h +++ b/content/renderer/p2p/host_address_request.h
@@ -5,9 +5,12 @@ #ifndef CONTENT_RENDERER_P2P_HOST_ADDRESS_REQUEST_H_ #define CONTENT_RENDERER_P2P_HOST_ADDRESS_REQUEST_H_ +#include <stdint.h> + #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "net/base/ip_address_number.h" @@ -63,7 +66,7 @@ State state_; // Accessed on the IPC thread only. - int32 request_id_; + int32_t request_id_; bool registered_; std::vector<rtc::IPAddress> addresses_; DoneCallback done_callback_;
diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc index 97de7d7..779bb216 100644 --- a/content/renderer/p2p/ipc_socket_factory.cc +++ b/content/renderer/p2p/ipc_socket_factory.cc
@@ -4,10 +4,13 @@ #include "content/renderer/p2p/ipc_socket_factory.h" +#include <stddef.h> + #include <algorithm> #include <list> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" @@ -736,7 +739,9 @@ } rtc::AsyncPacketSocket* IpcPacketSocketFactory::CreateUdpSocket( - const rtc::SocketAddress& local_address, uint16 min_port, uint16 max_port) { + const rtc::SocketAddress& local_address, + uint16_t min_port, + uint16_t max_port) { rtc::SocketAddress crome_address; P2PSocketClientImpl* socket_client = new P2PSocketClientImpl(socket_dispatcher_); @@ -751,7 +756,9 @@ } rtc::AsyncPacketSocket* IpcPacketSocketFactory::CreateServerTcpSocket( - const rtc::SocketAddress& local_address, uint16 min_port, uint16 max_port, + const rtc::SocketAddress& local_address, + uint16_t min_port, + uint16_t max_port, int opts) { // TODO(sergeyu): Implement SSL support. if (opts & rtc::PacketSocketFactory::OPT_SSLTCP)
diff --git a/content/renderer/p2p/ipc_socket_factory.h b/content/renderer/p2p/ipc_socket_factory.h index 1570322..7ca81d61 100644 --- a/content/renderer/p2p/ipc_socket_factory.h +++ b/content/renderer/p2p/ipc_socket_factory.h
@@ -5,8 +5,10 @@ #ifndef CONTENT_RENDERER_P2P_IPC_SOCKET_FACTORY_H_ #define CONTENT_RENDERER_P2P_IPC_SOCKET_FACTORY_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "third_party/webrtc/p2p/base/packetsocketfactory.h" @@ -28,12 +30,12 @@ rtc::AsyncPacketSocket* CreateUdpSocket( const rtc::SocketAddress& local_address, - uint16 min_port, - uint16 max_port) override; + uint16_t min_port, + uint16_t max_port) override; rtc::AsyncPacketSocket* CreateServerTcpSocket( const rtc::SocketAddress& local_address, - uint16 min_port, - uint16 max_port, + uint16_t min_port, + uint16_t max_port, int opts) override; rtc::AsyncPacketSocket* CreateClientTcpSocket( const rtc::SocketAddress& local_address,
diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc index 1f2d1e3..c4ba18bb 100644 --- a/content/renderer/p2p/port_allocator.cc +++ b/content/renderer/p2p/port_allocator.cc
@@ -4,6 +4,8 @@ #include "content/renderer/p2p/port_allocator.h" +#include <stdint.h> + #include "base/command_line.h" #include "base/logging.h" #include "content/public/common/content_switches.h" @@ -24,7 +26,7 @@ config_(config), origin_(origin), network_manager_task_runner_(task_runner) { - uint32 flags = 0; + uint32_t flags = 0; if (!config_.enable_multiple_routes) { flags |= cricket::PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION; }
diff --git a/content/renderer/p2p/port_allocator.h b/content/renderer/p2p/port_allocator.h index e8436765..480ad5c0 100644 --- a/content/renderer/p2p/port_allocator.h +++ b/content/renderer/p2p/port_allocator.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_P2P_PORT_ALLOCATOR_H_ #define CONTENT_RENDERER_P2P_PORT_ALLOCATOR_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/single_thread_task_runner.h" #include "third_party/webrtc/p2p/client/basicportallocator.h"
diff --git a/content/renderer/p2p/socket_client.h b/content/renderer/p2p/socket_client.h index a2cefdc..8ce5c752 100644 --- a/content/renderer/p2p/socket_client.h +++ b/content/renderer/p2p/socket_client.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_P2P_SOCKET_CLIENT_H_ #define CONTENT_RENDERER_P2P_SOCKET_CLIENT_H_ +#include <stdint.h> + #include <vector> #include "base/memory/ref_counted.h"
diff --git a/content/renderer/p2p/socket_client_impl.cc b/content/renderer/p2p/socket_client_impl.cc index dc7fb15..56fefb0 100644 --- a/content/renderer/p2p/socket_client_impl.cc +++ b/content/renderer/p2p/socket_client_impl.cc
@@ -17,7 +17,7 @@ namespace { -uint64_t GetUniqueId(uint32 random_socket_id, uint32 packet_id) { +uint64_t GetUniqueId(uint32_t random_socket_id, uint32_t packet_id) { uint64_t uid = random_socket_id; uid <<= 32; uid |= packet_id;
diff --git a/content/renderer/p2p/socket_client_impl.h b/content/renderer/p2p/socket_client_impl.h index 4db0148..fd1099a 100644 --- a/content/renderer/p2p/socket_client_impl.h +++ b/content/renderer/p2p/socket_client_impl.h
@@ -5,8 +5,11 @@ #ifndef CONTENT_RENDERER_P2P_SOCKET_CLIENT_IMPL_H_ #define CONTENT_RENDERER_P2P_SOCKET_CLIENT_IMPL_H_ +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/p2p_socket_type.h" #include "content/renderer/p2p/socket_client.h" @@ -117,8 +120,8 @@ State state_; // These two fields are used to identify packets for tracing. - uint32 random_socket_id_; - uint32 next_packet_id_; + uint32_t random_socket_id_; + uint32_t next_packet_id_; DISALLOW_COPY_AND_ASSIGN(P2PSocketClientImpl); };
diff --git a/content/renderer/p2p/socket_dispatcher.cc b/content/renderer/p2p/socket_dispatcher.cc index ca235c2..fce70e27 100644 --- a/content/renderer/p2p/socket_dispatcher.cc +++ b/content/renderer/p2p/socket_dispatcher.cc
@@ -80,7 +80,7 @@ sender_ = NULL; } -void P2PSocketDispatcher::OnChannelConnected(int32 peer_id) { +void P2PSocketDispatcher::OnChannelConnected(int32_t peer_id) { connected_ = true; } @@ -133,7 +133,7 @@ } void P2PSocketDispatcher::OnGetHostAddressResult( - int32 request_id, + int32_t request_id, const net::IPAddressList& addresses) { P2PAsyncAddressResolver* request = host_address_requests_.Lookup(request_id); if (!request) {
diff --git a/content/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h index 6dacc27..527921b3 100644 --- a/content/renderer/p2p/socket_dispatcher.h +++ b/content/renderer/p2p/socket_dispatcher.h
@@ -21,11 +21,14 @@ #ifndef CONTENT_RENDERER_P2P_SOCKET_DISPATCHER_H_ #define CONTENT_RENDERER_P2P_SOCKET_DISPATCHER_H_ +#include <stdint.h> + #include <vector> #include "base/callback_forward.h" #include "base/compiler_specific.h" #include "base/id_map.h" +#include "base/macros.h" #include "base/observer_list_threadsafe.h" #include "base/synchronization/lock.h" #include "content/common/content_export.h" @@ -79,7 +82,7 @@ void OnFilterAdded(IPC::Sender* sender) override; void OnFilterRemoved() override; void OnChannelClosing() override; - void OnChannelConnected(int32 peer_pid) override; + void OnChannelConnected(int32_t peer_pid) override; base::SingleThreadTaskRunner* task_runner(); @@ -97,7 +100,7 @@ const net::NetworkInterfaceList& networks, const net::IPAddressNumber& default_ipv4_local_address, const net::IPAddressNumber& default_ipv6_local_address); - void OnGetHostAddressResult(int32 request_id, + void OnGetHostAddressResult(int32_t request_id, const net::IPAddressList& addresses); void OnSocketCreated(int socket_id, const net::IPEndPoint& local_address,
diff --git a/content/renderer/pepper/audio_helper.h b/content/renderer/pepper/audio_helper.h index 4b0dfc2..b0c33e5 100644 --- a/content/renderer/pepper/audio_helper.h +++ b/content/renderer/pepper/audio_helper.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_PEPPER_AUDIO_HELPER_H_ #define CONTENT_RENDERER_PEPPER_AUDIO_HELPER_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "base/sync_socket.h"
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc index 2c94fe94..439e1d9 100644 --- a/content/renderer/pepper/content_decryptor_delegate.cc +++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -7,6 +7,7 @@ #include <vector> #include "base/callback_helpers.h" +#include "base/macros.h" #include "base/metrics/sparse_histogram.h" #include "base/numerics/safe_conversions.h" #include "base/trace_event/trace_event.h" @@ -420,7 +421,7 @@ uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass()); PP_Var certificate_array = PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar( - base::checked_cast<uint32>(certificate.size()), certificate.data()); + base::checked_cast<uint32_t>(certificate.size()), certificate.data()); plugin_decryption_interface_->SetServerCertificate( pp_instance_, promise_id, certificate_array); } @@ -433,7 +434,7 @@ uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass()); PP_Var init_data_array = PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar( - base::checked_cast<uint32>(init_data.size()), init_data.data()); + base::checked_cast<uint32_t>(init_data.size()), init_data.data()); plugin_decryption_interface_->CreateSessionAndGenerateRequest( pp_instance_, promise_id, MediaSessionTypeToPpSessionType(session_type), MediaInitDataTypeToPpInitDataType(init_data_type), init_data_array); @@ -456,7 +457,7 @@ uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass()); PP_Var response_array = PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar( - base::checked_cast<uint32>(response.size()), response.data()); + base::checked_cast<uint32_t>(response.size()), response.data()); plugin_decryption_interface_->UpdateSession( pp_instance_, promise_id, StringVar::StringToPPVar(session_id), response_array); @@ -1214,8 +1215,8 @@ // Allocate space for the channel pointers given to AudioBuffer. std::vector<const uint8_t*> channel_ptrs(audio_channel_count_, nullptr); do { - int64 timestamp = 0; - int64 frame_size = -1; + int64_t timestamp = 0; + int64_t frame_size = -1; const size_t kHeaderSize = sizeof(timestamp) + sizeof(frame_size); if (bytes_left < kHeaderSize)
diff --git a/content/renderer/pepper/content_decryptor_delegate.h b/content/renderer/pepper/content_decryptor_delegate.h index 09b0917..7c1a7a66 100644 --- a/content/renderer/pepper/content_decryptor_delegate.h +++ b/content/renderer/pepper/content_decryptor_delegate.h
@@ -5,14 +5,17 @@ #ifndef CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_ #define CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <queue> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "media/base/cdm_promise.h"
diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.cc b/content/renderer/pepper/content_renderer_pepper_host_factory.cc index c01ae4d..3b181436 100644 --- a/content/renderer/pepper/content_renderer_pepper_host_factory.cc +++ b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
@@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "content/common/content_switches_internal.h" #include "content/public/common/content_client.h" #include "content/public/renderer/content_renderer_client.h"
diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.h b/content/renderer/pepper/content_renderer_pepper_host_factory.h index e6feec9..41ff02a 100644 --- a/content/renderer/pepper/content_renderer_pepper_host_factory.h +++ b/content/renderer/pepper/content_renderer_pepper_host_factory.h
@@ -6,6 +6,7 @@ #define CONTENT_RENDERER_PEPPER_CONTENT_RENDERER_PEPPER_HOST_FACTORY_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/host/host_factory.h" #include "ppapi/shared_impl/ppapi_permissions.h"
diff --git a/content/renderer/pepper/event_conversion.cc b/content/renderer/pepper/event_conversion.cc index b02e0e6..036f213 100644 --- a/content/renderer/pepper/event_conversion.cc +++ b/content/renderer/pepper/event_conversion.cc
@@ -4,7 +4,9 @@ #include "content/renderer/pepper/event_conversion.h" -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/i18n/char_iterator.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -13,6 +15,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversion_utils.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "content/common/input/web_touch_event_traits.h" #include "ppapi/c/pp_input_event.h" #include "ppapi/shared_impl/ppb_input_event_shared.h"
diff --git a/content/renderer/pepper/event_conversion_unittest.cc b/content/renderer/pepper/event_conversion_unittest.cc index 8a22a93..93fe113 100644 --- a/content/renderer/pepper/event_conversion_unittest.cc +++ b/content/renderer/pepper/event_conversion_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "content/common/input/synthetic_web_input_event_builders.h"
diff --git a/content/renderer/pepper/fake_pepper_plugin_instance.h b/content/renderer/pepper/fake_pepper_plugin_instance.h index b5dcbe6..784e0ba 100644 --- a/content/renderer/pepper/fake_pepper_plugin_instance.h +++ b/content/renderer/pepper/fake_pepper_plugin_instance.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_PEPPER_FAKE_PEPPER_PLUGIN_INSTANCE_H_ #define CONTENT_RENDERER_PEPPER_FAKE_PEPPER_PLUGIN_INSTANCE_H_ +#include <stdint.h> + #include "content/public/renderer/pepper_plugin_instance.h" #include "url/gurl.h"
diff --git a/content/renderer/pepper/host_array_buffer_var.cc b/content/renderer/pepper/host_array_buffer_var.cc index 67f5f81..eaff2e7e 100644 --- a/content/renderer/pepper/host_array_buffer_var.cc +++ b/content/renderer/pepper/host_array_buffer_var.cc
@@ -24,14 +24,14 @@ namespace content { -HostArrayBufferVar::HostArrayBufferVar(uint32 size_in_bytes) +HostArrayBufferVar::HostArrayBufferVar(uint32_t size_in_bytes) : buffer_(WebArrayBuffer::create(size_in_bytes, 1 /* element_size */)), valid_(true) {} HostArrayBufferVar::HostArrayBufferVar(const WebArrayBuffer& buffer) : buffer_(buffer), valid_(true) {} -HostArrayBufferVar::HostArrayBufferVar(uint32 size_in_bytes, +HostArrayBufferVar::HostArrayBufferVar(uint32_t size_in_bytes, base::SharedMemoryHandle handle) : buffer_(WebArrayBuffer::create(size_in_bytes, 1 /* element_size */)) { base::SharedMemory s(handle, true); @@ -54,7 +54,9 @@ // We do not used shared memory on the host side. Nothing to do. } -uint32 HostArrayBufferVar::ByteLength() { return buffer_.byteLength(); } +uint32_t HostArrayBufferVar::ByteLength() { + return buffer_.byteLength(); +} bool HostArrayBufferVar::CopyToNewShmem( PP_Instance instance,
diff --git a/content/renderer/pepper/host_array_buffer_var.h b/content/renderer/pepper/host_array_buffer_var.h index 3f917d46..f26360d 100644 --- a/content/renderer/pepper/host_array_buffer_var.h +++ b/content/renderer/pepper/host_array_buffer_var.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_PEPPER_HOST_ARRAY_BUFFER_VAR_H_ #define CONTENT_RENDERER_PEPPER_HOST_ARRAY_BUFFER_VAR_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "ppapi/c/pp_instance.h" #include "ppapi/shared_impl/host_resource.h" @@ -16,15 +19,15 @@ // Represents a host-side ArrayBufferVar. class HostArrayBufferVar : public ppapi::ArrayBufferVar { public: - explicit HostArrayBufferVar(uint32 size_in_bytes); + explicit HostArrayBufferVar(uint32_t size_in_bytes); explicit HostArrayBufferVar(const blink::WebArrayBuffer& buffer); - explicit HostArrayBufferVar(uint32 size_in_bytes, + explicit HostArrayBufferVar(uint32_t size_in_bytes, base::SharedMemoryHandle handle); // ArrayBufferVar implementation. void* Map() override; void Unmap() override; - uint32 ByteLength() override; + uint32_t ByteLength() override; bool CopyToNewShmem(PP_Instance instance, int* host_shm_handle_id, base::SharedMemoryHandle* plugin_shm_handle) override;
diff --git a/content/renderer/pepper/host_dispatcher_wrapper.cc b/content/renderer/pepper/host_dispatcher_wrapper.cc index ba709fe..29041b8c 100644 --- a/content/renderer/pepper/host_dispatcher_wrapper.cc +++ b/content/renderer/pepper/host_dispatcher_wrapper.cc
@@ -4,6 +4,7 @@ #include "content/renderer/pepper/host_dispatcher_wrapper.h" +#include "build/build_config.h" #include "content/common/frame_messages.h" #include "content/public/common/origin_util.h" #include "content/renderer/pepper/pepper_hung_plugin_filter.h"
diff --git a/content/renderer/pepper/host_globals.h b/content/renderer/pepper/host_globals.h index 9ce071cc..0e554cbe 100644 --- a/content/renderer/pepper/host_globals.h +++ b/content/renderer/pepper/host_globals.h
@@ -6,6 +6,7 @@ #define CONTENT_RENDERER_PEPPER_HOST_GLOBALS_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/renderer/pepper/host_var_tracker.h" #include "ppapi/shared_impl/callback_tracker.h" #include "ppapi/shared_impl/ppapi_globals.h"
diff --git a/content/renderer/pepper/host_resource_var.h b/content/renderer/pepper/host_resource_var.h index 9897a46..607525e 100644 --- a/content/renderer/pepper/host_resource_var.h +++ b/content/renderer/pepper/host_resource_var.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_PEPPER_HOST_RESOURCE_VAR_H_ #define CONTENT_RENDERER_PEPPER_HOST_RESOURCE_VAR_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ipc/ipc_message.h" #include "ppapi/c/pp_resource.h"
diff --git a/content/renderer/pepper/host_var_tracker.cc b/content/renderer/pepper/host_var_tracker.cc index 1b78ddc..b058576d 100644 --- a/content/renderer/pepper/host_var_tracker.cc +++ b/content/renderer/pepper/host_var_tracker.cc
@@ -42,12 +42,12 @@ HostVarTracker::~HostVarTracker() {} -ArrayBufferVar* HostVarTracker::CreateArrayBuffer(uint32 size_in_bytes) { +ArrayBufferVar* HostVarTracker::CreateArrayBuffer(uint32_t size_in_bytes) { return new HostArrayBufferVar(size_in_bytes); } ArrayBufferVar* HostVarTracker::CreateShmArrayBuffer( - uint32 size_in_bytes, + uint32_t size_in_bytes, base::SharedMemoryHandle handle) { return new HostArrayBufferVar(size_in_bytes, handle); } @@ -154,7 +154,7 @@ int HostVarTracker::TrackSharedMemoryHandle(PP_Instance instance, base::SharedMemoryHandle handle, - uint32 size_in_bytes) { + uint32_t size_in_bytes) { SharedMemoryMapEntry entry; entry.instance = instance; entry.handle = handle; @@ -173,7 +173,7 @@ int id, PP_Instance instance, base::SharedMemoryHandle* handle, - uint32* size_in_bytes) { + uint32_t* size_in_bytes) { SharedMemoryMap::iterator it = shared_memory_map_.find(id); if (it == shared_memory_map_.end()) return false;
diff --git a/content/renderer/pepper/host_var_tracker.h b/content/renderer/pepper/host_var_tracker.h index 9fdca65..05755195 100644 --- a/content/renderer/pepper/host_var_tracker.h +++ b/content/renderer/pepper/host_var_tracker.h
@@ -5,11 +5,13 @@ #ifndef CONTENT_RENDERER_PEPPER_HOST_VAR_TRACKER_H_ #define CONTENT_RENDERER_PEPPER_HOST_VAR_TRACKER_H_ +#include <stdint.h> + #include <map> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "ppapi/c/pp_instance.h" @@ -53,17 +55,17 @@ int TrackSharedMemoryHandle(PP_Instance instance, base::SharedMemoryHandle file, - uint32 size_in_bytes) override; + uint32_t size_in_bytes) override; bool StopTrackingSharedMemoryHandle(int id, PP_Instance instance, base::SharedMemoryHandle* handle, - uint32* size_in_bytes) override; + uint32_t* size_in_bytes) override; private: // VarTracker private implementation. - ppapi::ArrayBufferVar* CreateArrayBuffer(uint32 size_in_bytes) override; + ppapi::ArrayBufferVar* CreateArrayBuffer(uint32_t size_in_bytes) override; ppapi::ArrayBufferVar* CreateShmArrayBuffer( - uint32 size_in_bytes, + uint32_t size_in_bytes, base::SharedMemoryHandle handle) override; // Clear the reference count of the given object and remove it from @@ -97,7 +99,7 @@ struct SharedMemoryMapEntry { PP_Instance instance; base::SharedMemoryHandle handle; - uint32 size_in_bytes; + uint32_t size_in_bytes; }; typedef std::map<int, SharedMemoryMapEntry> SharedMemoryMap; SharedMemoryMap shared_memory_map_;
diff --git a/content/renderer/pepper/host_var_tracker_unittest.cc b/content/renderer/pepper/host_var_tracker_unittest.cc index 55b6b86..7ee9bc72 100644 --- a/content/renderer/pepper/host_var_tracker_unittest.cc +++ b/content/renderer/pepper/host_var_tracker_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/renderer/pepper/host_globals.h" #include "content/renderer/pepper/host_var_tracker.h"
diff --git a/content/renderer/pepper/message_channel.h b/content/renderer/pepper/message_channel.h index 6e3741f..ea35d20 100644 --- a/content/renderer/pepper/message_channel.h +++ b/content/renderer/pepper/message_channel.h
@@ -9,7 +9,7 @@ #include <list> #include <map> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/renderer/pepper/v8_var_converter.h" #include "gin/handle.h"
diff --git a/content/renderer/pepper/mock_renderer_ppapi_host.h b/content/renderer/pepper/mock_renderer_ppapi_host.h index 259bf5d..aa0b59eac 100644 --- a/content/renderer/pepper/mock_renderer_ppapi_host.h +++ b/content/renderer/pepper/mock_renderer_ppapi_host.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_PEPPER_MOCK_RENDERER_PPAPI_HOST_H_ #define CONTENT_RENDERER_PEPPER_MOCK_RENDERER_PPAPI_HOST_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "content/renderer/pepper/content_renderer_pepper_host_factory.h"
diff --git a/content/renderer/pepper/pepper_audio_encoder_host.cc b/content/renderer/pepper/pepper_audio_encoder_host.cc index b3e59fd3..e6b69c6 100644 --- a/content/renderer/pepper/pepper_audio_encoder_host.cc +++ b/content/renderer/pepper/pepper_audio_encoder_host.cc
@@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "content/renderer/pepper/host_globals.h" @@ -67,7 +70,7 @@ void RequestBitrateChange(uint32_t bitrate); private: - scoped_ptr<uint8[]> encoder_memory_; + scoped_ptr<uint8_t[]> encoder_memory_; OpusEncoder* opus_encoder_; // Initialization parameters, only valid if |encoder_memory_| is not @@ -111,7 +114,7 @@ if (encoder_size < 1) return false; - scoped_ptr<uint8[]> encoder_memory(new uint8[encoder_size]); + scoped_ptr<uint8_t[]> encoder_memory(new uint8_t[encoder_size]); opus_encoder_ = reinterpret_cast<OpusEncoder*>(encoder_memory.get()); if (opus_encoder_init(opus_encoder_, parameters.input_sample_rate,
diff --git a/content/renderer/pepper/pepper_audio_encoder_host.h b/content/renderer/pepper/pepper_audio_encoder_host.h index 3ad9a0c..8edd67a 100644 --- a/content/renderer/pepper/pepper_audio_encoder_host.h +++ b/content/renderer/pepper/pepper_audio_encoder_host.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_AUDIO_ENCODER_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_AUDIO_ENCODER_HOST_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h"
diff --git a/content/renderer/pepper/pepper_audio_input_host.h b/content/renderer/pepper/pepper_audio_input_host.h index 91a4b1f..40edffd8 100644 --- a/content/renderer/pepper/pepper_audio_input_host.h +++ b/content/renderer/pepper/pepper_audio_input_host.h
@@ -5,10 +5,13 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_AUDIO_INPUT_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_AUDIO_INPUT_HOST_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "base/sync_socket.h"
diff --git a/content/renderer/pepper/pepper_broker.h b/content/renderer/pepper/pepper_broker.h index 0703597..1140d4e 100644 --- a/content/renderer/pepper/pepper_broker.h +++ b/content/renderer/pepper/pepper_broker.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_BROKER_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_BROKER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/process/process.h" #include "base/sync_socket.h"
diff --git a/content/renderer/pepper/pepper_broker_unittest.cc b/content/renderer/pepper/pepper_broker_unittest.cc index 5267beb..d7949d8 100644 --- a/content/renderer/pepper/pepper_broker_unittest.cc +++ b/content/renderer/pepper/pepper_broker_unittest.cc
@@ -9,6 +9,7 @@ #include <sys/socket.h> #endif // defined(OS_POSIX) +#include "build/build_config.h" #include "content/test/mock_render_process.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/pepper/pepper_browser_connection.h b/content/renderer/pepper/pepper_browser_connection.h index 241d612..6e5a3d6 100644 --- a/content/renderer/pepper/pepper_browser_connection.h +++ b/content/renderer/pepper/pepper_browser_connection.h
@@ -5,12 +5,15 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_BROWSER_CONNECTION_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_BROWSER_CONNECTION_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> #include "base/callback.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer_tracker.h" #include "ppapi/c/pp_file_info.h"
diff --git a/content/renderer/pepper/pepper_camera_device_host.h b/content/renderer/pepper/pepper_camera_device_host.h index 3a13cac..4cce0a16 100644 --- a/content/renderer/pepper/pepper_camera_device_host.h +++ b/content/renderer/pepper/pepper_camera_device_host.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_CAMERA_DEVICE_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_CAMERA_DEVICE_HOST_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "content/renderer/pepper/ppb_buffer_impl.h"
diff --git a/content/renderer/pepper/pepper_compositor_host.cc b/content/renderer/pepper/pepper_compositor_host.cc index 31d9b6d..3f8b34c 100644 --- a/content/renderer/pepper/pepper_compositor_host.cc +++ b/content/renderer/pepper/pepper_compositor_host.cc
@@ -4,6 +4,8 @@ #include "content/renderer/pepper/pepper_compositor_host.h" +#include <stddef.h> + #include <limits> #include "base/logging.h"
diff --git a/content/renderer/pepper/pepper_compositor_host.h b/content/renderer/pepper/pepper_compositor_host.h index a954ffb..fab64176 100644 --- a/content/renderer/pepper/pepper_compositor_host.h +++ b/content/renderer/pepper/pepper_compositor_host.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_COMPOSITOR_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_COMPOSITOR_HOST_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "ppapi/host/host_message_context.h"
diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper.cc b/content/renderer/pepper/pepper_device_enumeration_host_helper.cc index 8429d8834..3ca97be 100644 --- a/content/renderer/pepper/pepper_device_enumeration_host_helper.cc +++ b/content/renderer/pepper/pepper_device_enumeration_host_helper.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h"
diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper.h b/content/renderer/pepper/pepper_device_enumeration_host_helper.h index ea1a7fc..b93acf7 100644 --- a/content/renderer/pepper/pepper_device_enumeration_host_helper.h +++ b/content/renderer/pepper/pepper_device_enumeration_host_helper.h
@@ -5,10 +5,12 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_HOST_HELPER_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_HOST_HELPER_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h"
diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc b/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc index c51502e..1711fbb 100644 --- a/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc +++ b/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc
@@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <map> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/renderer/pepper/pepper_device_enumeration_host_helper.h" #include "ppapi/c/pp_errors.h"
diff --git a/content/renderer/pepper/pepper_file_chooser_host.cc b/content/renderer/pepper/pepper_file_chooser_host.cc index 7c19403..ea107682 100644 --- a/content/renderer/pepper/pepper_file_chooser_host.cc +++ b/content/renderer/pepper/pepper_file_chooser_host.cc
@@ -4,7 +4,10 @@ #include "content/renderer/pepper/pepper_file_chooser_host.h" +#include <stddef.h> + #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "content/renderer/pepper/pepper_file_ref_renderer_host.h"
diff --git a/content/renderer/pepper/pepper_file_chooser_host.h b/content/renderer/pepper/pepper_file_chooser_host.h index 4ae861a..9af556f 100644 --- a/content/renderer/pepper/pepper_file_chooser_host.h +++ b/content/renderer/pepper/pepper_file_chooser_host.h
@@ -5,10 +5,12 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_FILE_CHOOSER_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_FILE_CHOOSER_HOST_H_ +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "ppapi/host/host_message_context.h"
diff --git a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc index 6d4a4d2..66b4dbd 100644 --- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc +++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/files/file_path.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "content/common/view_messages.h" #include "content/public/common/file_chooser_file_info.h" #include "content/public/common/file_chooser_params.h" @@ -82,7 +85,7 @@ ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0); ppapi::host::HostMessageContext context(call_params); - int32 result = chooser.OnResourceMessageReceived(show_msg, &context); + int32_t result = chooser.OnResourceMessageReceived(show_msg, &context); EXPECT_EQ(PP_OK_COMPLETIONPENDING, result); // The render view should have sent a chooser request to the browser @@ -145,7 +148,7 @@ ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0); ppapi::host::HostMessageContext context(call_params); - int32 result = chooser.OnResourceMessageReceived(show_msg, &context); + int32_t result = chooser.OnResourceMessageReceived(show_msg, &context); EXPECT_EQ(PP_ERROR_NO_USER_GESTURE, result); }
diff --git a/content/renderer/pepper/pepper_file_ref_renderer_host.h b/content/renderer/pepper/pepper_file_ref_renderer_host.h index cfa36b2..2435271c 100644 --- a/content/renderer/pepper/pepper_file_ref_renderer_host.h +++ b/content/renderer/pepper/pepper_file_ref_renderer_host.h
@@ -5,10 +5,12 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_FILE_REF_RENDERER_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_FILE_REF_RENDERER_HOST_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "content/renderer/pepper/pepper_file_system_host.h"
diff --git a/content/renderer/pepper/pepper_file_system_host.cc b/content/renderer/pepper/pepper_file_system_host.cc index bce63a2..a3884e8 100644 --- a/content/renderer/pepper/pepper_file_system_host.cc +++ b/content/renderer/pepper/pepper_file_system_host.cc
@@ -9,9 +9,9 @@ #include "content/child/child_thread_impl.h" #include "content/child/fileapi/file_system_dispatcher.h" #include "content/common/pepper_file_util.h" -#include "content/renderer/pepper/pepper_plugin_instance_impl.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/renderer_ppapi_host.h" +#include "content/renderer/pepper/pepper_plugin_instance_impl.h" #include "ppapi/c/pp_errors.h" #include "ppapi/host/dispatch_host_message.h" #include "ppapi/host/ppapi_host.h" @@ -77,7 +77,7 @@ } void PepperFileSystemHost::DidFailOpenFileSystem(base::File::Error error) { - int32 pp_error = ppapi::FileErrorToPepperError(error); + int32_t pp_error = ppapi::FileErrorToPepperError(error); opened_ = (pp_error == PP_OK); reply_context_.params.set_result(pp_error); host()->SendReply(reply_context_, PpapiPluginMsg_FileSystem_OpenReply());
diff --git a/content/renderer/pepper/pepper_file_system_host.h b/content/renderer/pepper/pepper_file_system_host.h index 23d7c49..cadd860 100644 --- a/content/renderer/pepper/pepper_file_system_host.h +++ b/content/renderer/pepper/pepper_file_system_host.h
@@ -5,10 +5,12 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_FILE_SYSTEM_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_FILE_SYSTEM_HOST_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/files/file.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ppapi/c/pp_file_info.h" #include "ppapi/c/private/ppb_isolated_file_system_private.h"
diff --git a/content/renderer/pepper/pepper_graphics_2d_host.cc b/content/renderer/pepper/pepper_graphics_2d_host.cc index efa3bc1..f33792d 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host.cc +++ b/content/renderer/pepper/pepper_graphics_2d_host.cc
@@ -4,12 +4,15 @@ #include "content/renderer/pepper/pepper_graphics_2d_host.h" +#include <stddef.h> + #include "base/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "cc/resources/shared_bitmap.h" #include "cc/resources/texture_mailbox.h" #include "content/child/child_shared_bitmap_manager.h" @@ -51,7 +54,7 @@ namespace { -const int64 kOffscreenCallbackDelayMs = 1000 / 30; // 30 fps +const int64_t kOffscreenCallbackDelayMs = 1000 / 30; // 30 fps // Converts a rect inside an image of the given dimensions. The rect may be // NULL to indicate it should be the entire image. If the rect is outside of @@ -70,13 +73,13 @@ return false; // Check the max bounds, being careful of overflow. - if (static_cast<int64>(rect->point.x) + - static_cast<int64>(rect->size.width) > - static_cast<int64>(image_width)) + if (static_cast<int64_t>(rect->point.x) + + static_cast<int64_t>(rect->size.width) > + static_cast<int64_t>(image_width)) return false; - if (static_cast<int64>(rect->point.y) + - static_cast<int64>(rect->size.height) > - static_cast<int64>(image_height)) + if (static_cast<int64_t>(rect->point.y) + + static_cast<int64_t>(rect->size.height) > + static_cast<int64_t>(image_height)) return false; *dest = gfx::Rect( @@ -255,12 +258,12 @@ // Validate the bitmap position. int x = top_left->x; if (x < 0 || - static_cast<int64>(x) + static_cast<int64>(image_resource->width()) > + static_cast<int64_t>(x) + static_cast<int64_t>(image_resource->width()) > image_data_->width()) return false; int y = top_left->y; if (y < 0 || - static_cast<int64>(y) + static_cast<int64>(image_resource->height()) > + static_cast<int64_t>(y) + static_cast<int64_t>(image_resource->height()) > image_data_->height()) return false; @@ -430,14 +433,14 @@ // Validate the bitmap position using the previously-validated rect, there // should be no painted area outside of the image. - int64 x64 = static_cast<int64>(top_left.x); - int64 y64 = static_cast<int64>(top_left.y); - if (x64 + static_cast<int64>(operation.paint_src_rect.x()) < 0 || - x64 + static_cast<int64>(operation.paint_src_rect.right()) > + int64_t x64 = static_cast<int64_t>(top_left.x); + int64_t y64 = static_cast<int64_t>(top_left.y); + if (x64 + static_cast<int64_t>(operation.paint_src_rect.x()) < 0 || + x64 + static_cast<int64_t>(operation.paint_src_rect.right()) > image_data_->width()) return PP_ERROR_BADARGUMENT; - if (y64 + static_cast<int64>(operation.paint_src_rect.y()) < 0 || - y64 + static_cast<int64>(operation.paint_src_rect.bottom()) > + if (y64 + static_cast<int64_t>(operation.paint_src_rect.y()) < 0 || + y64 + static_cast<int64_t>(operation.paint_src_rect.bottom()) > image_data_->height()) return PP_ERROR_BADARGUMENT; operation.paint_x = top_left.x; @@ -461,8 +464,8 @@ // If we're being asked to scroll by more than the clip rect size, just // ignore this scroll command and say it worked. - int32 dx = amount.x; - int32 dy = amount.y; + int32_t dx = amount.x; + int32_t dy = amount.y; if (dx <= -image_data_->width() || dx >= image_data_->width() || dy <= -image_data_->height() || dy >= image_data_->height()) return PP_ERROR_BADARGUMENT;
diff --git a/content/renderer/pepper/pepper_graphics_2d_host.h b/content/renderer/pepper/pepper_graphics_2d_host.h index 35b632b..29e55e94 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host.h +++ b/content/renderer/pepper/pepper_graphics_2d_host.h
@@ -5,10 +5,12 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_GRAPHICS_2D_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_GRAPHICS_2D_HOST_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "ppapi/c/ppb_graphics_2d.h"
diff --git a/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc b/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc index d817bab..75cefbeb 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc +++ b/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
@@ -4,7 +4,9 @@ #include "content/renderer/pepper/pepper_graphics_2d_host.h" -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "content/renderer/pepper/gfx_conversion.h" #include "content/renderer/pepper/mock_renderer_ppapi_host.h"
diff --git a/content/renderer/pepper/pepper_hung_plugin_filter.h b/content/renderer/pepper/pepper_hung_plugin_filter.h index 34c9bf73e..81b14df 100644 --- a/content/renderer/pepper/pepper_hung_plugin_filter.h +++ b/content/renderer/pepper/pepper_hung_plugin_filter.h
@@ -6,6 +6,7 @@ #define CONTENT_RENDERER_PEPPER_PEPPER_HUNG_PLUGIN_FILTER_H_ #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "ipc/ipc_channel_proxy.h"
diff --git a/content/renderer/pepper/pepper_in_process_resource_creation.h b/content/renderer/pepper/pepper_in_process_resource_creation.h index 9f80757..520345c3 100644 --- a/content/renderer/pepper/pepper_in_process_resource_creation.h +++ b/content/renderer/pepper/pepper_in_process_resource_creation.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_IN_PROCESS_RESOURCE_CREATION_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_IN_PROCESS_RESOURCE_CREATION_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/renderer/pepper/resource_creation_impl.h" #include "ppapi/proxy/connection.h"
diff --git a/content/renderer/pepper/pepper_in_process_router.h b/content/renderer/pepper/pepper_in_process_router.h index 73865fc3..20e5b9a1 100644 --- a/content/renderer/pepper/pepper_in_process_router.h +++ b/content/renderer/pepper/pepper_in_process_router.h
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/callback.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "ppapi/c/pp_instance.h"
diff --git a/content/renderer/pepper/pepper_media_device_manager.h b/content/renderer/pepper/pepper_media_device_manager.h index 6fd8ded..c2ee4b9 100644 --- a/content/renderer/pepper/pepper_media_device_manager.h +++ b/content/renderer/pepper/pepper_media_device_manager.h
@@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer_tracker.h"
diff --git a/content/renderer/pepper/pepper_media_stream_audio_track_host.h b/content/renderer/pepper/pepper_media_stream_audio_track_host.h index 2e69c91..c14cd3b 100644 --- a/content/renderer/pepper/pepper_media_stream_audio_track_host.h +++ b/content/renderer/pepper/pepper_media_stream_audio_track_host.h
@@ -5,9 +5,12 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_AUDIO_TRACK_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_AUDIO_TRACK_HOST_H_ +#include <stdint.h> + #include <deque> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h"
diff --git a/content/renderer/pepper/pepper_media_stream_track_host_base.h b/content/renderer/pepper/pepper_media_stream_track_host_base.h index ddfac9c..7e7714b 100644 --- a/content/renderer/pepper/pepper_media_stream_track_host_base.h +++ b/content/renderer/pepper/pepper_media_stream_track_host_base.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_TRACK_HOST_BASE_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_TRACK_HOST_BASE_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "ppapi/host/resource_host.h" #include "ppapi/shared_impl/media_stream_buffer_manager.h"
diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.cc b/content/renderer/pepper/pepper_media_stream_video_track_host.cc index 2e7e2c2..7e237b87 100644 --- a/content/renderer/pepper/pepper_media_stream_video_track_host.cc +++ b/content/renderer/pepper/pepper_media_stream_video_track_host.cc
@@ -4,8 +4,11 @@ #include "content/renderer/pepper/pepper_media_stream_video_track_host.h" +#include <stddef.h> + #include "base/base64.h" #include "base/logging.h" +#include "base/macros.h" #include "base/rand_util.h" #include "base/strings/utf_string_conversions.h" #include "content/renderer/media/media_stream_video_track.h" @@ -328,21 +331,21 @@ ppapi::MediaStreamBuffer::Video* pp_frame = &(buffer_manager()->GetBufferPointer(index)->video); - int32 y_stride = plugin_frame_size_.width(); - int32 uv_stride = (plugin_frame_size_.width() + 1) / 2; - uint8* y_data = static_cast<uint8*>(pp_frame->data); + int32_t y_stride = plugin_frame_size_.width(); + int32_t uv_stride = (plugin_frame_size_.width() + 1) / 2; + uint8_t* y_data = static_cast<uint8_t*>(pp_frame->data); // Default to I420 - uint8* u_data = y_data + plugin_frame_size_.GetArea(); - uint8* v_data = y_data + (plugin_frame_size_.GetArea() * 5 / 4); + uint8_t* u_data = y_data + plugin_frame_size_.GetArea(); + uint8_t* v_data = y_data + (plugin_frame_size_.GetArea() * 5 / 4); if (plugin_frame_format_ == PP_VIDEOFRAME_FORMAT_YV12) { // Swap u and v for YV12. - uint8* tmp = u_data; + uint8_t* tmp = u_data; u_data = v_data; v_data = tmp; } - int64 ts_ms = static_cast<int64>(pp_frame->timestamp * - base::Time::kMillisecondsPerSecond); + int64_t ts_ms = static_cast<int64_t>(pp_frame->timestamp * + base::Time::kMillisecondsPerSecond); scoped_refptr<VideoFrame> frame = media::VideoFrame::WrapExternalYuvData( FromPpapiFormat(plugin_frame_format_), plugin_frame_size_,
diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.h b/content/renderer/pepper/pepper_media_stream_video_track_host.h index 4bb88db..81422146 100644 --- a/content/renderer/pepper/pepper_media_stream_video_track_host.h +++ b/content/renderer/pepper/pepper_media_stream_video_track_host.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_VIDEO_TRACK_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_STREAM_VIDEO_TRACK_HOST_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/renderer/media_stream_video_sink.h" #include "content/renderer/media/media_stream_video_source.h"
diff --git a/content/renderer/pepper/pepper_platform_audio_input.h b/content/renderer/pepper/pepper_platform_audio_input.h index 3b9f8bb..33eb7fc9 100644 --- a/content/renderer/pepper/pepper_platform_audio_input.h +++ b/content/renderer/pepper/pepper_platform_audio_input.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/renderer/pepper/pepper_platform_audio_output.h b/content/renderer/pepper/pepper_platform_audio_output.h index f4da8b4..a5bd3d9 100644 --- a/content/renderer/pepper/pepper_platform_audio_output.h +++ b/content/renderer/pepper/pepper_platform_audio_output.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "media/audio/audio_output_ipc.h"
diff --git a/content/renderer/pepper/pepper_platform_camera_device.h b/content/renderer/pepper/pepper_platform_camera_device.h index bccfdb3..649fa2f7 100644 --- a/content/renderer/pepper/pepper_platform_camera_device.h +++ b/content/renderer/pepper/pepper_platform_camera_device.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/content/renderer/pepper/pepper_platform_video_capture.h b/content/renderer/pepper/pepper_platform_video_capture.h index ccf91d0..b2e58ea 100644 --- a/content/renderer/pepper/pepper_platform_video_capture.h +++ b/content/renderer/pepper/pepper_platform_video_capture.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc index d23f9f96..58660764 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -18,6 +18,7 @@ #include "base/thread_task_runner_handle.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "cc/blink/web_layer_impl.h" #include "cc/layers/texture_layer.h" #include "content/common/content_constants_internal.h" @@ -767,7 +768,7 @@ if (!texture_layer_.get()) return; gpu::Mailbox mailbox; - uint32 sync_point = 0; + uint32_t sync_point = 0; bound_graphics_3d_->GetBackingMailbox(&mailbox, &sync_point); DCHECK(!mailbox.IsZero()); DCHECK_NE(sync_point, 0u); @@ -1958,7 +1959,7 @@ return; gpu::Mailbox mailbox; - uint32 sync_point = 0; + uint32_t sync_point = 0; if (bound_graphics_3d_.get()) { bound_graphics_3d_->GetBackingMailbox(&mailbox, &sync_point); DCHECK_EQ(mailbox.IsZero(), sync_point == 0); @@ -2391,13 +2392,13 @@ // Therefore, |content_decryptor_delegate_| must have been initialized when // the following methods are called. void PepperPluginInstanceImpl::PromiseResolved(PP_Instance instance, - uint32 promise_id) { + uint32_t promise_id) { content_decryptor_delegate_->OnPromiseResolved(promise_id); } void PepperPluginInstanceImpl::PromiseResolvedWithSession( PP_Instance instance, - uint32 promise_id, + uint32_t promise_id, PP_Var session_id_var) { content_decryptor_delegate_->OnPromiseResolvedWithSession(promise_id, session_id_var); @@ -2405,9 +2406,9 @@ void PepperPluginInstanceImpl::PromiseRejected( PP_Instance instance, - uint32 promise_id, + uint32_t promise_id, PP_CdmExceptionCode exception_code, - uint32 system_code, + uint32_t system_code, PP_Var error_description_var) { content_decryptor_delegate_->OnPromiseRejected( promise_id, exception_code, system_code, error_description_var); @@ -2449,7 +2450,7 @@ PP_Instance instance, PP_Var session_id_var, PP_CdmExceptionCode exception_code, - uint32 system_code, + uint32_t system_code, PP_Var error_description_var) { content_decryptor_delegate_->OnLegacySessionError( session_id_var, exception_code, system_code, error_description_var); @@ -2540,7 +2541,7 @@ blink::WebVector<blink::WebRect> tickmarks_converted( static_cast<size_t>(count)); - for (uint32 i = 0; i < count; ++i) { + for (uint32_t i = 0; i < count; ++i) { tickmarks_converted[i] = blink::WebRect(tickmarks[i].point.x, tickmarks[i].point.y, tickmarks[i].size.width,
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h index 381e5b8..54d29a0 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.h +++ b/content/renderer/pepper/pepper_plugin_instance_impl.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include <list> #include <set> #include <string> @@ -12,10 +15,12 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "cc/layers/content_layer_client.h" #include "cc/layers/layer.h" #include "cc/layers/texture_layer_client.h" @@ -458,14 +463,14 @@ PP_URLComponents_Dev* components) override; // PPB_ContentDecryptor_Private implementation. - void PromiseResolved(PP_Instance instance, uint32 promise_id) override; + void PromiseResolved(PP_Instance instance, uint32_t promise_id) override; void PromiseResolvedWithSession(PP_Instance instance, - uint32 promise_id, + uint32_t promise_id, PP_Var session_id_var) override; void PromiseRejected(PP_Instance instance, - uint32 promise_id, + uint32_t promise_id, PP_CdmExceptionCode exception_code, - uint32 system_code, + uint32_t system_code, PP_Var error_description_var) override; void SessionMessage(PP_Instance instance, PP_Var session_id_var, @@ -485,7 +490,7 @@ void LegacySessionError(PP_Instance instance, PP_Var session_id_var, PP_CdmExceptionCode exception_code, - uint32 system_code, + uint32_t system_code, PP_Var error_description_var) override; void DeliverBlock(PP_Instance instance, PP_Resource decrypted_block,
diff --git a/content/renderer/pepper/pepper_plugin_instance_metrics.cc b/content/renderer/pepper/pepper_plugin_instance_metrics.cc index 1c8a0e2..548f64a8 100644 --- a/content/renderer/pepper/pepper_plugin_instance_metrics.cc +++ b/content/renderer/pepper/pepper_plugin_instance_metrics.cc
@@ -4,8 +4,11 @@ #include "content/renderer/pepper/pepper_plugin_instance_metrics.h" +#include <stddef.h> + #include "base/metrics/histogram.h" #include "base/metrics/sparse_histogram.h" +#include "build/build_config.h" #include "ppapi/shared_impl/ppapi_preferences.h" #if defined(OS_WIN)
diff --git a/content/renderer/pepper/pepper_plugin_registry.cc b/content/renderer/pepper/pepper_plugin_registry.cc index 38a4aa3..51c49ac 100644 --- a/content/renderer/pepper/pepper_plugin_registry.cc +++ b/content/renderer/pepper/pepper_plugin_registry.cc
@@ -4,6 +4,8 @@ #include "content/renderer/pepper/pepper_plugin_registry.h" +#include <stddef.h> + #include "base/logging.h" #include "content/common/pepper_plugin_list.h" #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
diff --git a/content/renderer/pepper/pepper_plugin_registry.h b/content/renderer/pepper/pepper_plugin_registry.h index 83319a9b..ca534078 100644 --- a/content/renderer/pepper/pepper_plugin_registry.h +++ b/content/renderer/pepper/pepper_plugin_registry.h
@@ -8,6 +8,7 @@ #include <list> #include <map> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/common/pepper_plugin_info.h"
diff --git a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc index 7a5a0c1..8b294ab1 100644 --- a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc +++ b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc
@@ -4,6 +4,7 @@ #include "content/renderer/pepper/pepper_proxy_channel_delegate_impl.h" +#include "build/build_config.h" #include "content/child/child_process.h" #include "content/common/sandbox_util.h"
diff --git a/content/renderer/pepper/pepper_try_catch.h b/content/renderer/pepper/pepper_try_catch.h index 8dbbb9b..7a8ce1a 100644 --- a/content/renderer/pepper/pepper_try_catch.h +++ b/content/renderer/pepper/pepper_try_catch.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_TRY_CATCH_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_TRY_CATCH_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "ppapi/c/pp_var.h"
diff --git a/content/renderer/pepper/pepper_url_loader_host.cc b/content/renderer/pepper/pepper_url_loader_host.cc index 5b08f0a..6f63a639 100644 --- a/content/renderer/pepper/pepper_url_loader_host.cc +++ b/content/renderer/pepper/pepper_url_loader_host.cc
@@ -4,6 +4,8 @@ #include "content/renderer/pepper/pepper_url_loader_host.h" +#include <stddef.h> + #include "content/renderer/pepper/pepper_plugin_instance_impl.h" #include "content/renderer/pepper/renderer_ppapi_host_impl.h" #include "content/renderer/pepper/url_request_info_util.h"
diff --git a/content/renderer/pepper/pepper_url_loader_host.h b/content/renderer/pepper/pepper_url_loader_host.h index 8ea3c2e..8f820e10 100644 --- a/content/renderer/pepper/pepper_url_loader_host.h +++ b/content/renderer/pepper/pepper_url_loader_host.h
@@ -5,8 +5,11 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_URL_LOADER_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_URL_LOADER_HOST_H_ +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h"
diff --git a/content/renderer/pepper/pepper_video_capture_host.cc b/content/renderer/pepper/pepper_video_capture_host.cc index 22b0389..4e08661 100644 --- a/content/renderer/pepper/pepper_video_capture_host.cc +++ b/content/renderer/pepper/pepper_video_capture_host.cc
@@ -144,13 +144,13 @@ // TODO(ihf): handle size mismatches gracefully here. return; } - uint8* dst = reinterpret_cast<uint8*>(buffers_[i].data); + uint8_t* dst = reinterpret_cast<uint8_t*>(buffers_[i].data); static_assert(media::VideoFrame::kYPlane == 0, "y plane should be 0"); static_assert(media::VideoFrame::kUPlane == 1, "u plane should be 1"); static_assert(media::VideoFrame::kVPlane == 2, "v plane should be 2"); for (size_t j = 0; j < media::VideoFrame::NumPlanes(frame->format()); ++j) { - const uint8* src = frame->visible_data(j); + const uint8_t* src = frame->visible_data(j); const size_t row_bytes = frame->row_bytes(j); const size_t src_stride = frame->stride(j); for (int k = 0; k < frame->rows(j); ++k) {
diff --git a/content/renderer/pepper/pepper_video_capture_host.h b/content/renderer/pepper/pepper_video_capture_host.h index 24061b5e7..01d678b 100644 --- a/content/renderer/pepper/pepper_video_capture_host.h +++ b/content/renderer/pepper/pepper_video_capture_host.h
@@ -5,7 +5,11 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_CAPTURE_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_CAPTURE_HOST_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "content/common/media/video_capture.h"
diff --git a/content/renderer/pepper/pepper_video_decoder_host.cc b/content/renderer/pepper/pepper_video_decoder_host.cc index 2b5f584..50403a69 100644 --- a/content/renderer/pepper/pepper_video_decoder_host.cc +++ b/content/renderer/pepper/pepper_video_decoder_host.cc
@@ -4,8 +4,11 @@ #include "content/renderer/pepper/pepper_video_decoder_host.h" +#include <stddef.h> + #include "base/bind.h" #include "base/memory/shared_memory.h" +#include "build/build_config.h" #include "content/common/gpu/client/command_buffer_proxy_impl.h" #include "content/common/pepper_file_util.h" #include "content/public/common/content_client.h" @@ -342,9 +345,9 @@ } void PepperVideoDecoderHost::ProvidePictureBuffers( - uint32 requested_num_of_buffers, + uint32_t requested_num_of_buffers, const gfx::Size& dimensions, - uint32 texture_target) { + uint32_t texture_target) { RequestTextures(std::max(min_picture_count_, requested_num_of_buffers), dimensions, texture_target, @@ -367,7 +370,7 @@ picture.picture_buffer_id(), visible_rect)); } -void PepperVideoDecoderHost::DismissPictureBuffer(int32 picture_buffer_id) { +void PepperVideoDecoderHost::DismissPictureBuffer(int32_t picture_buffer_id) { PictureBufferMap::iterator it = picture_buffer_map_.find(picture_buffer_id); DCHECK(it != picture_buffer_map_.end()); @@ -386,7 +389,7 @@ } void PepperVideoDecoderHost::NotifyEndOfBitstreamBuffer( - int32 bitstream_buffer_id) { + int32_t bitstream_buffer_id) { PendingDecodeList::iterator it = GetPendingDecodeById(bitstream_buffer_id); if (it == pending_decodes_.end()) { NOTREACHED(); @@ -448,9 +451,9 @@ } void PepperVideoDecoderHost::RequestTextures( - uint32 requested_num_of_buffers, + uint32_t requested_num_of_buffers, const gfx::Size& dimensions, - uint32 texture_target, + uint32_t texture_target, const std::vector<gpu::Mailbox>& mailboxes) { host()->SendUnsolicitedReply( pp_resource(),
diff --git a/content/renderer/pepper/pepper_video_decoder_host.h b/content/renderer/pepper/pepper_video_decoder_host.h index b82a0cc4..7a63d4f5 100644 --- a/content/renderer/pepper/pepper_video_decoder_host.h +++ b/content/renderer/pepper/pepper_video_decoder_host.h
@@ -5,13 +5,15 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DECODER_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DECODER_HOST_H_ +#include <stdint.h> + #include <list> #include <map> #include <set> #include <vector> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "content/common/content_export.h" @@ -70,12 +72,12 @@ ppapi::host::HostMessageContext* context) override; // media::VideoDecodeAccelerator::Client implementation. - void ProvidePictureBuffers(uint32 requested_num_of_buffers, + void ProvidePictureBuffers(uint32_t requested_num_of_buffers, const gfx::Size& dimensions, - uint32 texture_target) override; - void DismissPictureBuffer(int32 picture_buffer_id) override; + uint32_t texture_target) override; + void DismissPictureBuffer(int32_t picture_buffer_id) override; void PictureReady(const media::Picture& picture) override; - void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) override; + void NotifyEndOfBitstreamBuffer(int32_t bitstream_buffer_id) override; void NotifyFlushDone() override; void NotifyResetDone() override; void NotifyError(media::VideoDecodeAccelerator::Error error) override; @@ -103,9 +105,9 @@ // These methods are needed by VideoDecodeShim, to look like a // VideoDecodeAccelerator. const uint8_t* DecodeIdToAddress(uint32_t decode_id); - void RequestTextures(uint32 requested_num_of_buffers, + void RequestTextures(uint32_t requested_num_of_buffers, const gfx::Size& dimensions, - uint32 texture_target, + uint32_t texture_target, const std::vector<gpu::Mailbox>& mailboxes); // Tries to initialize software decoder. Returns true on success.
diff --git a/content/renderer/pepper/pepper_video_destination_host.cc b/content/renderer/pepper/pepper_video_destination_host.cc index 0978653..3f682db 100644 --- a/content/renderer/pepper/pepper_video_destination_host.cc +++ b/content/renderer/pepper/pepper_video_destination_host.cc
@@ -82,7 +82,7 @@ if (!frame_writer_.get()) return PP_ERROR_FAILED; - // Convert PP_TimeTicks (a double, in seconds) to a video timestamp (int64, + // Convert PP_TimeTicks (a double, in seconds) to a video timestamp (int64_t, // nanoseconds). const int64_t timestamp_ns = static_cast<int64_t>(timestamp * base::Time::kNanosecondsPerSecond);
diff --git a/content/renderer/pepper/pepper_video_destination_host.h b/content/renderer/pepper/pepper_video_destination_host.h index 3b2485a..75208a7f 100644 --- a/content/renderer/pepper/pepper_video_destination_host.h +++ b/content/renderer/pepper/pepper_video_destination_host.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DESTINATION_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DESTINATION_HOST_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h"
diff --git a/content/renderer/pepper/pepper_video_encoder_host.cc b/content/renderer/pepper/pepper_video_encoder_host.cc index 0e1a199..1bb34a2 100644 --- a/content/renderer/pepper/pepper_video_encoder_host.cc +++ b/content/renderer/pepper/pepper_video_encoder_host.cc
@@ -5,6 +5,7 @@ #include "base/bind.h" #include "base/memory/shared_memory.h" #include "base/numerics/safe_math.h" +#include "build/build_config.h" #include "content/common/gpu/client/command_buffer_proxy_impl.h" #include "content/common/gpu/media/gpu_video_accelerator_util.h" #include "content/common/pepper_file_util.h" @@ -421,7 +422,7 @@ AllocateVideoFrames(); } -void PepperVideoEncoderHost::BitstreamBufferReady(int32 buffer_id, +void PepperVideoEncoderHost::BitstreamBufferReady(int32_t buffer_id, size_t payload_size, bool key_frame) { DCHECK(RenderThreadImpl::current()); @@ -499,7 +500,7 @@ if (!channel_) return false; - std::vector<int32> attribs(1, PP_GRAPHICS3DATTRIB_NONE); + std::vector<int32_t> attribs(1, PP_GRAPHICS3DATTRIB_NONE); command_buffer_ = channel_->CreateOffscreenCommandBuffer( gfx::Size(), nullptr, GpuChannelHost::kDefaultStreamId, GpuChannelHost::kDefaultStreamPriority, attribs, GURL::EmptyGURL(), @@ -623,13 +624,13 @@ ppapi::MediaStreamBuffer* buffer = buffer_manager_.GetBufferPointer(frame_id); DCHECK(buffer); - uint32_t shm_offset = static_cast<uint8*>(buffer->video.data) - - static_cast<uint8*>(buffer_manager_.shm()->memory()); + uint32_t shm_offset = static_cast<uint8_t*>(buffer->video.data) - + static_cast<uint8_t*>(buffer_manager_.shm()->memory()); scoped_refptr<media::VideoFrame> frame = media::VideoFrame::WrapExternalSharedMemory( media_input_format_, input_coded_size_, gfx::Rect(input_coded_size_), - input_coded_size_, static_cast<uint8*>(buffer->video.data), + input_coded_size_, static_cast<uint8_t*>(buffer->video.data), buffer->video.data_size, buffer_manager_.shm()->handle(), shm_offset, base::TimeDelta()); frame->AddDestructionObserver( @@ -658,10 +659,10 @@ PpapiPluginMsg_VideoEncoder_NotifyError(encoder_last_error_)); } -uint8_t* PepperVideoEncoderHost::ShmHandleToAddress(int32 buffer_id) { +uint8_t* PepperVideoEncoderHost::ShmHandleToAddress(int32_t buffer_id) { DCHECK(RenderThreadImpl::current()); DCHECK_GE(buffer_id, 0); - DCHECK_LT(buffer_id, static_cast<int32>(shm_buffers_.size())); + DCHECK_LT(buffer_id, static_cast<int32_t>(shm_buffers_.size())); return static_cast<uint8_t*>(shm_buffers_[buffer_id]->shm->memory()); }
diff --git a/content/renderer/pepper/pepper_video_encoder_host.h b/content/renderer/pepper/pepper_video_encoder_host.h index 39f98ef..5bc8d70c 100644 --- a/content/renderer/pepper/pepper_video_encoder_host.h +++ b/content/renderer/pepper/pepper_video_encoder_host.h
@@ -5,6 +5,10 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_ENCODER_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_ENCODER_HOST_H_ +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" @@ -59,7 +63,7 @@ void RequireBitstreamBuffers(unsigned int input_count, const gfx::Size& input_coded_size, size_t output_buffer_size) override; - void BitstreamBufferReady(int32 bitstream_buffer_id, + void BitstreamBufferReady(int32_t bitstream_buffer_id, size_t payload_size, bool key_frame) override; void NotifyError(media::VideoEncodeAccelerator::Error error) override; @@ -112,7 +116,7 @@ void NotifyPepperError(int32_t error); // Helper method for VideoEncoderShim. - uint8_t* ShmHandleToAddress(int32 buffer_id); + uint8_t* ShmHandleToAddress(int32_t buffer_id); // Non-owning pointer. RendererPpapiHost* renderer_ppapi_host_;
diff --git a/content/renderer/pepper/pepper_video_source_host.h b/content/renderer/pepper/pepper_video_source_host.h index 8469fc9..0b5b0a1 100644 --- a/content/renderer/pepper/pepper_video_source_host.h +++ b/content/renderer/pepper/pepper_video_source_host.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_SOURCE_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_SOURCE_HOST_H_ +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/renderer/pepper/pepper_webplugin_impl.cc b/content/renderer/pepper/pepper_webplugin_impl.cc index 38e25e5..9a846d0 100644 --- a/content/renderer/pepper/pepper_webplugin_impl.cc +++ b/content/renderer/pepper/pepper_webplugin_impl.cc
@@ -4,6 +4,8 @@ #include "content/renderer/pepper/pepper_webplugin_impl.h" +#include <stddef.h> + #include <cmath> #include "base/debug/crash_logging.h"
diff --git a/content/renderer/pepper/pepper_webplugin_impl.h b/content/renderer/pepper/pepper_webplugin_impl.h index 5bfa988..d8ee01d 100644 --- a/content/renderer/pepper/pepper_webplugin_impl.h +++ b/content/renderer/pepper/pepper_webplugin_impl.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner_helpers.h"
diff --git a/content/renderer/pepper/pepper_webplugin_impl_browsertest.cc b/content/renderer/pepper/pepper_webplugin_impl_browsertest.cc index 6dd2e0a..42839b56 100644 --- a/content/renderer/pepper/pepper_webplugin_impl_browsertest.cc +++ b/content/renderer/pepper/pepper_webplugin_impl_browsertest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/command_line.h" #include "content/public/common/content_client.h" #include "content/public/common/content_constants.h"
diff --git a/content/renderer/pepper/pepper_websocket_host.h b/content/renderer/pepper/pepper_websocket_host.h index ee99667..c0106ad 100644 --- a/content/renderer/pepper/pepper_websocket_host.h +++ b/content/renderer/pepper/pepper_websocket_host.h
@@ -5,8 +5,11 @@ #ifndef CONTENT_RENDERER_PEPPER_PEPPER_WEBSOCKET_HOST_H_ #define CONTENT_RENDERER_PEPPER_PEPPER_WEBSOCKET_HOST_H_ +#include <stdint.h> + #include <queue> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h"
diff --git a/content/renderer/pepper/plugin_module.cc b/content/renderer/pepper/plugin_module.cc index 223b8481..629d99f3 100644 --- a/content/renderer/pepper/plugin_module.cc +++ b/content/renderer/pepper/plugin_module.cc
@@ -4,6 +4,9 @@ #include "content/renderer/pepper/plugin_module.h" +#include <stddef.h> +#include <stdint.h> + #include <set> #include "base/bind.h"
diff --git a/content/renderer/pepper/plugin_module.h b/content/renderer/pepper/plugin_module.h index 535ee257..807a93a 100644 --- a/content/renderer/pepper/plugin_module.h +++ b/content/renderer/pepper/plugin_module.h
@@ -9,8 +9,8 @@ #include <set> #include <string> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/renderer/pepper/plugin_object.cc b/content/renderer/pepper/plugin_object.cc index 1943b10..c8c6d0f 100644 --- a/content/renderer/pepper/plugin_object.cc +++ b/content/renderer/pepper/plugin_object.cc
@@ -4,6 +4,8 @@ #include "content/renderer/pepper/plugin_object.h" +#include <stdint.h> + #include "base/bind.h" #include "base/logging.h" #include "base/memory/ref_counted.h"
diff --git a/content/renderer/pepper/plugin_object.h b/content/renderer/pepper/plugin_object.h index d5502d8..118e1cbe 100644 --- a/content/renderer/pepper/plugin_object.h +++ b/content/renderer/pepper/plugin_object.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "gin/interceptor.h" #include "gin/wrappable.h"
diff --git a/content/renderer/pepper/plugin_power_saver_helper.h b/content/renderer/pepper/plugin_power_saver_helper.h index 1b97006..95fbc88 100644 --- a/content/renderer/pepper/plugin_power_saver_helper.h +++ b/content/renderer/pepper/plugin_power_saver_helper.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h"
diff --git a/content/renderer/pepper/plugin_power_saver_helper_browsertest.cc b/content/renderer/pepper/plugin_power_saver_helper_browsertest.cc index 9e42241..d701c31b 100644 --- a/content/renderer/pepper/plugin_power_saver_helper_browsertest.cc +++ b/content/renderer/pepper/plugin_power_saver_helper_browsertest.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 "base/macros.h" #include "base/run_loop.h" #include "content/common/frame_messages.h" #include "content/common/view_message_enums.h"
diff --git a/content/renderer/pepper/ppb_audio_impl.h b/content/renderer/pepper/ppb_audio_impl.h index 130a6f3c..311dfb93 100644 --- a/content/renderer/pepper/ppb_audio_impl.h +++ b/content/renderer/pepper/ppb_audio_impl.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_PEPPER_PPB_AUDIO_IMPL_H_ #define CONTENT_RENDERER_PEPPER_PPB_AUDIO_IMPL_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/shared_memory.h" #include "base/sync_socket.h"
diff --git a/content/renderer/pepper/ppb_broker_impl.h b/content/renderer/pepper/ppb_broker_impl.h index b43d3a6..54a1680a 100644 --- a/content/renderer/pepper/ppb_broker_impl.h +++ b/content/renderer/pepper/ppb_broker_impl.h
@@ -5,8 +5,10 @@ #ifndef CONTENT_RENDERER_PEPPER_PPB_BROKER_IMPL_H_ #define CONTENT_RENDERER_PEPPER_PPB_BROKER_IMPL_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/process/process.h" #include "ipc/ipc_listener.h"
diff --git a/content/renderer/pepper/ppb_buffer_impl.h b/content/renderer/pepper/ppb_buffer_impl.h index 19fbcb39..a98deb7f 100644 --- a/content/renderer/pepper/ppb_buffer_impl.h +++ b/content/renderer/pepper/ppb_buffer_impl.h
@@ -5,7 +5,9 @@ #ifndef CONTENT_RENDERER_PEPPER_PPB_BUFFER_IMPL_H_ #define CONTENT_RENDERER_PEPPER_PPB_BUFFER_IMPL_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h"
diff --git a/content/renderer/pepper/ppb_flash_message_loop_impl.h b/content/renderer/pepper/ppb_flash_message_loop_impl.h index 29c4e1b1..dc458d4 100644 --- a/content/renderer/pepper/ppb_flash_message_loop_impl.h +++ b/content/renderer/pepper/ppb_flash_message_loop_impl.h
@@ -5,8 +5,10 @@ #ifndef CONTENT_RENDERER_PEPPER_PPB_FLASH_MESSAGE_LOOP_IMPL_H_ #define CONTENT_RENDERER_PEPPER_PPB_FLASH_MESSAGE_LOOP_IMPL_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/thunk/ppb_flash_message_loop_api.h"
diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.cc b/content/renderer/pepper/ppb_graphics_3d_impl.cc index 783f800..3fc3a846 100644 --- a/content/renderer/pepper/ppb_graphics_3d_impl.cc +++ b/content/renderer/pepper/ppb_graphics_3d_impl.cc
@@ -41,8 +41,8 @@ namespace { -const int32 kCommandBufferSize = 1024 * 1024; -const int32 kTransferBufferSize = 1024 * 1024; +const int32_t kCommandBufferSize = 1024 * 1024; +const int32_t kTransferBufferSize = 1024 * 1024; } // namespace @@ -171,7 +171,7 @@ return command_buffer_.get(); } -int32 PPB_Graphics3D_Impl::DoSwapBuffers() { +int32_t PPB_Graphics3D_Impl::DoSwapBuffers() { DCHECK(command_buffer_); // We do not have a GLES2 implementation when using an OOP proxy. // The plugin-side proxy is responsible for adding the SwapBuffers command @@ -254,7 +254,7 @@ return false; gfx::Size surface_size; - std::vector<int32> attribs; + std::vector<int32_t> attribs; gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu; // TODO(alokp): Change GpuChannelHost::CreateOffscreenCommandBuffer() // interface to accept width and height in the attrib_list so that
diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.h b/content/renderer/pepper/ppb_graphics_3d_impl.h index 8fbde07..3d103f2 100644 --- a/content/renderer/pepper/ppb_graphics_3d_impl.h +++ b/content/renderer/pepper/ppb_graphics_3d_impl.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_PEPPER_PPB_GRAPHICS_3D_IMPL_H_ #define CONTENT_RENDERER_PEPPER_PPB_GRAPHICS_3D_IMPL_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/shared_memory.h" #include "base/memory/weak_ptr.h" #include "gpu/command_buffer/common/mailbox.h" @@ -35,7 +38,7 @@ // PPB_Graphics3D_API trusted implementation. PP_Bool SetGetBuffer(int32_t transfer_buffer_id) override; scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size, - int32* id) override; + int32_t* id) override; PP_Bool DestroyTransferBuffer(int32_t id) override; PP_Bool Flush(int32_t put_offset) override; gpu::CommandBuffer::State WaitForTokenInRange(int32_t start, @@ -57,7 +60,7 @@ // These messages are used to send Flush callbacks to the plugin. void ViewInitiatedPaint(); - void GetBackingMailbox(gpu::Mailbox* mailbox, uint32* sync_point) { + void GetBackingMailbox(gpu::Mailbox* mailbox, uint32_t* sync_point) { *mailbox = mailbox_; *sync_point = sync_point_; } @@ -71,7 +74,7 @@ // ppapi::PPB_Graphics3D_Shared overrides. gpu::CommandBuffer* GetCommandBuffer() override; gpu::GpuControl* GetGpuControl() override; - int32 DoSwapBuffers() override; + int32_t DoSwapBuffers() override; private: explicit PPB_Graphics3D_Impl(PP_Instance instance); @@ -96,7 +99,7 @@ bool commit_pending_; gpu::Mailbox mailbox_; - uint32 sync_point_; + uint32_t sync_point_; bool has_alpha_; scoped_refptr<GpuChannelHost> channel_; scoped_ptr<CommandBufferProxyImpl> command_buffer_;
diff --git a/content/renderer/pepper/ppb_image_data_impl.cc b/content/renderer/pepper/ppb_image_data_impl.cc index a7c5f0a..56cc3731 100644 --- a/content/renderer/pepper/ppb_image_data_impl.cc +++ b/content/renderer/pepper/ppb_image_data_impl.cc
@@ -64,8 +64,8 @@ return false; // Only support this one format for now. if (width <= 0 || height <= 0) return false; - if (static_cast<int64>(width) * static_cast<int64>(height) >= - std::numeric_limits<int32>::max() / 4) + if (static_cast<int64_t>(width) * static_cast<int64_t>(height) >= + std::numeric_limits<int32_t>::max() / 4) return false; // Prevent overflow of signed 32-bit ints. format_ = format; @@ -142,7 +142,7 @@ // TODO(brettw) use init_to_zero when we implement caching. width_ = width; height_ = height; - uint32 buffer_size = width_ * height_ * 4; + uint32_t buffer_size = width_ * height_ * 4; scoped_ptr<base::SharedMemory> shared_memory = RenderThread::Get()->HostAllocateSharedMemoryBuffer(buffer_size); if (!shared_memory)
diff --git a/content/renderer/pepper/ppb_image_data_impl.h b/content/renderer/pepper/ppb_image_data_impl.h index b7a4540..3168f0d 100644 --- a/content/renderer/pepper/ppb_image_data_impl.h +++ b/content/renderer/pepper/ppb_image_data_impl.h
@@ -5,7 +5,9 @@ #ifndef CONTENT_RENDERER_PEPPER_PPB_IMAGE_DATA_IMPL_H_ #define CONTENT_RENDERER_PEPPER_PPB_IMAGE_DATA_IMPL_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "content/common/content_export.h" @@ -173,7 +175,7 @@ // skia_bitmap_ is backed by shared_memory_. SkBitmap skia_bitmap_; scoped_ptr<SkCanvas> skia_canvas_; - uint32 map_count_; + uint32_t map_count_; DISALLOW_COPY_AND_ASSIGN(ImageDataSimpleBackend); };
diff --git a/content/renderer/pepper/ppb_var_deprecated_impl.cc b/content/renderer/pepper/ppb_var_deprecated_impl.cc index dd2c80b..7426ca4 100644 --- a/content/renderer/pepper/ppb_var_deprecated_impl.cc +++ b/content/renderer/pepper/ppb_var_deprecated_impl.cc
@@ -4,6 +4,9 @@ #include "content/renderer/pepper/ppb_var_deprecated_impl.h" +#include <stddef.h> +#include <stdint.h> + #include <limits> #include "content/renderer/pepper/host_globals.h"
diff --git a/content/renderer/pepper/ppb_video_decoder_impl.cc b/content/renderer/pepper/ppb_video_decoder_impl.cc index 8be5e80a..d4c067fe 100644 --- a/content/renderer/pepper/ppb_video_decoder_impl.cc +++ b/content/renderer/pepper/ppb_video_decoder_impl.cc
@@ -176,7 +176,7 @@ no_of_buffers); std::vector<media::PictureBuffer> wrapped_buffers; - for (uint32 i = 0; i < no_of_buffers; i++) { + for (uint32_t i = 0; i < no_of_buffers; i++) { PP_PictureBuffer_Dev in_buf = buffers[i]; DCHECK_GE(in_buf.id, 0); media::PictureBuffer buffer( @@ -234,9 +234,9 @@ } void PPB_VideoDecoder_Impl::ProvidePictureBuffers( - uint32 requested_num_of_buffers, + uint32_t requested_num_of_buffers, const gfx::Size& dimensions, - uint32 texture_target) { + uint32_t texture_target) { DCHECK(RenderThreadImpl::current()); if (!GetPPP()) return; @@ -260,7 +260,7 @@ GetPPP()->PictureReady(pp_instance(), pp_resource(), &output); } -void PPB_VideoDecoder_Impl::DismissPictureBuffer(int32 picture_buffer_id) { +void PPB_VideoDecoder_Impl::DismissPictureBuffer(int32_t picture_buffer_id) { DCHECK(RenderThreadImpl::current()); if (!GetPPP()) return; @@ -287,7 +287,7 @@ } void PPB_VideoDecoder_Impl::NotifyEndOfBitstreamBuffer( - int32 bitstream_buffer_id) { + int32_t bitstream_buffer_id) { DCHECK(RenderThreadImpl::current()); RunBitstreamBufferCallback(bitstream_buffer_id, PP_OK); }
diff --git a/content/renderer/pepper/ppb_video_decoder_impl.h b/content/renderer/pepper/ppb_video_decoder_impl.h index 094bcff..b9f4d6a 100644 --- a/content/renderer/pepper/ppb_video_decoder_impl.h +++ b/content/renderer/pepper/ppb_video_decoder_impl.h
@@ -5,8 +5,10 @@ #ifndef CONTENT_RENDERER_PEPPER_PPB_VIDEO_DECODER_IMPL_H_ #define CONTENT_RENDERER_PEPPER_PPB_VIDEO_DECODER_IMPL_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "media/video/video_decode_accelerator.h" #include "ppapi/c/dev/pp_video_dev.h" @@ -42,14 +44,14 @@ void Destroy() override; // media::VideoDecodeAccelerator::Client implementation. - void ProvidePictureBuffers(uint32 requested_num_of_buffers, + void ProvidePictureBuffers(uint32_t requested_num_of_buffers, const gfx::Size& dimensions, - uint32 texture_target) override; - void DismissPictureBuffer(int32 picture_buffer_id) override; + uint32_t texture_target) override; + void DismissPictureBuffer(int32_t picture_buffer_id) override; void PictureReady(const media::Picture& picture) override; void NotifyError(media::VideoDecodeAccelerator::Error error) override; void NotifyFlushDone() override; - void NotifyEndOfBitstreamBuffer(int32 buffer_id) override; + void NotifyEndOfBitstreamBuffer(int32_t buffer_id) override; void NotifyResetDone() override; private:
diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.h b/content/renderer/pepper/renderer_ppapi_host_impl.h index fdadd08..f73100b 100644 --- a/content/renderer/pepper/renderer_ppapi_host_impl.h +++ b/content/renderer/pepper/renderer_ppapi_host_impl.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_PEPPER_RENDERER_PPAPI_HOST_IMPL_H_ #define CONTENT_RENDERER_PEPPER_RENDERER_PPAPI_HOST_IMPL_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "content/renderer/pepper/content_renderer_pepper_host_factory.h"
diff --git a/content/renderer/pepper/resource_converter.cc b/content/renderer/pepper/resource_converter.cc index c4d4cf0..7e66b71 100644 --- a/content/renderer/pepper/resource_converter.cc +++ b/content/renderer/pepper/resource_converter.cc
@@ -4,6 +4,8 @@ #include "content/renderer/pepper/resource_converter.h" +#include <stddef.h> + #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "content/public/renderer/renderer_ppapi_host.h"
diff --git a/content/renderer/pepper/resource_converter.h b/content/renderer/pepper/resource_converter.h index 2c20d7e..ee820de4 100644 --- a/content/renderer/pepper/resource_converter.h +++ b/content/renderer/pepper/resource_converter.h
@@ -7,9 +7,9 @@ #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "content/renderer/pepper/host_resource_var.h"
diff --git a/content/renderer/pepper/resource_creation_impl.cc b/content/renderer/pepper/resource_creation_impl.cc index 929f8ad7..c76d0b1 100644 --- a/content/renderer/pepper/resource_creation_impl.cc +++ b/content/renderer/pepper/resource_creation_impl.cc
@@ -4,6 +4,7 @@ #include "content/renderer/pepper/resource_creation_impl.h" +#include "build/build_config.h" #include "content/common/content_switches_internal.h" #include "content/renderer/pepper/ppb_audio_impl.h" #include "content/renderer/pepper/ppb_broker_impl.h"
diff --git a/content/renderer/pepper/resource_creation_impl.h b/content/renderer/pepper/resource_creation_impl.h index 5f7cc43..3e44cee 100644 --- a/content/renderer/pepper/resource_creation_impl.h +++ b/content/renderer/pepper/resource_creation_impl.h
@@ -5,8 +5,10 @@ #ifndef CONTENT_RENDERER_PEPPER_RESOURCE_CREATION_IMPL_H_ #define CONTENT_RENDERER_PEPPER_RESOURCE_CREATION_IMPL_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ppapi/thunk/resource_creation_api.h" namespace content {
diff --git a/content/renderer/pepper/url_request_info_util.cc b/content/renderer/pepper/url_request_info_util.cc index 4b70190b..157fc9c 100644 --- a/content/renderer/pepper/url_request_info_util.cc +++ b/content/renderer/pepper/url_request_info_util.cc
@@ -4,6 +4,9 @@ #include "content/renderer/pepper/url_request_info_util.h" +#include <stddef.h> +#include <stdint.h> + #include "base/logging.h" #include "base/strings/string_util.h" #include "content/child/request_extra_data.h"
diff --git a/content/renderer/pepper/url_response_info_util.cc b/content/renderer/pepper/url_response_info_util.cc index b2bd40b7..d657800 100644 --- a/content/renderer/pepper/url_response_info_util.cc +++ b/content/renderer/pepper/url_response_info_util.cc
@@ -4,6 +4,8 @@ #include "content/renderer/pepper/url_response_info_util.h" +#include <stdint.h> + #include "base/bind.h" #include "base/files/file_path.h" #include "base/location.h"
diff --git a/content/renderer/pepper/v8_var_converter.cc b/content/renderer/pepper/v8_var_converter.cc index 536827b..eff2cabe 100644 --- a/content/renderer/pepper/v8_var_converter.cc +++ b/content/renderer/pepper/v8_var_converter.cc
@@ -4,6 +4,9 @@ #include "content/renderer/pepper/v8_var_converter.h" +#include <stddef.h> +#include <stdint.h> + #include <map> #include <stack> #include <string> @@ -377,7 +380,7 @@ if (did_create && CanHaveChildren(child_var)) stack.push(child_var); v8::TryCatch try_catch(isolate); - v8_array->Set(static_cast<uint32>(i), child_v8); + v8_array->Set(static_cast<uint32_t>(i), child_v8); if (try_catch.HasCaught()) { LOG(ERROR) << "Setter for index " << i << " threw an exception."; return false; @@ -516,7 +519,7 @@ return false; } - for (uint32 i = 0; i < v8_array->Length(); ++i) { + for (uint32_t i = 0; i < v8_array->Length(); ++i) { v8::TryCatch try_catch(context->GetIsolate()); v8::Local<v8::Value> child_v8 = v8_array->Get(i); if (try_catch.HasCaught()) @@ -554,7 +557,7 @@ } v8::Local<v8::Array> property_names(v8_object->GetOwnPropertyNames()); - for (uint32 i = 0; i < property_names->Length(); ++i) { + for (uint32_t i = 0; i < property_names->Length(); ++i) { v8::Local<v8::Value> key(property_names->Get(i)); // Extend this test to cover more types as necessary and if sensible.
diff --git a/content/renderer/pepper/v8_var_converter.h b/content/renderer/pepper/v8_var_converter.h index 6e537268..4a65bea6 100644 --- a/content/renderer/pepper/v8_var_converter.h +++ b/content/renderer/pepper/v8_var_converter.h
@@ -5,14 +5,14 @@ #ifndef CONTENT_RENDERER_PEPPER_V8_VAR_CONVERTER_H_ #define CONTENT_RENDERER_PEPPER_V8_VAR_CONVERTER_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" +#include "content/common/content_export.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_var.h" #include "ppapi/shared_impl/scoped_pp_var.h" #include "v8/include/v8.h" -#include "content/common/content_export.h" namespace content {
diff --git a/content/renderer/pepper/v8_var_converter_unittest.cc b/content/renderer/pepper/v8_var_converter_unittest.cc index 6742060..cb68d6c 100644 --- a/content/renderer/pepper/v8_var_converter_unittest.cc +++ b/content/renderer/pepper/v8_var_converter_unittest.cc
@@ -4,6 +4,9 @@ #include "content/renderer/pepper/v8_var_converter.h" +#include <stddef.h> +#include <stdint.h> + #include <cmath> #include "base/logging.h" @@ -113,7 +116,7 @@ v8::Local<v8::Array> v8_array = val.As<v8::Array>(); if (v8_array->Length() != array_var->elements().size()) return false; - for (uint32 i = 0; i < v8_array->Length(); ++i) { + for (uint32_t i = 0; i < v8_array->Length(); ++i) { v8::Local<v8::Value> child_v8 = v8_array->Get(i); if (!Equals(array_var->elements()[i].get(), child_v8, visited_ids)) return false; @@ -133,7 +136,7 @@ v8::Local<v8::Array> property_names(v8_object->GetOwnPropertyNames()); if (property_names->Length() != dict_var->key_value_map().size()) return false; - for (uint32 i = 0; i < property_names->Length(); ++i) { + for (uint32_t i = 0; i < property_names->Length(); ++i) { v8::Local<v8::Value> key(property_names->Get(i)); if (!key->IsString() && !key->IsNumber())
diff --git a/content/renderer/pepper/v8object_var.h b/content/renderer/pepper/v8object_var.h index 4a4feb1f..2527d5f 100644 --- a/content/renderer/pepper/v8object_var.h +++ b/content/renderer/pepper/v8object_var.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "ppapi/c/pp_instance.h" #include "ppapi/shared_impl/var.h"
diff --git a/content/renderer/pepper/video_decoder_shim.cc b/content/renderer/pepper/video_decoder_shim.cc index 9dab8b9..265eb2f 100644 --- a/content/renderer/pepper/video_decoder_shim.cc +++ b/content/renderer/pepper/video_decoder_shim.cc
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/location.h" +#include "base/macros.h" #include "base/thread_task_runner_handle.h" #ifndef NDEBUG #include "base/logging.h" @@ -955,7 +956,7 @@ SendPictures(); } -void VideoDecoderShim::ReusePictureBuffer(int32 picture_buffer_id) { +void VideoDecoderShim::ReusePictureBuffer(int32_t picture_buffer_id) { DCHECK(RenderThreadImpl::current()); uint32_t texture_id = static_cast<uint32_t>(picture_buffer_id); if (textures_to_dismiss_.find(texture_id) != textures_to_dismiss_.end()) {
diff --git a/content/renderer/pepper/video_decoder_shim.h b/content/renderer/pepper/video_decoder_shim.h index 566a0de..0eac81e 100644 --- a/content/renderer/pepper/video_decoder_shim.h +++ b/content/renderer/pepper/video_decoder_shim.h
@@ -5,11 +5,13 @@ #ifndef CONTENT_RENDERER_PEPPER_VIDEO_DECODER_SHIM_H_ #define CONTENT_RENDERER_PEPPER_VIDEO_DECODER_SHIM_H_ +#include <stdint.h> + #include <queue> #include <vector> -#include "base/basictypes.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "gpu/command_buffer/common/mailbox.h" @@ -54,7 +56,7 @@ void Decode(const media::BitstreamBuffer& bitstream_buffer) override; void AssignPictureBuffers( const std::vector<media::PictureBuffer>& buffers) override; - void ReusePictureBuffer(int32 picture_buffer_id) override; + void ReusePictureBuffer(int32_t picture_buffer_id) override; void Flush() override; void Reset() override; void Destroy() override;
diff --git a/content/renderer/pepper/video_encoder_shim.cc b/content/renderer/pepper/video_encoder_shim.cc index 0789ee3..55d640a 100644 --- a/content/renderer/pepper/video_encoder_shim.cc +++ b/content/renderer/pepper/video_encoder_shim.cc
@@ -99,12 +99,12 @@ void Initialize(media::VideoPixelFormat input_format, const gfx::Size& input_visible_size, media::VideoCodecProfile output_profile, - uint32 initial_bitrate); + uint32_t initial_bitrate); void Encode(const scoped_refptr<media::VideoFrame>& frame, bool force_keyframe); void UseOutputBitstreamBuffer(const media::BitstreamBuffer& buffer, uint8_t* mem); - void RequestEncodingParametersChange(uint32 bitrate, uint32 framerate); + void RequestEncodingParametersChange(uint32_t bitrate, uint32_t framerate); void Stop(); private: @@ -139,7 +139,7 @@ vpx_codec_enc_cfg_t config_; vpx_codec_ctx_t encoder_; - uint32 framerate_; + uint32_t framerate_; std::deque<PendingEncode> frames_; std::deque<BitstreamBuffer> buffers_; @@ -161,7 +161,7 @@ media::VideoPixelFormat input_format, const gfx::Size& input_visible_size, media::VideoCodecProfile output_profile, - uint32 initial_bitrate) { + uint32_t initial_bitrate) { gfx::Size coded_size = media::VideoFrame::PlaneSize(input_format, 0, input_visible_size); @@ -252,11 +252,11 @@ } void VideoEncoderShim::EncoderImpl::RequestEncodingParametersChange( - uint32 bitrate, - uint32 framerate) { + uint32_t bitrate, + uint32_t framerate) { framerate_ = framerate; - uint32 bitrate_kbit = bitrate / 1000; + uint32_t bitrate_kbit = bitrate / 1000; if (config_.rc_target_bitrate == bitrate_kbit) return; @@ -403,7 +403,7 @@ media::VideoPixelFormat input_format, const gfx::Size& input_visible_size, media::VideoCodecProfile output_profile, - uint32 initial_bitrate, + uint32_t initial_bitrate, media::VideoEncodeAccelerator::Client* client) { DCHECK(RenderThreadImpl::current()); DCHECK_EQ(client, host_); @@ -445,8 +445,8 @@ host_->ShmHandleToAddress(buffer.id()))); } -void VideoEncoderShim::RequestEncodingParametersChange(uint32 bitrate, - uint32 framerate) { +void VideoEncoderShim::RequestEncodingParametersChange(uint32_t bitrate, + uint32_t framerate) { DCHECK(RenderThreadImpl::current()); media_task_runner_->PostTask( @@ -474,7 +474,7 @@ void VideoEncoderShim::OnBitstreamBufferReady( scoped_refptr<media::VideoFrame> frame, - int32 bitstream_buffer_id, + int32_t bitstream_buffer_id, size_t payload_size, bool key_frame) { DCHECK(RenderThreadImpl::current());
diff --git a/content/renderer/pepper/video_encoder_shim.h b/content/renderer/pepper/video_encoder_shim.h index 44049ef..59b648a 100644 --- a/content/renderer/pepper/video_encoder_shim.h +++ b/content/renderer/pepper/video_encoder_shim.h
@@ -5,8 +5,12 @@ #ifndef CONTENT_RENDERER_PEPPER_VIDEO_ENCODER_SHIM_H_ #define CONTENT_RENDERER_PEPPER_VIDEO_ENCODER_SHIM_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "media/video/video_encode_accelerator.h" @@ -38,13 +42,13 @@ bool Initialize(media::VideoPixelFormat input_format, const gfx::Size& input_visible_size, media::VideoCodecProfile output_profile, - uint32 initial_bitrate, + uint32_t initial_bitrate, media::VideoEncodeAccelerator::Client* client) override; void Encode(const scoped_refptr<media::VideoFrame>& frame, bool force_keyframe) override; void UseOutputBitstreamBuffer(const media::BitstreamBuffer& buffer) override; - void RequestEncodingParametersChange(uint32 bitrate, - uint32 framerate) override; + void RequestEncodingParametersChange(uint32_t bitrate, + uint32_t framerate) override; void Destroy() override; private: @@ -54,7 +58,7 @@ const gfx::Size& input_coded_size, size_t output_buffer_size); void OnBitstreamBufferReady(scoped_refptr<media::VideoFrame> frame, - int32 bitstream_buffer_id, + int32_t bitstream_buffer_id, size_t payload_size, bool key_frame); void OnNotifyError(media::VideoEncodeAccelerator::Error error);
diff --git a/content/renderer/presentation/presentation_dispatcher.cc b/content/renderer/presentation/presentation_dispatcher.cc index 268f169..db1c94a 100644 --- a/content/renderer/presentation/presentation_dispatcher.cc +++ b/content/renderer/presentation/presentation_dispatcher.cc
@@ -135,7 +135,7 @@ void PresentationDispatcher::sendArrayBuffer( const blink::WebString& presentationUrl, const blink::WebString& presentationId, - const uint8* data, + const uint8_t* data, size_t length) { DCHECK(data); if (length > kMaxPresentationSessionMessageSize) { @@ -157,7 +157,7 @@ void PresentationDispatcher::sendBlobData( const blink::WebString& presentationUrl, const blink::WebString& presentationId, - const uint8* data, + const uint8_t* data, size_t length) { DCHECK(data); if (length > kMaxPresentationSessionMessageSize) { @@ -480,7 +480,7 @@ const blink::WebString& presentationUrl, const blink::WebString& presentationId, presentation::PresentationMessageType type, - const uint8* data, + const uint8_t* data, size_t length) { presentation::PresentationSessionInfoPtr session_info = presentation::PresentationSessionInfo::New(); @@ -490,7 +490,7 @@ presentation::SessionMessagePtr session_message = presentation::SessionMessage::New(); session_message->type = type; - std::vector<uint8> tmp_data_vector(data, data + length); + std::vector<uint8_t> tmp_data_vector(data, data + length); session_message->data.Swap(&tmp_data_vector); return new SendMessageRequest(session_info.Pass(), session_message.Pass()); }
diff --git a/content/renderer/presentation/presentation_dispatcher.h b/content/renderer/presentation/presentation_dispatcher.h index 2b78b75..ad09549 100644 --- a/content/renderer/presentation/presentation_dispatcher.h +++ b/content/renderer/presentation/presentation_dispatcher.h
@@ -5,11 +5,15 @@ #ifndef CONTENT_RENDERER_PRESENTATION_PRESENTATION_DISPATCHER_H_ #define CONTENT_RENDERER_PRESENTATION_PRESENTATION_DISPATCHER_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <queue> #include "base/compiler_specific.h" #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "content/common/presentation/presentation_service.mojom.h" @@ -52,7 +56,7 @@ const blink::WebString& presentationUrl, const blink::WebString& presentationId, presentation::PresentationMessageType type, - const uint8* data, + const uint8_t* data, size_t length); // WebPresentationClient implementation. @@ -69,11 +73,11 @@ const blink::WebString& message) override; void sendArrayBuffer(const blink::WebString& presentationUrl, const blink::WebString& presentationId, - const uint8* data, + const uint8_t* data, size_t length) override; void sendBlobData(const blink::WebString& presentationUrl, const blink::WebString& presentationId, - const uint8* data, + const uint8_t* data, size_t length) override; void closeSession(const blink::WebString& presentationUrl, const blink::WebString& presentationId) override;
diff --git a/content/renderer/push_messaging/push_messaging_dispatcher.h b/content/renderer/push_messaging/push_messaging_dispatcher.h index 13f3b72..ca6610b 100644 --- a/content/renderer/push_messaging/push_messaging_dispatcher.h +++ b/content/renderer/push_messaging/push_messaging_dispatcher.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/id_map.h" +#include "base/macros.h" #include "content/public/common/push_messaging_status.h" #include "content/public/renderer/render_frame_observer.h" #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushClient.h"
diff --git a/content/renderer/raster_worker_pool.cc b/content/renderer/raster_worker_pool.cc index ddeb57d..20b56ae00 100644 --- a/content/renderer/raster_worker_pool.cc +++ b/content/renderer/raster_worker_pool.cc
@@ -4,6 +4,9 @@ #include "content/renderer/raster_worker_pool.h" +#include <stddef.h> +#include <stdint.h> + #include <utility> #include "base/strings/stringprintf.h"
diff --git a/content/renderer/raster_worker_pool.h b/content/renderer/raster_worker_pool.h index e7473a9..1b7cfb1 100644 --- a/content/renderer/raster_worker_pool.h +++ b/content/renderer/raster_worker_pool.h
@@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/sequenced_task_runner.h" #include "base/synchronization/condition_variable.h"
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index e82c518..30a9f25 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc
@@ -24,6 +24,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" +#include "build/build_config.h" #include "cc/base/switches.h" #include "components/scheduler/renderer/renderer_scheduler.h" #include "content/child/appcache/appcache_dispatcher.h" @@ -288,7 +289,7 @@ typedef std::map<blink::WebFrame*, RenderFrameImpl*> FrameMap; base::LazyInstance<FrameMap> g_frame_map = LAZY_INSTANCE_INITIALIZER; -int64 ExtractPostId(const WebHistoryItem& item) { +int64_t ExtractPostId(const WebHistoryItem& item) { if (item.isNull() || item.httpBody().isNull()) return -1; @@ -614,7 +615,7 @@ // static RenderFrameImpl* RenderFrameImpl::Create(RenderViewImpl* render_view, - int32 routing_id) { + int32_t routing_id) { DCHECK(routing_id != MSG_ROUTING_NONE); CreateParams params(render_view, routing_id); @@ -1119,7 +1120,7 @@ if (!IsPepperAcceptingCompositionEvents()) { base::i18n::UTF16CharIterator iterator(&last_text); - int32 i = 0; + int32_t i = 0; while (iterator.Advance()) { blink::WebKeyboardEvent char_event; char_event.type = blink::WebInputEvent::Char; @@ -1128,7 +1129,7 @@ char_event.windowsKeyCode = last_text[i]; char_event.nativeKeyCode = last_text[i]; - const int32 char_start = i; + const int32_t char_start = i; for (; i < iterator.array_pos(); ++i) { char_event.text[i - char_start] = last_text[i]; char_event.unmodifiedText[i - char_start] = last_text[i]; @@ -1769,7 +1770,7 @@ } } -void RenderFrameImpl::OnVisualStateRequest(uint64 id) { +void RenderFrameImpl::OnVisualStateRequest(uint64_t id) { GetRenderWidget()->QueueMessage( new FrameHostMsg_VisualStateResponse(routing_id_, id), MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE); @@ -2637,20 +2638,15 @@ } if (shouldReportDetailedMessageForSource(source_name)) { - FOR_EACH_OBSERVER( - RenderFrameObserver, observers_, - DetailedConsoleMessageAdded(message.text, - source_name, - stack_trace, - source_line, - static_cast<int32>(log_severity))); + FOR_EACH_OBSERVER(RenderFrameObserver, observers_, + DetailedConsoleMessageAdded( + message.text, source_name, stack_trace, source_line, + static_cast<int32_t>(log_severity))); } - Send(new FrameHostMsg_AddMessageToConsole(routing_id_, - static_cast<int32>(log_severity), - message.text, - static_cast<int32>(source_line), - source_name)); + Send(new FrameHostMsg_AddMessageToConsole( + routing_id_, static_cast<int32_t>(log_severity), message.text, + static_cast<int32_t>(source_line), source_name)); } void RenderFrameImpl::loadURLExternally(const blink::WebURLRequest& request, @@ -4307,7 +4303,7 @@ // Make navigation state a part of the DidCommitProvisionalLoad message so // that committed entry has it at all times. - int64 post_id = -1; + int64_t post_id = -1; if (!SiteIsolationPolicy::UseSubframeNavigationEntries()) { HistoryEntry* entry = render_view_->history_controller()->GetCurrentEntry(); if (entry) {
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h index 907367be..76e29252 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h
@@ -5,18 +5,22 @@ #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/process/process_handle.h" +#include "build/build_config.h" #include "content/common/accessibility_mode_enums.h" #include "content/common/frame_message_enums.h" #include "content/common/mojo/service_registry_impl.h" @@ -189,12 +193,12 @@ // Used by content_layouttest_support to hook into the creation of // RenderFrameImpls. struct CreateParams { - CreateParams(RenderViewImpl* render_view, int32 routing_id) + CreateParams(RenderViewImpl* render_view, int32_t routing_id) : render_view(render_view), routing_id(routing_id) {} ~CreateParams() {} RenderViewImpl* render_view; - int32 routing_id; + int32_t routing_id; }; using CreateRenderFrameImplFunction = @@ -688,7 +692,8 @@ // Creates a new RenderFrame. |render_view| is the RenderView object that this // frame belongs to. // Callers *must* call |SetWebFrame| immediately after creation. - static RenderFrameImpl* Create(RenderViewImpl* render_view, int32 routing_id); + static RenderFrameImpl* Create(RenderViewImpl* render_view, + int32_t routing_id); // Functions to add and remove observers for this object. void AddObserver(RenderFrameObserver* observer); @@ -746,7 +751,7 @@ int id, bool notify_result, int world_id); - void OnVisualStateRequest(uint64 key); + void OnVisualStateRequest(uint64_t key); void OnSetEditableSelectionOffsets(int start, int end); void OnSetCompositionFromExistingText( int start, int end,
diff --git a/content/renderer/render_frame_impl_browsertest.cc b/content/renderer/render_frame_impl_browsertest.cc index 9ee851c..3e26089 100644 --- a/content/renderer/render_frame_impl_browsertest.cc +++ b/content/renderer/render_frame_impl_browsertest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/command_line.h" #include "base/debug/leak_annotations.h" +#include "build/build_config.h" #include "content/common/frame_messages.h" #include "content/common/view_messages.h" #include "content/public/test/frame_load_waiter.h" @@ -18,9 +21,9 @@ #include "third_party/WebKit/public/web/WebLocalFrame.h" namespace { -const int32 kSubframeRouteId = 20; -const int32 kSubframeWidgetRouteId = 21; -const int32 kFrameProxyRouteId = 22; +const int32_t kSubframeRouteId = 20; +const int32_t kSubframeWidgetRouteId = 21; +const int32_t kFrameProxyRouteId = 22; } // namespace namespace content {
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc index 4c272612..3e17627e 100644 --- a/content/renderer/render_frame_proxy.cc +++ b/content/renderer/render_frame_proxy.cc
@@ -4,6 +4,8 @@ #include "content/renderer/render_frame_proxy.h" +#include <stdint.h> + #include <map> #include "base/command_line.h" @@ -116,7 +118,7 @@ } // static -RenderFrameProxy* RenderFrameProxy::FromRoutingID(int32 routing_id) { +RenderFrameProxy* RenderFrameProxy::FromRoutingID(int32_t routing_id) { RoutingIDProxyMap* proxies = g_routing_id_proxy_map.Pointer(); RoutingIDProxyMap::iterator it = proxies->find(routing_id); return it == proxies->end() ? NULL : it->second;
diff --git a/content/renderer/render_frame_proxy.h b/content/renderer/render_frame_proxy.h index 0c35670..405c881 100644 --- a/content/renderer/render_frame_proxy.h +++ b/content/renderer/render_frame_proxy.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ #define CONTENT_RENDERER_RENDER_FRAME_PROXY_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "ipc/ipc_listener.h"
diff --git a/content/renderer/render_process.h b/content/renderer/render_process.h index 07c53e13..289da706 100644 --- a/content/renderer/render_process.h +++ b/content/renderer/render_process.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_RENDER_PROCESS_H_ #define CONTENT_RENDERER_RENDER_PROCESS_H_ +#include "base/macros.h" #include "content/child/child_process.h" namespace content {
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc index 188f3fa..16737ea 100644 --- a/content/renderer/render_process_impl.cc +++ b/content/renderer/render_process_impl.cc
@@ -12,7 +12,6 @@ #include <mlang.h> #endif -#include "base/basictypes.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/sys_info.h"
diff --git a/content/renderer/render_process_impl.h b/content/renderer/render_process_impl.h index 7b441e2..768ef7d 100644 --- a/content/renderer/render_process_impl.h +++ b/content/renderer/render_process_impl.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_RENDER_PROCESS_IMPL_H_ #define CONTENT_RENDERER_RENDER_PROCESS_IMPL_H_ +#include "base/macros.h" #include "content/renderer/render_process.h" namespace content {
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 003e02b4..83c6420 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc
@@ -14,6 +14,7 @@ #include "base/lazy_instance.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/discardable_memory_allocator.h" #include "base/memory/shared_memory.h" #include "base/metrics/field_trial.h" @@ -33,6 +34,7 @@ #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/trace_event.h" #include "base/values.h" +#include "build/build_config.h" #include "cc/base/histograms.h" #include "cc/base/switches.h" #include "cc/blink/web_external_bitmap_impl.h" @@ -222,8 +224,8 @@ namespace { -const int64 kInitialIdleHandlerDelayMs = 1000; -const int64 kLongIdleHandlerDelayMs = 30*1000; +const int64_t kInitialIdleHandlerDelayMs = 1000; +const int64_t kLongIdleHandlerDelayMs = 30 * 1000; #if defined(OS_ANDROID) // On Android, resource messages can each take ~1.5ms to dispatch on the browser @@ -1034,7 +1036,7 @@ return ChildProcess::current()->io_task_runner(); } -void RenderThreadImpl::AddRoute(int32 routing_id, IPC::Listener* listener) { +void RenderThreadImpl::AddRoute(int32_t routing_id, IPC::Listener* listener) { ChildThreadImpl::GetRouter()->AddRoute(routing_id, listener); PendingRenderFrameConnectMap::iterator it = pending_render_frame_connects_.find(routing_id); @@ -1056,11 +1058,11 @@ frame->BindServiceRegistry(services.Pass(), exposed_services.Pass()); } -void RenderThreadImpl::RemoveRoute(int32 routing_id) { +void RenderThreadImpl::RemoveRoute(int32_t routing_id) { ChildThreadImpl::GetRouter()->RemoveRoute(routing_id); } -void RenderThreadImpl::AddEmbeddedWorkerRoute(int32 routing_id, +void RenderThreadImpl::AddEmbeddedWorkerRoute(int32_t routing_id, IPC::Listener* listener) { AddRoute(routing_id, listener); if (devtools_agent_message_filter_.get()) { @@ -1069,7 +1071,7 @@ } } -void RenderThreadImpl::RemoveEmbeddedWorkerRoute(int32 routing_id) { +void RenderThreadImpl::RemoveEmbeddedWorkerRoute(int32_t routing_id) { RemoveRoute(routing_id); if (devtools_agent_message_filter_.get()) { devtools_agent_message_filter_->RemoveEmbeddedWorkerRouteOnMainThread( @@ -1333,7 +1335,7 @@ WebScriptController::registerExtension(extension); } -void RenderThreadImpl::ScheduleIdleHandler(int64 initial_delay_ms) { +void RenderThreadImpl::ScheduleIdleHandler(int64_t initial_delay_ms) { idle_notification_delay_in_ms_ = initial_delay_ms; idle_timer_.Stop(); idle_timer_.Start(FROM_HERE, @@ -1387,12 +1389,12 @@ FOR_EACH_OBSERVER(RenderProcessObserver, observers_, IdleNotification()); } -int64 RenderThreadImpl::GetIdleNotificationDelayInMs() const { +int64_t RenderThreadImpl::GetIdleNotificationDelayInMs() const { return idle_notification_delay_in_ms_; } void RenderThreadImpl::SetIdleNotificationDelayInMs( - int64 idle_notification_delay_in_ms) { + int64_t idle_notification_delay_in_ms) { idle_notification_delay_in_ms_ = idle_notification_delay_in_ms; } @@ -1660,9 +1662,9 @@ } CreateCommandBufferResult RenderThreadImpl::CreateViewCommandBuffer( - int32 surface_id, - const GPUCreateCommandBufferConfig& init_params, - int32 route_id) { + int32_t surface_id, + const GPUCreateCommandBufferConfig& init_params, + int32_t route_id) { NOTREACHED(); return CREATE_COMMAND_BUFFER_FAILED; }
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index af7b75c..3aa7378 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h
@@ -5,11 +5,15 @@ #ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include <set> #include <string> #include <vector> #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/ref_counted.h" #include "base/metrics/user_metrics_action.h" @@ -165,8 +169,8 @@ 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; @@ -181,11 +185,11 @@ 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; @@ -438,8 +442,8 @@ void WidgetHidden(); void WidgetRestored(); - void AddEmbeddedWorkerRoute(int32 routing_id, IPC::Listener* listener); - void RemoveEmbeddedWorkerRoute(int32 routing_id); + void AddEmbeddedWorkerRoute(int32_t routing_id, IPC::Listener* listener); + void RemoveEmbeddedWorkerRoute(int32_t routing_id); void RegisterPendingRenderFrameConnect( int routing_id, @@ -464,9 +468,9 @@ scoped_refptr<base::SingleThreadTaskRunner> GetIOThreadTaskRunner() override; scoped_ptr<base::SharedMemory> AllocateSharedMemory(size_t size) override; CreateCommandBufferResult CreateViewCommandBuffer( - int32 surface_id, + int32_t surface_id, const GPUCreateCommandBufferConfig& init_params, - int32 route_id) override; + int32_t route_id) override; void Init(); @@ -566,7 +570,7 @@ int hidden_widget_count_; // The current value of the idle notification timer delay. - int64 idle_notification_delay_in_ms_; + int64_t idle_notification_delay_in_ms_; // The number of idle handler calls that skip sending idle notifications. int idle_notifications_to_skip_;
diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc index a7151aaa..b926299 100644 --- a/content/renderer/render_thread_impl_browsertest.cc +++ b/content/renderer/render_thread_impl_browsertest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/callback.h" #include "base/command_line.h" #include "base/location.h" @@ -132,7 +135,7 @@ } bool GetSupportedMessageClasses( - std::vector<uint32>* supported_message_classes) const override { + std::vector<uint32_t>* supported_message_classes) const override { supported_message_classes->push_back(TestMsgStart); return true; }
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 484409f..050d05fa 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc
@@ -2,17 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h" #include "base/location.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" #include "base/time/time.h" #include "base/win/windows_version.h" +#include "build/build_config.h" #include "content/child/request_extra_data.h" #include "content/child/service_worker/service_worker_network_provider.h" #include "content/common/frame_messages.h" @@ -2131,7 +2135,7 @@ size_t last_selection = 0; for (size_t i = 0; i < render_thread_->sink().message_count(); ++i) { - const uint32 type = render_thread_->sink().GetMessageAt(i)->type(); + const uint32_t type = render_thread_->sink().GetMessageAt(i)->type(); if (type == ViewHostMsg_TextInputStateChanged::ID) { is_input_type_called = true; last_input_type = i;
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 5553995..efdeb26 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc
@@ -30,6 +30,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "content/child/appcache/appcache_dispatcher.h" #include "content/child/appcache/web_application_cache_host_impl.h" #include "content/child/child_shared_bitmap_manager.h" @@ -286,7 +287,7 @@ typedef std::map<blink::WebView*, RenderViewImpl*> ViewMap; static base::LazyInstance<ViewMap> g_view_map = LAZY_INSTANCE_INITIALIZER; -typedef std::map<int32, RenderViewImpl*> RoutingIDViewMap; +typedef std::map<int32_t, RenderViewImpl*> RoutingIDViewMap; static base::LazyInstance<RoutingIDViewMap> g_routing_id_view_map = LAZY_INSTANCE_INITIALIZER; @@ -577,7 +578,7 @@ WebSettings* settings) { for (ScriptFontFamilyMap::const_iterator it = map.begin(); it != map.end(); ++it) { - int32 script = u_getPropertyValueEnum(UCHAR_SCRIPT, (it->first).c_str()); + int32_t script = u_getPropertyValueEnum(UCHAR_SCRIPT, (it->first).c_str()); if (script >= 0 && script < USCRIPT_CODE_LIMIT) { UScriptCode code = static_cast<UScriptCode>(script); (*setter)(settings, it->second, GetScriptForWebSettings(code)); @@ -860,7 +861,7 @@ } /*static*/ -RenderViewImpl* RenderViewImpl::FromRoutingID(int32 routing_id) { +RenderViewImpl* RenderViewImpl::FromRoutingID(int32_t routing_id) { RoutingIDViewMap* views = g_routing_id_view_map.Pointer(); RoutingIDViewMap::iterator it = views->find(routing_id); return it == views->end() ? NULL : it->second;
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index 64d39ecf..2baacd69 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h
@@ -5,15 +5,18 @@ #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <map> #include <set> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" @@ -615,7 +618,7 @@ void OnSetEditCommandsForNextKeyEvent(const EditCommands& edit_commands); void OnAllowBindings(int enabled_bindings_flags); void OnAllowScriptToClose(bool script_can_close); - void OnCancelDownload(int32 download_id); + void OnCancelDownload(int32_t download_id); void OnClearFocusedElement(); void OnClosePage(); void OnClose(); @@ -846,11 +849,11 @@ // Page IDs ------------------------------------------------------------------ // See documentation in RenderView. - int32 page_id_; + int32_t page_id_; // The next available page ID to use for this RenderView. These IDs are // specific to a given RenderView and the frames within it. - int32 next_page_id_; + int32_t next_page_id_; // The offset of the current item in the history list. int history_list_offset_; @@ -1009,7 +1012,7 @@ // The SessionStorage namespace that we're assigned to has an ID, and that ID // is passed to us upon creation. WebKit asks for this ID upon first use and // uses it whenever asking the browser process to allocate new storage areas. - int64 session_storage_namespace_id_; + int64_t session_storage_namespace_id_; // Stores edit commands associated to the next key event. // Shall be cleared as soon as the next key event is processed.
diff --git a/content/renderer/render_view_mouse_lock_dispatcher.h b/content/renderer/render_view_mouse_lock_dispatcher.h index a2ee5b56..984a40e 100644 --- a/content/renderer/render_view_mouse_lock_dispatcher.h +++ b/content/renderer/render_view_mouse_lock_dispatcher.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_RENDERER_RENDER_VIEW_MOUSE_LOCK_DISPATCHER_H_ #define CONTENT_RENDERER_RENDER_VIEW_MOUSE_LOCK_DISPATCHER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/renderer/render_view_observer.h" #include "content/renderer/mouse_lock_dispatcher.h"
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index ec4d4da..405b64e 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/message_loop/message_loop.h" @@ -483,7 +484,7 @@ } // static -RenderWidget* RenderWidget::Create(int32 opener_id, +RenderWidget* RenderWidget::Create(int32_t opener_id, CompositorDependencies* compositor_deps, blink::WebPopupType popup_type, const blink::WebScreenInfo& screen_info) { @@ -556,13 +557,13 @@ OnClose(); } -bool RenderWidget::Init(int32 opener_id) { +bool RenderWidget::Init(int32_t opener_id) { return DoInit( opener_id, RenderWidget::CreateWebWidget(this), new ViewHostMsg_CreateWidget(opener_id, popup_type_, &routing_id_)); } -bool RenderWidget::DoInit(int32 opener_id, +bool RenderWidget::DoInit(int32_t opener_id, WebWidget* web_widget, IPC::SyncMessage* create_widget_message) { DCHECK(!webwidget_); @@ -981,7 +982,7 @@ #endif } - uint32 output_surface_id = next_output_surface_id_++; + uint32_t output_surface_id = next_output_surface_id_++; // Composite-to-mailbox is currently used for layout tests in order to cause // them to draw inside in the renderer to do the readback there. This should // no longer be the case when crbug.com/311404 is fixed.
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index b438a1b1..00454d4 100644 --- a/content/renderer/render_widget.h +++ b/content/renderer/render_widget.h
@@ -5,16 +5,20 @@ #ifndef CONTENT_RENDERER_RENDER_WIDGET_H_ #define CONTENT_RENDERER_RENDER_WIDGET_H_ +#include <stddef.h> +#include <stdint.h> + #include <deque> #include <map> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/time/time.h" +#include "build/build_config.h" #include "content/common/content_export.h" #include "content/common/cursors/webcursor.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" @@ -104,7 +108,7 @@ public: // Creates a new RenderWidget. The opener_id is the routing ID of the // RenderView that this widget lives inside. - static RenderWidget* Create(int32 opener_id, + static RenderWidget* Create(int32_t opener_id, CompositorDependencies* compositor_deps, blink::WebPopupType popup_type, const blink::WebScreenInfo& screen_info); @@ -121,7 +125,7 @@ // https://crbug.com/545684 virtual void CloseForFrame(); - int32 routing_id() const { return routing_id_; } + int32_t routing_id() const { return routing_id_; } CompositorDependencies* compositor_deps() const { return compositor_deps_; } blink::WebWidget* webwidget() const { return webwidget_; } gfx::Size size() const { return size_; } @@ -363,10 +367,10 @@ static blink::WebWidget* CreateWebWidget(RenderWidget* render_widget); // Initializes this view with the given opener. - bool Init(int32 opener_id); + bool Init(int32_t opener_id); // Called by Init and subclasses to perform initialization. - bool DoInit(int32 opener_id, + bool DoInit(int32_t opener_id, blink::WebWidget* web_widget, IPC::SyncMessage* create_widget_message); @@ -422,8 +426,8 @@ virtual void OnWasHidden(); virtual void OnWasShown(bool needs_repainting, const ui::LatencyInfo& latency_info); - void OnCreateVideoAck(int32 video_id); - void OnUpdateVideoAck(int32 video_id); + void OnCreateVideoAck(int32_t video_id); + void OnUpdateVideoAck(int32_t video_id); void OnRequestMoveAck(); virtual void OnImeSetComposition( const base::string16& text, @@ -546,7 +550,7 @@ // Routing ID that allows us to communicate to the parent browser process // RenderWidgetHost. When MSG_ROUTING_NONE, no messages may be sent. - int32 routing_id_; + int32_t routing_id_; // Dependencies for initializing a compositor, including flags for optional // features. @@ -566,7 +570,7 @@ // // This ID may refer to an invalid view if that view is closed before this // view is. - int32 opener_id_; + int32_t opener_id_; // The rect where this view should be initially shown. gfx::Rect initial_rect_; @@ -704,7 +708,7 @@ std::queue<SyntheticGestureCompletionCallback> pending_synthetic_gesture_callbacks_; - uint32 next_output_surface_id_; + uint32_t next_output_surface_id_; #if defined(OS_ANDROID) // Indicates value in the focused text field is in dirty state, i.e. modified
diff --git a/content/renderer/render_widget_fullscreen.cc b/content/renderer/render_widget_fullscreen.cc index 4317324..3aa227a 100644 --- a/content/renderer/render_widget_fullscreen.cc +++ b/content/renderer/render_widget_fullscreen.cc
@@ -40,7 +40,7 @@ return RenderWidget::CreateWebWidget(this); } -bool RenderWidgetFullscreen::Init(int32 opener_id) { +bool RenderWidgetFullscreen::Init(int32_t opener_id) { DCHECK(!webwidget_); return RenderWidget::DoInit(
diff --git a/content/renderer/render_widget_fullscreen.h b/content/renderer/render_widget_fullscreen.h index ff853a73..113a412 100644 --- a/content/renderer/render_widget_fullscreen.h +++ b/content/renderer/render_widget_fullscreen.h
@@ -7,6 +7,8 @@ #include "content/renderer/render_widget.h" +#include <stdint.h> + #include "third_party/WebKit/public/web/WebWidget.h" namespace content { @@ -24,7 +26,7 @@ virtual blink::WebWidget* CreateWebWidget(); - bool Init(int32 opener_id); + bool Init(int32_t opener_id); }; } // namespace content
diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc index 8f2091d0..5f052fa 100644 --- a/content/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.cc
@@ -8,7 +8,9 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "content/common/gpu/client/gpu_channel_host.h" #include "content/common/view_messages.h" #include "content/public/common/content_switches.h" @@ -260,7 +262,7 @@ // static RenderWidgetFullscreenPepper* RenderWidgetFullscreenPepper::Create( - int32 opener_id, + int32_t opener_id, CompositorDependencies* compositor_deps, PepperPluginInstanceImpl* plugin, const GURL& active_url,
diff --git a/content/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h index b914117..4c144c8 100644 --- a/content/renderer/render_widget_fullscreen_pepper.h +++ b/content/renderer/render_widget_fullscreen_pepper.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_ #define CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/renderer/mouse_lock_dispatcher.h" #include "content/renderer/pepper/fullscreen_container.h" @@ -25,7 +28,7 @@ public FullscreenContainer { public: static RenderWidgetFullscreenPepper* Create( - int32 opener_id, + int32_t opener_id, CompositorDependencies* compositor_deps, PepperPluginInstanceImpl* plugin, const GURL& active_url,
diff --git a/content/renderer/render_widget_unittest.cc b/content/renderer/render_widget_unittest.cc index e4319f5..8d8f9e6 100644 --- a/content/renderer/render_widget_unittest.cc +++ b/content/renderer/render_widget_unittest.cc
@@ -6,6 +6,7 @@ #include <vector> +#include "base/macros.h" #include "content/common/input/synthetic_web_input_event_builders.h" #include "content/common/input_messages.h" #include "content/public/test/mock_render_thread.h"
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc index a47eec73..80a8135 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -211,7 +211,7 @@ #if defined(OS_MACOSX) bool loadFont(NSFont* src_font, CGFontRef* container, - uint32* font_id) override; + uint32_t* font_id) override; #elif defined(OS_POSIX) void getFallbackFontForCharacter( blink::WebUChar32 character, @@ -387,7 +387,7 @@ } void RendererBlinkPlatformImpl::cacheMetadata(const blink::WebURL& url, - int64 response_time, + int64_t response_time, const char* data, size_t size) { // Let the browser know we generated cacheable metadata for this resource. The @@ -544,8 +544,8 @@ bool RendererBlinkPlatformImpl::SandboxSupport::loadFont(NSFont* src_font, CGFontRef* out, - uint32* font_id) { - uint32 font_data_size; + uint32_t* font_id) { + uint32_t font_data_size; FontDescriptor src_font_descriptor(src_font); base::SharedMemoryHandle font_data; if (!RenderThread::Get()->Send(new RenderProcessHostMsg_LoadFont( @@ -823,9 +823,7 @@ const blink::WebURL& url) { std::string signed_public_key; RenderThread::Get()->Send(new RenderProcessHostMsg_Keygen( - static_cast<uint32>(key_size_index), - challenge.utf8(), - GURL(url), + static_cast<uint32_t>(key_size_index), challenge.utf8(), GURL(url), &signed_public_key)); return WebString::fromUTF8(signed_public_key); } @@ -1118,7 +1116,7 @@ void RendererBlinkPlatformImpl::vibrate(unsigned int milliseconds) { GetConnectedVibrationManagerService()->Vibrate( - base::checked_cast<int64>(milliseconds)); + base::checked_cast<int64_t>(milliseconds)); vibration_manager_.reset(); } @@ -1203,7 +1201,7 @@ observer = CreatePlatformEventObserverFromType(type); if (!observer) return; - platform_event_observers_.AddWithID(observer, static_cast<int32>(type)); + platform_event_observers_.AddWithID(observer, static_cast<int32_t>(type)); } observer->Start(listener);
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h index 226137a..72fda4f9 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h
@@ -5,9 +5,14 @@ #ifndef CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_ #define CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/compiler_specific.h" #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "cc/blink/web_compositor_support_impl.h" #include "content/child/blink_platform_impl.h" #include "content/common/content_export.h" @@ -83,7 +88,10 @@ void createMessageChannel(blink::WebMessagePortChannel** channel1, blink::WebMessagePortChannel** channel2) override; blink::WebPrescientNetworking* prescientNetworking() override; - void cacheMetadata(const blink::WebURL&, int64, const char*, size_t) override; + void cacheMetadata(const blink::WebURL&, + int64_t, + const char*, + size_t) override; blink::WebString defaultLocale() override; void suddenTerminationChanged(bool enabled) override; blink::WebStorageNamespace* createLocalStorageNamespace() override;
diff --git a/content/renderer/renderer_clipboard_delegate.cc b/content/renderer/renderer_clipboard_delegate.cc index e1285d2..6ce0203 100644 --- a/content/renderer/renderer_clipboard_delegate.cc +++ b/content/renderer/renderer_clipboard_delegate.cc
@@ -20,8 +20,8 @@ RendererClipboardDelegate::RendererClipboardDelegate() { } -uint64 RendererClipboardDelegate::GetSequenceNumber(ui::ClipboardType type) { - uint64 sequence_number = 0; +uint64_t RendererClipboardDelegate::GetSequenceNumber(ui::ClipboardType type) { + uint64_t sequence_number = 0; RenderThreadImpl::current()->Send( new ClipboardHostMsg_GetSequenceNumber(type, &sequence_number)); return sequence_number; @@ -57,8 +57,8 @@ void RendererClipboardDelegate::ReadHTML(ui::ClipboardType type, base::string16* markup, GURL* url, - uint32* fragment_start, - uint32* fragment_end) { + uint32_t* fragment_start, + uint32_t* fragment_end) { RenderThreadImpl::current()->Send(new ClipboardHostMsg_ReadHTML( type, markup, url, fragment_start, fragment_end)); } @@ -71,7 +71,7 @@ void RendererClipboardDelegate::ReadImage(ui::ClipboardType type, std::string* data) { base::SharedMemoryHandle image_handle; - uint32 image_size = 0; + uint32_t image_size = 0; RenderThreadImpl::current()->Send( new ClipboardHostMsg_ReadImage(type, &image_handle, &image_size)); if (base::SharedMemory::IsHandleValid(image_handle)) { @@ -135,14 +135,14 @@ if (!pixels) return false; - base::CheckedNumeric<uint32> checked_buf_size = 4; + base::CheckedNumeric<uint32_t> checked_buf_size = 4; checked_buf_size *= size.width(); checked_buf_size *= size.height(); if (!checked_buf_size.IsValid()) return false; // Allocate a shared memory buffer to hold the bitmap bits. - uint32 buf_size = checked_buf_size.ValueOrDie(); + uint32_t buf_size = checked_buf_size.ValueOrDie(); shared_buf = ChildThreadImpl::current()->AllocateSharedMemory(buf_size); if (!shared_buf) return false;
diff --git a/content/renderer/renderer_clipboard_delegate.h b/content/renderer/renderer_clipboard_delegate.h index ef8e034..28d509b 100644 --- a/content/renderer/renderer_clipboard_delegate.h +++ b/content/renderer/renderer_clipboard_delegate.h
@@ -26,7 +26,7 @@ public: RendererClipboardDelegate(); - uint64 GetSequenceNumber(ui::ClipboardType type); + uint64_t GetSequenceNumber(ui::ClipboardType type); bool IsFormatAvailable(ClipboardFormat format, ui::ClipboardType type); void Clear(ui::ClipboardType type); void ReadAvailableTypes(ui::ClipboardType type, @@ -36,8 +36,8 @@ void ReadHTML(ui::ClipboardType type, base::string16* markup, GURL* url, - uint32* fragment_start, - uint32* fragment_end); + uint32_t* fragment_start, + uint32_t* fragment_end); void ReadRTF(ui::ClipboardType type, std::string* result); void ReadImage(ui::ClipboardType type, std::string* data); void ReadCustomData(ui::ClipboardType clipboard_type,
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index 13368c9..c7ac7f0 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/base_switches.h" #include "base/command_line.h" #include "base/debug/debugger.h" @@ -19,6 +21,7 @@ #include "base/time/time.h" #include "base/timer/hi_res_timer_manager.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "components/scheduler/renderer/renderer_scheduler.h" #include "components/startup_metric_utils/common/startup_metric_messages.h" #include "content/child/child_process.h"
diff --git a/content/renderer/renderer_main_platform_delegate.h b/content/renderer/renderer_main_platform_delegate.h index f51644a7..ed00bbe7 100644 --- a/content/renderer/renderer_main_platform_delegate.h +++ b/content/renderer/renderer_main_platform_delegate.h
@@ -11,7 +11,7 @@ #include <windows.h> #endif -#include "base/basictypes.h" +#include "base/macros.h" #include "content/common/content_export.h" #include "content/public/common/main_function_params.h"
diff --git a/content/renderer/renderer_main_platform_delegate_android.cc b/content/renderer/renderer_main_platform_delegate_android.cc index c00ed03..92ac08f 100644 --- a/content/renderer/renderer_main_platform_delegate_android.cc +++ b/content/renderer/renderer_main_platform_delegate_android.cc
@@ -7,6 +7,7 @@ #include "base/android/build_info.h" #include "base/feature_list.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #ifdef USE_SECCOMP_BPF
diff --git a/content/renderer/renderer_main_platform_delegate_mac.mm b/content/renderer/renderer_main_platform_delegate_mac.mm index 6c7ecd8..ca61a07 100644 --- a/content/renderer/renderer_main_platform_delegate_mac.mm +++ b/content/renderer/renderer_main_platform_delegate_mac.mm
@@ -7,6 +7,7 @@ #include <Carbon/Carbon.h> #import <Cocoa/Cocoa.h> #include <objc/runtime.h> +#include <stdint.h> #include "base/command_line.h" #include "base/logging.h" @@ -71,11 +72,11 @@ std::string port_address_std_string = base::SysCFStringRefToUTF8(port_address_string); #if __LP64__ - uint64 port_address = 0; + uint64_t port_address = 0; if (!base::HexStringToUInt64(port_address_std_string, &port_address)) continue; #else - uint32 port_address = 0; + uint32_t port_address = 0; if (!base::HexStringToUInt(port_address_std_string, &port_address)) continue; #endif
diff --git a/content/renderer/renderer_webcolorchooser_impl.h b/content/renderer/renderer_webcolorchooser_impl.h index 4248250..f5f82fe 100644 --- a/content/renderer/renderer_webcolorchooser_impl.h +++ b/content/renderer/renderer_webcolorchooser_impl.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/common/color_suggestion.h" #include "content/public/renderer/render_frame_observer.h" #include "third_party/WebKit/public/web/WebColorChooser.h"
diff --git a/content/renderer/resizing_mode_selector.h b/content/renderer/resizing_mode_selector.h index ac657e2..66a62bc 100644 --- a/content/renderer/resizing_mode_selector.h +++ b/content/renderer/resizing_mode_selector.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_RESIZING_MODE_SELECTOR_H_ #define CONTENT_RENDERER_RESIZING_MODE_SELECTOR_H_ -#include "base/basictypes.h" +#include "base/macros.h" struct ViewMsg_Resize_Params;
diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc index b677fbe..f525de4 100644 --- a/content/renderer/resource_fetcher_browsertest.cc +++ b/content/renderer/resource_fetcher_browsertest.cc
@@ -11,6 +11,7 @@ #include "base/message_loop/message_loop.h" #include "base/time/time.h" #include "base/timer/timer.h" +#include "build/build_config.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" @@ -286,7 +287,7 @@ EXPECT_EQ(kHeader, delegate->data()); } - int32 render_view_routing_id_; + int32_t render_view_routing_id_; }; // Test a fetch from the test server.
diff --git a/content/renderer/savable_resources.h b/content/renderer/savable_resources.h index eb989609..b12d350 100644 --- a/content/renderer/savable_resources.h +++ b/content/renderer/savable_resources.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "content/common/content_export.h" #include "content/common/savable_subframe.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
diff --git a/content/renderer/savable_resources_browsertest.cc b/content/renderer/savable_resources_browsertest.cc index dfccd8d..98d3bc6 100644 --- a/content/renderer/savable_resources_browsertest.cc +++ b/content/renderer/savable_resources_browsertest.cc
@@ -5,6 +5,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "build/build_config.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h"
diff --git a/content/renderer/scheduler/resource_dispatch_throttler.cc b/content/renderer/scheduler/resource_dispatch_throttler.cc index d2f7916..aae15ad 100644 --- a/content/renderer/scheduler/resource_dispatch_throttler.cc +++ b/content/renderer/scheduler/resource_dispatch_throttler.cc
@@ -23,7 +23,7 @@ IPC::Sender* proxied_sender, scheduler::RendererScheduler* scheduler, base::TimeDelta flush_period, - uint32 max_requests_per_flush) + uint32_t max_requests_per_flush) : proxied_sender_(proxied_sender), scheduler_(scheduler), flush_period_(flush_period), @@ -104,9 +104,9 @@ // If high-priority work is no longer anticipated, dispatch can be safely // accelerated. Avoid completely flushing in such case in the event that // a large number of requests have been throttled. - uint32 max_requests = scheduler_->IsHighPriorityWorkAnticipated() - ? max_requests_per_flush_ - : max_requests_per_flush_ * 2; + uint32_t max_requests = scheduler_->IsHighPriorityWorkAnticipated() + ? max_requests_per_flush_ + : max_requests_per_flush_ * 2; while (!throttled_messages_.empty() && (sent_requests_since_last_flush_ < max_requests ||
diff --git a/content/renderer/scheduler/resource_dispatch_throttler.h b/content/renderer/scheduler/resource_dispatch_throttler.h index 66fc786..d7f89b7 100644 --- a/content/renderer/scheduler/resource_dispatch_throttler.h +++ b/content/renderer/scheduler/resource_dispatch_throttler.h
@@ -5,8 +5,11 @@ #ifndef CONTENT_RENDERER_SCHEDULER_RESOURCE_DISPATCH_THROTTLER_H_ #define CONTENT_RENDERER_SCHEDULER_RESOURCE_DISPATCH_THROTTLER_H_ +#include <stdint.h> + #include <deque> +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "base/time/time.h" #include "base/timer/timer.h" @@ -35,7 +38,7 @@ ResourceDispatchThrottler(IPC::Sender* proxied_sender, scheduler::RendererScheduler* scheduler, base::TimeDelta flush_period, - uint32 max_requests_per_flush); + uint32_t max_requests_per_flush); ~ResourceDispatchThrottler() override; // IPC::Sender implementation: @@ -57,11 +60,11 @@ IPC::Sender* const proxied_sender_; scheduler::RendererScheduler* const scheduler_; const base::TimeDelta flush_period_; - const uint32 max_requests_per_flush_; + const uint32_t max_requests_per_flush_; base::Timer flush_timer_; base::TimeTicks last_sent_request_time_; - uint32 sent_requests_since_last_flush_; + uint32_t sent_requests_since_last_flush_; std::deque<IPC::Message*> throttled_messages_; DISALLOW_COPY_AND_ASSIGN(ResourceDispatchThrottler);
diff --git a/content/renderer/scheduler/resource_dispatch_throttler_unittest.cc b/content/renderer/scheduler/resource_dispatch_throttler_unittest.cc index 296c28a..a1dbcac7 100644 --- a/content/renderer/scheduler/resource_dispatch_throttler_unittest.cc +++ b/content/renderer/scheduler/resource_dispatch_throttler_unittest.cc
@@ -4,6 +4,10 @@ #include "content/renderer/scheduler/resource_dispatch_throttler.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "content/common/resource_messages.h" #include "content/test/fake_renderer_scheduler.h" @@ -12,7 +16,7 @@ namespace content { namespace { -const uint32 kRequestsPerFlush = 4; +const uint32_t kRequestsPerFlush = 4; const double kFlushPeriodSeconds = 1.f / 60; const int kRoutingId = 1;
diff --git a/content/renderer/service_worker/embedded_worker_devtools_agent.h b/content/renderer/service_worker/embedded_worker_devtools_agent.h index c63081e..afb6ba8 100644 --- a/content/renderer/service_worker/embedded_worker_devtools_agent.h +++ b/content/renderer/service_worker/embedded_worker_devtools_agent.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "ipc/ipc_listener.h" namespace IPC {
diff --git a/content/renderer/service_worker/embedded_worker_dispatcher.h b/content/renderer/service_worker/embedded_worker_dispatcher.h index 0ecd75a..2ba1da8 100644 --- a/content/renderer/service_worker/embedded_worker_dispatcher.h +++ b/content/renderer/service_worker/embedded_worker_dispatcher.h
@@ -7,8 +7,8 @@ #include <map> -#include "base/basictypes.h" #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "ipc/ipc_listener.h"
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc index c3f56a1..a370f6d 100644 --- a/content/renderer/service_worker/service_worker_context_client.cc +++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -215,7 +215,7 @@ ServiceWorkerContextClient::ServiceWorkerContextClient( int embedded_worker_id, - int64 service_worker_version_id, + int64_t service_worker_version_id, const GURL& service_worker_scope, const GURL& script_url, int worker_devtools_agent_route_id)
diff --git a/content/renderer/service_worker/service_worker_context_client.h b/content/renderer/service_worker/service_worker_context_client.h index 08b7acb..f2b9928 100644 --- a/content/renderer/service_worker/service_worker_context_client.h +++ b/content/renderer/service_worker/service_worker_context_client.h
@@ -5,11 +5,15 @@ #ifndef CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_CLIENT_H_ #define CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_CLIENT_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <string> #include <vector> #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" @@ -68,7 +72,7 @@ // Called on the main thread. ServiceWorkerContextClient(int embedded_worker_id, - int64 service_worker_version_id, + int64_t service_worker_version_id, const GURL& service_worker_scope, const GURL& script_url, int worker_devtools_agent_route_id); @@ -222,7 +226,7 @@ base::WeakPtr<ServiceWorkerContextClient> GetWeakPtr(); const int embedded_worker_id_; - const int64 service_worker_version_id_; + const int64_t service_worker_version_id_; const GURL service_worker_scope_; const GURL script_url_; const int worker_devtools_agent_route_id_;
diff --git a/content/renderer/service_worker/service_worker_context_message_filter.h b/content/renderer/service_worker/service_worker_context_message_filter.h index e34f866..5ed6c46e 100644 --- a/content/renderer/service_worker/service_worker_context_message_filter.h +++ b/content/renderer/service_worker/service_worker_context_message_filter.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_MESSAGE_FILTER_H_ #define CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_MESSAGE_FILTER_H_ +#include "base/macros.h" #include "content/child/worker_thread_message_filter.h" namespace content {
diff --git a/content/renderer/shared_memory_seqlock_reader.h b/content/renderer/shared_memory_seqlock_reader.h index 7fd7beb..7d5bc936 100644 --- a/content/renderer/shared_memory_seqlock_reader.h +++ b/content/renderer/shared_memory_seqlock_reader.h
@@ -5,7 +5,10 @@ #ifndef CONTENT_RENDERER_SHARED_MEMORY_SEQLOCK_READER_H_ #define CONTENT_RENDERER_SHARED_MEMORY_SEQLOCK_READER_H_ +#include <stddef.h> + #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "content/common/shared_memory_seqlock_buffer.h"
diff --git a/content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h b/content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h index dd3c6b6c..e87e30d 100644 --- a/content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h +++ b/content/renderer/shared_worker/embedded_shared_worker_content_settings_client_proxy.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_SHARED_WORKER_EMBEDDED_SHARED_WORKER_CONTENT_SETTINGS_CLIENT_PROXY_H_ #define CONTENT_RENDERER_SHARED_WORKER_EMBEDDED_SHARED_WORKER_CONTENT_SETTINGS_CLIENT_PROXY_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "third_party/WebKit/public/web/WebWorkerContentSettingsClientProxy.h" #include "url/gurl.h"
diff --git a/content/renderer/shared_worker/embedded_shared_worker_stub.cc b/content/renderer/shared_worker/embedded_shared_worker_stub.cc index 975bab9..0eba4409 100644 --- a/content/renderer/shared_worker/embedded_shared_worker_stub.cc +++ b/content/renderer/shared_worker/embedded_shared_worker_stub.cc
@@ -4,6 +4,8 @@ #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" +#include <stdint.h> + #include "base/thread_task_runner_handle.h" #include "content/child/appcache/appcache_dispatcher.h" #include "content/child/appcache/web_application_cache_host_impl.h"
diff --git a/content/renderer/shared_worker/embedded_shared_worker_stub.h b/content/renderer/shared_worker/embedded_shared_worker_stub.h index a7d62d0..232f55a 100644 --- a/content/renderer/shared_worker/embedded_shared_worker_stub.h +++ b/content/renderer/shared_worker/embedded_shared_worker_stub.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "content/child/child_message_filter.h" #include "content/child/scoped_child_process_reference.h" #include "ipc/ipc_listener.h"
diff --git a/content/renderer/shared_worker_repository.h b/content/renderer/shared_worker_repository.h index c245fec..70d73d3 100644 --- a/content/renderer/shared_worker_repository.h +++ b/content/renderer/shared_worker_repository.h
@@ -7,7 +7,7 @@ #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/renderer/render_frame_observer.h" #include "third_party/WebKit/public/web/WebContentSecurityPolicy.h" #include "third_party/WebKit/public/web/WebSharedWorkerCreationContextType.h"
diff --git a/content/renderer/skia_benchmarking_extension.cc b/content/renderer/skia_benchmarking_extension.cc index dff6eda..f5180d0f 100644 --- a/content/renderer/skia_benchmarking_extension.cc +++ b/content/renderer/skia_benchmarking_extension.cc
@@ -4,6 +4,9 @@ #include "content/renderer/skia_benchmarking_extension.h" +#include <stddef.h> +#include <stdint.h> + #include "base/base64.h" #include "base/time/time.h" #include "base/values.h" @@ -230,11 +233,11 @@ blink::WebArrayBuffer buffer = blink::WebArrayBuffer::create(bitmap.getSize(), 1); - uint32* packed_pixels = reinterpret_cast<uint32*>(bitmap.getPixels()); - uint8* buffer_pixels = reinterpret_cast<uint8*>(buffer.data()); + uint32_t* packed_pixels = reinterpret_cast<uint32_t*>(bitmap.getPixels()); + uint8_t* buffer_pixels = reinterpret_cast<uint8_t*>(buffer.data()); // Swizzle from native Skia format to RGBA as we copy out. for (size_t i = 0; i < bitmap.getSize(); i += 4) { - uint32 c = packed_pixels[i >> 2]; + uint32_t c = packed_pixels[i >> 2]; buffer_pixels[i] = SkGetPackedR32(c); buffer_pixels[i + 1] = SkGetPackedG32(c); buffer_pixels[i + 2] = SkGetPackedB32(c);
diff --git a/content/renderer/skia_benchmarking_extension.h b/content/renderer/skia_benchmarking_extension.h index 103a490..8dd05dd5 100644 --- a/content/renderer/skia_benchmarking_extension.h +++ b/content/renderer/skia_benchmarking_extension.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_SKIA_BENCHMARKING_EXTENSION_H_ #define CONTENT_RENDERER_SKIA_BENCHMARKING_EXTENSION_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "gin/wrappable.h" namespace blink {
diff --git a/content/renderer/skia_benchmarking_extension_unittest.cc b/content/renderer/skia_benchmarking_extension_unittest.cc index 0e97ae7..87ea6a0 100644 --- a/content/renderer/skia_benchmarking_extension_unittest.cc +++ b/content/renderer/skia_benchmarking_extension_unittest.cc
@@ -4,6 +4,8 @@ #include "content/renderer/skia_benchmarking_extension.h" +#include <stddef.h> + #include "base/values.h" #include "skia/ext/benchmarking_canvas.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/speech_recognition_dispatcher.cc b/content/renderer/speech_recognition_dispatcher.cc index 4719463e..1b6500b 100644 --- a/content/renderer/speech_recognition_dispatcher.cc +++ b/content/renderer/speech_recognition_dispatcher.cc
@@ -4,7 +4,9 @@ #include "content/renderer/speech_recognition_dispatcher.h" -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/strings/utf_string_conversions.h" #include "content/common/speech_recognition_messages.h" #include "content/renderer/render_view_impl.h" @@ -102,7 +104,7 @@ } msg_params.language = base::UTF16ToUTF8(base::StringPiece16(params.language())); - msg_params.max_hypotheses = static_cast<uint32>(params.maxAlternatives()); + msg_params.max_hypotheses = static_cast<uint32_t>(params.maxAlternatives()); msg_params.continuous = params.continuous(); msg_params.interim_results = params.interimResults(); msg_params.origin_url = params.origin().toString().utf8();
diff --git a/content/renderer/speech_recognition_dispatcher.h b/content/renderer/speech_recognition_dispatcher.h index d3f3c24..21eb831 100644 --- a/content/renderer/speech_recognition_dispatcher.h +++ b/content/renderer/speech_recognition_dispatcher.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "base/sync_socket.h"
diff --git a/content/renderer/stats_collection_controller.h b/content/renderer/stats_collection_controller.h index c36349c..df297c1 100644 --- a/content/renderer/stats_collection_controller.h +++ b/content/renderer/stats_collection_controller.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_STATS_COLLECTION_CONTROLLER_H_ #define CONTENT_RENDERER_STATS_COLLECTION_CONTROLLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "gin/wrappable.h" namespace blink {
diff --git a/content/renderer/stats_collection_observer.h b/content/renderer/stats_collection_observer.h index 9aba8dc..5a17dfe 100644 --- a/content/renderer/stats_collection_observer.h +++ b/content/renderer/stats_collection_observer.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_STATS_COLLECTION_OBSERVER_H_ #define CONTENT_RENDERER_STATS_COLLECTION_OBSERVER_H_ +#include "base/macros.h" #include "base/time/time.h" #include "content/public/renderer/render_view_observer.h"
diff --git a/content/renderer/text_input_client_observer.cc b/content/renderer/text_input_client_observer.cc index 87c7486..eda58f2 100644 --- a/content/renderer/text_input_client_observer.cc +++ b/content/renderer/text_input_client_observer.cc
@@ -4,7 +4,10 @@ #include "content/renderer/text_input_client_observer.h" +#include <stddef.h> + #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "content/common/text_input_client_messages.h" #include "content/renderer/pepper/pepper_plugin_instance_impl.h" #include "content/renderer/render_view_impl.h"
diff --git a/content/renderer/text_input_client_observer.h b/content/renderer/text_input_client_observer.h index f7e8723..b8c62b62 100644 --- a/content/renderer/text_input_client_observer.h +++ b/content/renderer/text_input_client_observer.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_TEXT_INPUT_CLIENT_OBSERVER_H_ #define CONTENT_RENDERER_TEXT_INPUT_CLIENT_OBSERVER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "content/public/renderer/render_view_observer.h" #include "ui/gfx/geometry/point.h"
diff --git a/content/renderer/usb/type_converters.cc b/content/renderer/usb/type_converters.cc index 2d56d2b..19b76e5 100644 --- a/content/renderer/usb/type_converters.cc +++ b/content/renderer/usb/type_converters.cc
@@ -4,6 +4,8 @@ #include "content/renderer/usb/type_converters.h" +#include <stddef.h> + #include "base/logging.h" namespace mojo {
diff --git a/content/renderer/usb/web_usb_client_impl.cc b/content/renderer/usb/web_usb_client_impl.cc index 0760848..530b64aa 100644 --- a/content/renderer/usb/web_usb_client_impl.cc +++ b/content/renderer/usb/web_usb_client_impl.cc
@@ -4,6 +4,8 @@ #include "content/renderer/usb/web_usb_client_impl.h" +#include <stddef.h> + #include "base/bind.h" #include "base/callback.h" #include "base/memory/scoped_ptr.h"
diff --git a/content/renderer/usb/web_usb_device_impl.h b/content/renderer/usb/web_usb_device_impl.h index 0f8fc05a..4e49ae9 100644 --- a/content/renderer/usb/web_usb_device_impl.h +++ b/content/renderer/usb/web_usb_device_impl.h
@@ -5,6 +5,9 @@ #ifndef CONTENT_RENDERER_USB_WEB_USB_DEVICE_IMPL_H_ #define CONTENT_RENDERER_USB_WEB_USB_DEVICE_IMPL_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/renderer/vr/vr_dispatcher.cc b/content/renderer/vr/vr_dispatcher.cc index a797713..07391761 100644 --- a/content/renderer/vr/vr_dispatcher.cc +++ b/content/renderer/vr/vr_dispatcher.cc
@@ -4,6 +4,8 @@ #include "content/renderer/vr/vr_dispatcher.h" +#include <stddef.h> + #include "content/public/common/service_registry.h" #include "content/renderer/vr/vr_type_converters.h"
diff --git a/content/renderer/vr/vr_dispatcher.h b/content/renderer/vr/vr_dispatcher.h index 1dc79f4..b027d05 100644 --- a/content/renderer/vr/vr_dispatcher.h +++ b/content/renderer/vr/vr_dispatcher.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/id_map.h" +#include "base/macros.h" #include "content/common/vr_service.mojom.h" #include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/public/platform/modules/vr/WebVR.h"
diff --git a/content/renderer/web_ui_extension.h b/content/renderer/web_ui_extension.h index 1d593ca..8e4bfbb 100644 --- a/content/renderer/web_ui_extension.h +++ b/content/renderer/web_ui_extension.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" namespace blink { class WebFrame;
diff --git a/content/renderer/web_ui_extension_data.h b/content/renderer/web_ui_extension_data.h index f45bc46..8bbac72 100644 --- a/content/renderer/web_ui_extension_data.h +++ b/content/renderer/web_ui_extension_data.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/renderer/render_view_observer.h" #include "content/public/renderer/render_view_observer_tracker.h"
diff --git a/content/renderer/webclipboard_impl.cc b/content/renderer/webclipboard_impl.cc index 19f2362..8eca5a9 100644 --- a/content/renderer/webclipboard_impl.cc +++ b/content/renderer/webclipboard_impl.cc
@@ -7,6 +7,7 @@ #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "content/common/clipboard_format.h" #include "content/public/common/drop_data.h" #include "content/renderer/clipboard_utils.h" @@ -39,7 +40,7 @@ WebClipboardImpl::~WebClipboardImpl() { } -uint64 WebClipboardImpl::sequenceNumber(Buffer buffer) { +uint64_t WebClipboardImpl::sequenceNumber(Buffer buffer) { ui::ClipboardType clipboard_type; if (!ConvertBufferType(buffer, &clipboard_type)) return 0; @@ -103,8 +104,8 @@ base::string16 html_stdstr; GURL gurl; delegate_->ReadHTML(clipboard_type, &html_stdstr, &gurl, - static_cast<uint32*>(fragment_start), - static_cast<uint32*>(fragment_end)); + static_cast<uint32_t*>(fragment_start), + static_cast<uint32_t*>(fragment_end)); *source_url = gurl; return html_stdstr; }
diff --git a/content/renderer/webclipboard_impl.h b/content/renderer/webclipboard_impl.h index a960406..3bdc568 100644 --- a/content/renderer/webclipboard_impl.h +++ b/content/renderer/webclipboard_impl.h
@@ -5,12 +5,14 @@ #ifndef CONTENT_RENDERER_WEBCLIPBOARD_IMPL_H_ #define CONTENT_RENDERER_WEBCLIPBOARD_IMPL_H_ +#include <stdint.h> + +#include <string> + #include "base/compiler_specific.h" #include "third_party/WebKit/public/platform/WebClipboard.h" #include "ui/base/clipboard/clipboard.h" -#include <string> - namespace content { class RendererClipboardDelegate; @@ -21,7 +23,7 @@ virtual ~WebClipboardImpl(); // WebClipboard methods: - uint64 sequenceNumber(Buffer buffer) override; + uint64_t sequenceNumber(Buffer buffer) override; bool isFormatAvailable(Format format, Buffer buffer) override; blink::WebVector<blink::WebString> readAvailableTypes( Buffer buffer,
diff --git a/content/renderer/webpublicsuffixlist_impl.h b/content/renderer/webpublicsuffixlist_impl.h index 3ab8507..36970473d 100644 --- a/content/renderer/webpublicsuffixlist_impl.h +++ b/content/renderer/webpublicsuffixlist_impl.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_RENDERER_WEBPUBLICSUFFIXLIST_IMPL_H_ #define CONTENT_RENDERER_WEBPUBLICSUFFIXLIST_IMPL_H_ +#include <stddef.h> + #include "base/compiler_specific.h" #include "third_party/WebKit/public/platform/WebPublicSuffixList.h"
diff --git a/content/renderer/webscrollbarbehavior_impl_gtkoraura.cc b/content/renderer/webscrollbarbehavior_impl_gtkoraura.cc index 8dfa998..7149c97 100644 --- a/content/renderer/webscrollbarbehavior_impl_gtkoraura.cc +++ b/content/renderer/webscrollbarbehavior_impl_gtkoraura.cc
@@ -4,6 +4,7 @@ #include "content/renderer/webscrollbarbehavior_impl_gtkoraura.h" +#include "build/build_config.h" #include "third_party/WebKit/public/platform/WebPoint.h" #include "third_party/WebKit/public/platform/WebRect.h"
diff --git a/content/renderer/websharedworker_proxy.cc b/content/renderer/websharedworker_proxy.cc index 272b4e2b..a10aef9 100644 --- a/content/renderer/websharedworker_proxy.cc +++ b/content/renderer/websharedworker_proxy.cc
@@ -4,6 +4,8 @@ #include "content/renderer/websharedworker_proxy.h" +#include <stddef.h> + #include "content/child/webmessageportchannel_impl.h" #include "content/common/message_router.h" #include "content/common/view_messages.h"
diff --git a/content/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h index 0251f8e..276f956 100644 --- a/content/renderer/websharedworker_proxy.h +++ b/content/renderer/websharedworker_proxy.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ipc/ipc_listener.h" #include "third_party/WebKit/public/web/WebSharedWorkerConnector.h" #include "url/gurl.h"
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index 9763438d..0b6945d 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -494,6 +494,9 @@ crbug.com/380217 [ Linux Win ] fast/shapes/shape-outside-floats/shape-outside-floats-inset-rounded-large-radius.html [ Skip ] crbug.com/380217 [ Win ] fast/shapes/shape-outside-floats/shape-outside-floats-inset-rounded-bottom-left.html [ Skip ] +crbug.com/535408 fast/js/function-bind.html [ NeedsManualRebaseline ] +crbug.com/535408 inspector/sources/debugger/properties-special.html [ NeedsManualRebaseline ] + crbug.com/405389 imported/csswg-test/css-shapes-1/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html [ Failure ] crbug.com/424365 imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-010.html [ Failure ] crbug.com/424365 imported/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-024.html [ Failure ]
diff --git a/ui/accelerated_widget_mac/accelerated_widget_mac.h b/ui/accelerated_widget_mac/accelerated_widget_mac.h index 96aff73..6b514c8 100644 --- a/ui/accelerated_widget_mac/accelerated_widget_mac.h +++ b/ui/accelerated_widget_mac/accelerated_widget_mac.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/mac/scoped_cftyperef.h" +#include "base/macros.h" #include "base/time/time.h" #include "ui/accelerated_widget_mac/accelerated_widget_mac_export.h" #include "ui/accelerated_widget_mac/surface_handle_types.h"
diff --git a/ui/accelerated_widget_mac/display_link_mac.cc b/ui/accelerated_widget_mac/display_link_mac.cc index a409fcb..1f0268a 100644 --- a/ui/accelerated_widget_mac/display_link_mac.cc +++ b/ui/accelerated_widget_mac/display_link_mac.cc
@@ -4,6 +4,8 @@ #include "ui/accelerated_widget_mac/display_link_mac.h" +#include <stdint.h> + #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/trace_event/trace_event.h" @@ -121,8 +123,8 @@ DCHECK((cv_time.videoRefreshPeriod & ~0xffffFFFFull) == 0ull); // Verify that the numerator and denominator make some sense. - uint32 numerator = static_cast<uint32>(cv_time.videoRefreshPeriod); - uint32 denominator = cv_time.videoTimeScale; + uint32_t numerator = static_cast<uint32_t>(cv_time.videoRefreshPeriod); + uint32_t denominator = cv_time.videoTimeScale; if (numerator <= 0 || denominator <= 0) { LOG(WARNING) << "Unexpected numerator or denominator, bailing."; return; @@ -131,7 +133,7 @@ timebase_ = base::TimeTicks::FromInternalValue( cv_time.hostTime / 1000); interval_ = base::TimeDelta::FromMicroseconds( - 1000000 * static_cast<int64>(numerator) / denominator); + 1000000 * static_cast<int64_t>(numerator) / denominator); timebase_and_interval_valid_ = true; // Don't restart the display link for 10 seconds.
diff --git a/ui/accelerated_widget_mac/io_surface_context.h b/ui/accelerated_widget_mac/io_surface_context.h index bf2b254..b84eb719 100644 --- a/ui/accelerated_widget_mac/io_surface_context.h +++ b/ui/accelerated_widget_mac/io_surface_context.h
@@ -8,7 +8,6 @@ #include <OpenGL/OpenGL.h> #include <map> -#include "base/basictypes.h" #include "base/lazy_instance.h" #include "base/mac/scoped_nsobject.h" #include "base/memory/ref_counted.h"
diff --git a/ui/accelerated_widget_mac/surface_handle_types.cc b/ui/accelerated_widget_mac/surface_handle_types.cc index 22d2f6dc..35699629 100644 --- a/ui/accelerated_widget_mac/surface_handle_types.cc +++ b/ui/accelerated_widget_mac/surface_handle_types.cc
@@ -10,19 +10,19 @@ namespace { // The type of the handle is stored in the upper 64 bits. -const uint64 kTypeMask = 0xFFFFFFFFull << 32; +const uint64_t kTypeMask = 0xFFFFFFFFull << 32; -const uint64 kTypeIOSurface = 0x01010101ull << 32; -const uint64 kTypeCAContext = 0x02020202ull << 32; +const uint64_t kTypeIOSurface = 0x01010101ull << 32; +const uint64_t kTypeCAContext = 0x02020202ull << 32; // To make it a bit less likely that we'll just cast off the top bits of the // handle to get the ID, XOR lower bits with a type-specific mask. -const uint32 kXORMaskIOSurface = 0x01010101; -const uint32 kXORMaskCAContext = 0x02020202; +const uint32_t kXORMaskIOSurface = 0x01010101; +const uint32_t kXORMaskCAContext = 0x02020202; } // namespace -SurfaceHandleType GetSurfaceHandleType(uint64 surface_handle) { +SurfaceHandleType GetSurfaceHandleType(uint64_t surface_handle) { switch(surface_handle & kTypeMask) { case kTypeIOSurface: return kSurfaceHandleTypeIOSurface; @@ -32,21 +32,21 @@ return kSurfaceHandleTypeInvalid; } -IOSurfaceID IOSurfaceIDFromSurfaceHandle(uint64 surface_handle) { +IOSurfaceID IOSurfaceIDFromSurfaceHandle(uint64_t surface_handle) { DCHECK_EQ(kSurfaceHandleTypeIOSurface, GetSurfaceHandleType(surface_handle)); - return static_cast<uint32>(surface_handle) ^ kXORMaskIOSurface; + return static_cast<uint32_t>(surface_handle) ^ kXORMaskIOSurface; } -CAContextID CAContextIDFromSurfaceHandle(uint64 surface_handle) { +CAContextID CAContextIDFromSurfaceHandle(uint64_t surface_handle) { DCHECK_EQ(kSurfaceHandleTypeCAContext, GetSurfaceHandleType(surface_handle)); - return static_cast<uint32>(surface_handle) ^ kXORMaskCAContext; + return static_cast<uint32_t>(surface_handle) ^ kXORMaskCAContext; } -uint64 SurfaceHandleFromIOSurfaceID(IOSurfaceID io_surface_id) { +uint64_t SurfaceHandleFromIOSurfaceID(IOSurfaceID io_surface_id) { return kTypeIOSurface | (io_surface_id ^ kXORMaskIOSurface); } -uint64 SurfaceHandleFromCAContextID(CAContextID ca_context_id) { +uint64_t SurfaceHandleFromCAContextID(CAContextID ca_context_id) { return kTypeCAContext | (ca_context_id ^ kXORMaskCAContext); }
diff --git a/ui/accelerated_widget_mac/surface_handle_types.h b/ui/accelerated_widget_mac/surface_handle_types.h index 6a544e3..23723e8 100644 --- a/ui/accelerated_widget_mac/surface_handle_types.h +++ b/ui/accelerated_widget_mac/surface_handle_types.h
@@ -7,8 +7,8 @@ #include <IOSurface/IOSurface.h> #include <OpenGL/CGLIOSurface.h> +#include <stdint.h> -#include "base/basictypes.h" #include "ui/accelerated_widget_mac/accelerated_widget_mac_export.h" #include "ui/base/cocoa/remote_layer_api.h" @@ -24,19 +24,19 @@ }; ACCELERATED_WIDGET_MAC_EXPORT -SurfaceHandleType GetSurfaceHandleType(uint64 surface_handle); +SurfaceHandleType GetSurfaceHandleType(uint64_t surface_handle); ACCELERATED_WIDGET_MAC_EXPORT -CAContextID CAContextIDFromSurfaceHandle(uint64 surface_handle); +CAContextID CAContextIDFromSurfaceHandle(uint64_t surface_handle); ACCELERATED_WIDGET_MAC_EXPORT -IOSurfaceID IOSurfaceIDFromSurfaceHandle(uint64 surface_handle); +IOSurfaceID IOSurfaceIDFromSurfaceHandle(uint64_t surface_handle); ACCELERATED_WIDGET_MAC_EXPORT -uint64 SurfaceHandleFromIOSurfaceID(IOSurfaceID io_surface_id); +uint64_t SurfaceHandleFromIOSurfaceID(IOSurfaceID io_surface_id); ACCELERATED_WIDGET_MAC_EXPORT -uint64 SurfaceHandleFromCAContextID(CAContextID ca_context_id); +uint64_t SurfaceHandleFromCAContextID(CAContextID ca_context_id); } // namespace ui
diff --git a/ui/accelerated_widget_mac/window_resize_helper_mac.cc b/ui/accelerated_widget_mac/window_resize_helper_mac.cc index f36aa91..f44f7ae 100644 --- a/ui/accelerated_widget_mac/window_resize_helper_mac.cc +++ b/ui/accelerated_widget_mac/window_resize_helper_mac.cc
@@ -4,10 +4,13 @@ #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" +#include <stdint.h> + #include <list> #include "base/bind.h" #include "base/callback.h" +#include "base/macros.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" @@ -40,7 +43,7 @@ base::Closure closure_; base::TimeTicks can_run_time_; bool has_run_; - uint64 sequence_number_; + uint64_t sequence_number_; WrappedTaskQueue::iterator iterator_; // Back pointer to the pumpable task runner that this task is enqueued in. @@ -146,7 +149,7 @@ PumpableTaskRunner* pumpable_task_runner) { pumpable_task_runner_ = pumpable_task_runner; base::AutoLock lock(pumpable_task_runner_->task_queue_lock_); - static uint64 last_sequence_number = 0; + static uint64_t last_sequence_number = 0; last_sequence_number += 1; sequence_number_ = last_sequence_number; iterator_ = pumpable_task_runner_->task_queue_.insert(
diff --git a/ui/accessibility/ax_generated_tree_unittest.cc b/ui/accessibility/ax_generated_tree_unittest.cc index 7a5a864..662166a 100644 --- a/ui/accessibility/ax_generated_tree_unittest.cc +++ b/ui/accessibility/ax_generated_tree_unittest.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 "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/accessibility/ax_node.cc b/ui/accessibility/ax_node.cc index 587f737..fc2298b 100644 --- a/ui/accessibility/ax_node.cc +++ b/ui/accessibility/ax_node.cc
@@ -6,9 +6,8 @@ namespace ui { -AXNode::AXNode(AXNode* parent, int32 id, int32 index_in_parent) - : index_in_parent_(index_in_parent), - parent_(parent) { +AXNode::AXNode(AXNode* parent, int32_t id, int32_t index_in_parent) + : index_in_parent_(index_in_parent), parent_(parent) { data_.id = id; }
diff --git a/ui/accessibility/ax_node.h b/ui/accessibility/ax_node.h index 6fd766c5..98f5d28 100644 --- a/ui/accessibility/ax_node.h +++ b/ui/accessibility/ax_node.h
@@ -5,6 +5,8 @@ #ifndef UI_ACCESSIBILITY_AX_NODE_H_ #define UI_ACCESSIBILITY_AX_NODE_H_ +#include <stdint.h> + #include <vector> #include "ui/accessibility/ax_node_data.h" @@ -21,11 +23,11 @@ // The constructor requires a parent, id, and index in parent, but // the data is not required. After initialization, only index_in_parent // is allowed to change, the others are guaranteed to never change. - AXNode(AXNode* parent, int32 id, int32 index_in_parent); + AXNode(AXNode* parent, int32_t id, int32_t index_in_parent); virtual ~AXNode(); // Accessors. - int32 id() const { return data_.id; } + int32_t id() const { return data_.id; } AXNode* parent() const { return parent_; } int child_count() const { return static_cast<int>(children_.size()); } const AXNodeData& data() const { return data_; }
diff --git a/ui/accessibility/ax_node_data.cc b/ui/accessibility/ax_node_data.cc index 26a5bcc..3b263a9 100644 --- a/ui/accessibility/ax_node_data.cc +++ b/ui/accessibility/ax_node_data.cc
@@ -4,6 +4,8 @@ #include "ui/accessibility/ax_node_data.h" +#include <stddef.h> + #include <algorithm> #include <set> @@ -178,17 +180,17 @@ return iter != intlist_attributes.end(); } -const std::vector<int32>& AXNodeData::GetIntListAttribute( +const std::vector<int32_t>& AXNodeData::GetIntListAttribute( AXIntListAttribute attribute) const { - CR_DEFINE_STATIC_LOCAL(std::vector<int32>, empty_vector, ()); + CR_DEFINE_STATIC_LOCAL(std::vector<int32_t>, empty_vector, ()); auto iter = FindInVectorOfPairs(attribute, intlist_attributes); if (iter != intlist_attributes.end()) return iter->second; return empty_vector; } -bool AXNodeData::GetIntListAttribute( - AXIntListAttribute attribute, std::vector<int32>* value) const { +bool AXNodeData::GetIntListAttribute(AXIntListAttribute attribute, + std::vector<int32_t>* value) const { auto iter = FindInVectorOfPairs(attribute, intlist_attributes); if (iter != intlist_attributes.end()) { *value = iter->second; @@ -240,8 +242,8 @@ bool_attributes.push_back(std::make_pair(attribute, value)); } -void AXNodeData::AddIntListAttribute( - AXIntListAttribute attribute, const std::vector<int32>& value) { +void AXNodeData::AddIntListAttribute(AXIntListAttribute attribute, + const std::vector<int32_t>& value) { intlist_attributes.push_back(std::make_pair(attribute, value)); } @@ -589,7 +591,7 @@ } for (size_t i = 0; i < intlist_attributes.size(); ++i) { - const std::vector<int32>& values = intlist_attributes[i].second; + const std::vector<int32_t>& values = intlist_attributes[i].second; switch (intlist_attributes[i].first) { case AX_ATTR_INDIRECT_CHILD_IDS: result += " indirect_child_ids=" + IntVectorToString(values);
diff --git a/ui/accessibility/ax_node_data.h b/ui/accessibility/ax_node_data.h index cc6fb5f..5bb8c147 100644 --- a/ui/accessibility/ax_node_data.h +++ b/ui/accessibility/ax_node_data.h
@@ -5,6 +5,8 @@ #ifndef UI_ACCESSIBILITY_AX_NODE_DATA_H_ #define UI_ACCESSIBILITY_AX_NODE_DATA_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> @@ -63,10 +65,10 @@ AXStringAttribute attribute) const; bool HasIntListAttribute(AXIntListAttribute attribute) const; - const std::vector<int32>& GetIntListAttribute( + const std::vector<int32_t>& GetIntListAttribute( AXIntListAttribute attribute) const; bool GetIntListAttribute(AXIntListAttribute attribute, - std::vector<int32>* value) const; + std::vector<int32_t>* value) const; bool GetHtmlAttribute(const char* attr, base::string16* value) const; bool GetHtmlAttribute(const char* attr, std::string* value) const; @@ -78,7 +80,7 @@ void AddFloatAttribute(AXFloatAttribute attribute, float value); void AddBoolAttribute(AXBoolAttribute attribute, bool value); void AddIntListAttribute(AXIntListAttribute attribute, - const std::vector<int32>& value); + const std::vector<int32_t>& value); // Convenience functions, mainly for writing unit tests. // Equivalent to AddStringAttribute(ATTR_NAME, name). @@ -94,18 +96,18 @@ // This is a simple serializable struct. All member variables should be // public and copyable. - int32 id; + int32_t id; AXRole role; - uint32 state; + uint32_t state; gfx::Rect location; std::vector<std::pair<AXStringAttribute, std::string> > string_attributes; - std::vector<std::pair<AXIntAttribute, int32> > int_attributes; + std::vector<std::pair<AXIntAttribute, int32_t>> int_attributes; std::vector<std::pair<AXFloatAttribute, float> > float_attributes; std::vector<std::pair<AXBoolAttribute, bool> > bool_attributes; - std::vector<std::pair<AXIntListAttribute, std::vector<int32> > > + std::vector<std::pair<AXIntListAttribute, std::vector<int32_t>>> intlist_attributes; base::StringPairs html_attributes; - std::vector<int32> child_ids; + std::vector<int32_t> child_ids; }; } // namespace ui
diff --git a/ui/accessibility/ax_serializable_tree.cc b/ui/accessibility/ax_serializable_tree.cc index c5542c9..9244c7f7 100644 --- a/ui/accessibility/ax_serializable_tree.cc +++ b/ui/accessibility/ax_serializable_tree.cc
@@ -4,6 +4,8 @@ #include "ui/accessibility/ax_serializable_tree.h" +#include <stdint.h> + #include "ui/accessibility/ax_node.h" namespace ui { @@ -25,9 +27,9 @@ AXNode* GetRoot() const override { return tree_->root(); } - AXNode* GetFromId(int32 id) const override { return tree_->GetFromId(id); } + AXNode* GetFromId(int32_t id) const override { return tree_->GetFromId(id); } - int32 GetId(const AXNode* node) const override { return node->id(); } + int32_t GetId(const AXNode* node) const override { return node->id(); } void GetChildren(const AXNode* node, std::vector<const AXNode*>* out_children) const override {
diff --git a/ui/accessibility/ax_text_utils.h b/ui/accessibility/ax_text_utils.h index 2dc2d2f0..ec36b4ca 100644 --- a/ui/accessibility/ax_text_utils.h +++ b/ui/accessibility/ax_text_utils.h
@@ -5,9 +5,10 @@ #ifndef UI_ACCESSIBILITY_AX_TEXT_UTILS_H_ #define UI_ACCESSIBILITY_AX_TEXT_UTILS_H_ +#include <stddef.h> + #include <vector> -#include "base/basictypes.h" #include "base/strings/string16.h" #include "ui/accessibility/ax_export.h"
diff --git a/ui/accessibility/ax_text_utils_unittest.cc b/ui/accessibility/ax_text_utils_unittest.cc index 806401b..1c2a4a1e 100644 --- a/ui/accessibility/ax_text_utils_unittest.cc +++ b/ui/accessibility/ax_text_utils_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/accessibility/ax_text_utils.h"
diff --git a/ui/accessibility/ax_tree.cc b/ui/accessibility/ax_tree.cc index a50a469ad..bd879ea 100644 --- a/ui/accessibility/ax_tree.cc +++ b/ui/accessibility/ax_tree.cc
@@ -4,6 +4,8 @@ #include "ui/accessibility/ax_tree.h" +#include <stddef.h> + #include <set> #include "base/logging.h" @@ -72,8 +74,8 @@ delegate_ = delegate; } -AXNode* AXTree::GetFromId(int32 id) const { - base::hash_map<int32, AXNode*>::const_iterator iter = id_map_.find(id); +AXNode* AXTree::GetFromId(int32_t id) const { + base::hash_map<int32_t, AXNode*>::const_iterator iter = id_map_.find(id); return iter != id_map_.end() ? iter->second : NULL; } @@ -85,7 +87,7 @@ bool AXTree::Unserialize(const AXTreeUpdate& update) { AXTreeUpdateState update_state; - int32 old_root_id = root_ ? root_->id() : 0; + int32_t old_root_id = root_ ? root_->id() : 0; if (update.has_tree_data) UpdateData(update.tree_data); @@ -156,7 +158,9 @@ return "AXTree" + data_.ToString() + "\n" + TreeToStringHelper(root_, 0); } -AXNode* AXTree::CreateNode(AXNode* parent, int32 id, int32 index_in_parent) { +AXNode* AXTree::CreateNode(AXNode* parent, + int32_t id, + int32_t index_in_parent) { AXNode* new_node = new AXNode(parent, id, index_in_parent); id_map_[new_node->id()] = new_node; if (delegate_) @@ -248,11 +252,11 @@ } bool AXTree::DeleteOldChildren(AXNode* node, - const std::vector<int32>& new_child_ids, + const std::vector<int32_t>& new_child_ids, AXTreeUpdateState* update_state) { // Create a set of child ids in |src| for fast lookup, and return false // if a duplicate is found; - std::set<int32> new_child_id_set; + std::set<int32_t> new_child_id_set; for (size_t i = 0; i < new_child_ids.size(); ++i) { if (new_child_id_set.find(new_child_ids[i]) != new_child_id_set.end()) { error_ = base::StringPrintf("Node %d has duplicate child id %d", @@ -274,13 +278,13 @@ } bool AXTree::CreateNewChildVector(AXNode* node, - const std::vector<int32>& new_child_ids, + const std::vector<int32_t>& new_child_ids, std::vector<AXNode*>* new_children, AXTreeUpdateState* update_state) { bool success = true; for (size_t i = 0; i < new_child_ids.size(); ++i) { - int32 child_id = new_child_ids[i]; - int32 index_in_parent = static_cast<int32>(i); + int32_t child_id = new_child_ids[i]; + int32_t index_in_parent = static_cast<int32_t>(i); AXNode* child = GetFromId(child_id); if (child) { if (child->parent() != node) {
diff --git a/ui/accessibility/ax_tree.h b/ui/accessibility/ax_tree.h index 134ddf6..62b0709 100644 --- a/ui/accessibility/ax_tree.h +++ b/ui/accessibility/ax_tree.h
@@ -5,6 +5,8 @@ #ifndef UI_ACCESSIBILITY_AX_TREE_H_ #define UI_ACCESSIBILITY_AX_TREE_H_ +#include <stdint.h> + #include <set> #include "base/containers/hash_tables.h" @@ -103,7 +105,7 @@ const AXTreeData& data() const { return data_; } // Returns the AXNode with the given |id| if it is part of this AXTree. - AXNode* GetFromId(int32 id) const; + AXNode* GetFromId(int32_t id) const; // Returns true on success. If it returns false, it's a fatal error // and this tree should be destroyed, and the source of the tree update @@ -122,7 +124,7 @@ int size() { return static_cast<int>(id_map_.size()); } private: - AXNode* CreateNode(AXNode* parent, int32 id, int32 index_in_parent); + AXNode* CreateNode(AXNode* parent, int32_t id, int32_t index_in_parent); // This is called from within Unserialize(), it returns true on success. bool UpdateNode(const AXNodeData& src, AXTreeUpdateState* update_state); @@ -141,7 +143,7 @@ // child and its subtree if its id is not in |new_child_ids|. Returns // true on success, false on fatal error. bool DeleteOldChildren(AXNode* node, - const std::vector<int32>& new_child_ids, + const std::vector<int32_t>& new_child_ids, AXTreeUpdateState* update_state); // Iterate over |new_child_ids| and populate |new_children| with @@ -150,13 +152,13 @@ // if the id already exists as the child of another node, that's an // error. Returns true on success, false on fatal error. bool CreateNewChildVector(AXNode* node, - const std::vector<int32>& new_child_ids, + const std::vector<int32_t>& new_child_ids, std::vector<AXNode*>* new_children, AXTreeUpdateState* update_state); AXTreeDelegate* delegate_; AXNode* root_; - base::hash_map<int32, AXNode*> id_map_; + base::hash_map<int32_t, AXNode*> id_map_; std::string error_; AXTreeData data_; };
diff --git a/ui/accessibility/ax_tree_data.h b/ui/accessibility/ax_tree_data.h index fa1bdb1..2922a183 100644 --- a/ui/accessibility/ax_tree_data.h +++ b/ui/accessibility/ax_tree_data.h
@@ -5,6 +5,8 @@ #ifndef UI_ACCESSIBILITY_AX_TREE_DATA_H_ #define UI_ACCESSIBILITY_AX_TREE_DATA_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> @@ -30,10 +32,10 @@ // public and copyable. // The globally unique ID of this accessibility tree. - int32 tree_id; + int32_t tree_id; // The ID of the accessibility tree that this tree is contained in, if any. - int32 parent_tree_id; + int32_t parent_tree_id; // Attributes specific to trees that are web frames. std::string url; @@ -46,10 +48,10 @@ // The current text selection within this tree, if any, expressed as the // node ID and character offset of the anchor (selection start) and focus // (selection end). - int32 sel_anchor_object_id; - int32 sel_anchor_offset; - int32 sel_focus_object_id; - int32 sel_focus_offset; + int32_t sel_anchor_object_id; + int32_t sel_anchor_offset; + int32_t sel_focus_object_id; + int32_t sel_focus_offset; }; AX_EXPORT bool operator==(const AXTreeData& lhs, const AXTreeData& rhs);
diff --git a/ui/accessibility/ax_tree_serializer.h b/ui/accessibility/ax_tree_serializer.h index d0e9dfa..e023baf 100644 --- a/ui/accessibility/ax_tree_serializer.h +++ b/ui/accessibility/ax_tree_serializer.h
@@ -5,6 +5,9 @@ #ifndef UI_ACCESSIBILITY_AX_TREE_SERIALIZER_H_ #define UI_ACCESSIBILITY_AX_TREE_SERIALIZER_H_ +#include <stddef.h> +#include <stdint.h> + #include <set> #include "base/containers/hash_tables.h" @@ -140,7 +143,7 @@ bool AnyDescendantWasReparented(AXSourceNode node, AXSourceNode* out_lca); - ClientTreeNode* ClientTreeNodeById(int32 id); + ClientTreeNode* ClientTreeNodeById(int32_t id); // Delete the given client tree node and recursively delete all of its // descendants. @@ -164,7 +167,7 @@ ClientTreeNode* client_root_; // A map from IDs to nodes in the client tree. - base::hash_map<int32, ClientTreeNode*> client_id_map_; + base::hash_map<int32_t, ClientTreeNode*> client_id_map_; // The maximum number of nodes to serialize in a given call to // SerializeChanges, or 0 if there's no maximum. @@ -177,7 +180,7 @@ struct AX_EXPORT ClientTreeNode { ClientTreeNode(); virtual ~ClientTreeNode(); - int32 id; + int32_t id; ClientTreeNode* parent; std::vector<ClientTreeNode*> children; }; @@ -304,8 +307,8 @@ template <typename AXSourceNode, typename AXNodeData, typename AXTreeData> ClientTreeNode* AXTreeSerializer<AXSourceNode, AXNodeData, AXTreeData>::ClientTreeNodeById( - int32 id) { - base::hash_map<int32, ClientTreeNode*>::iterator iter = + int32_t id) { + base::hash_map<int32_t, ClientTreeNode*>::iterator iter = client_id_map_.find(id); if (iter != client_id_map_.end()) return iter->second; @@ -430,7 +433,7 @@ // If we've hit the maximum number of serialized nodes, pretend // this node has no children but keep going so that we get // consistent results. - base::hash_set<int32> new_child_ids; + base::hash_set<int32_t> new_child_ids; std::vector<AXSourceNode> children; if (max_node_count_ == 0 || out_update->nodes.size() < max_node_count_) { tree_->GetChildren(node, &children); @@ -459,7 +462,7 @@ // first in a separate pass so that nodes that are reparented // don't end up children of two different parents in the middle // of an update, which can lead to a double-free. - base::hash_map<int32, ClientTreeNode*> client_child_id_map; + base::hash_map<int32_t, ClientTreeNode*> client_child_id_map; std::vector<ClientTreeNode*> old_children; old_children.swap(client_node->children); for (size_t i = 0; i < old_children.size(); ++i) { @@ -493,7 +496,7 @@ // Iterate over the children, serialize them, and update the ClientTreeNode // data structure to reflect the new tree. - std::vector<int32> actual_serialized_node_child_ids; + std::vector<int32_t> actual_serialized_node_child_ids; client_node->children.reserve(children.size()); for (size_t i = 0; i < children.size(); ++i) { AXSourceNode& child = children[i];
diff --git a/ui/accessibility/ax_tree_serializer_unittest.cc b/ui/accessibility/ax_tree_serializer_unittest.cc index f1c9133..ef8420e 100644 --- a/ui/accessibility/ax_tree_serializer_unittest.cc +++ b/ui/accessibility/ax_tree_serializer_unittest.cc
@@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "testing/gtest/include/gtest/gtest.h" @@ -197,8 +201,8 @@ // AXTreeSource implementation. AXTreeData GetTreeData() const override { return AXTreeData(); } AXNode* GetRoot() const override { return tree_->root(); } - AXNode* GetFromId(int32 id) const override { return tree_->GetFromId(id); } - int32 GetId(const AXNode* node) const override { return node->id(); } + AXNode* GetFromId(int32_t id) const override { return tree_->GetFromId(id); } + int32_t GetId(const AXNode* node) const override { return node->id(); } void GetChildren(const AXNode* node, std::vector<const AXNode*>* out_children) const override { for (int i = 0; i < node->child_count(); ++i)
diff --git a/ui/accessibility/ax_tree_source.h b/ui/accessibility/ax_tree_source.h index ae9f8ca..e87787be 100644 --- a/ui/accessibility/ax_tree_source.h +++ b/ui/accessibility/ax_tree_source.h
@@ -5,6 +5,8 @@ #ifndef UI_ACCESSIBILITY_AX_TREE_SOURCE_H_ #define UI_ACCESSIBILITY_AX_TREE_SOURCE_H_ +#include <stdint.h> + #include <vector> namespace ui { @@ -30,10 +32,10 @@ // Get a node by its id. If no node by that id exists in the tree, return a // null node, i.e. one that will return false if you call IsValid on it. - virtual AXNodeSource GetFromId(int32 id) const = 0; + virtual AXNodeSource GetFromId(int32_t id) const = 0; // Return the id of a node. All ids must be positive integers. - virtual int32 GetId(AXNodeSource node) const = 0; + virtual int32_t GetId(AXNodeSource node) const = 0; // Append all children of |node| to |out_children|. virtual void GetChildren(AXNodeSource node,
diff --git a/ui/accessibility/ax_tree_unittest.cc b/ui/accessibility/ax_tree_unittest.cc index b108d38..16706e7 100644 --- a/ui/accessibility/ax_tree_unittest.cc +++ b/ui/accessibility/ax_tree_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "testing/gtest/include/gtest/gtest.h" @@ -63,31 +66,31 @@ bool tree_data_changed() const { return tree_data_changed_; } bool root_changed() const { return root_changed_; } - const std::vector<int32>& deleted_ids() { return deleted_ids_; } - const std::vector<int32>& subtree_deleted_ids() { + const std::vector<int32_t>& deleted_ids() { return deleted_ids_; } + const std::vector<int32_t>& subtree_deleted_ids() { return subtree_deleted_ids_; } - const std::vector<int32>& created_ids() { return created_ids_; } - const std::vector<int32>& node_creation_finished_ids() { + const std::vector<int32_t>& created_ids() { return created_ids_; } + const std::vector<int32_t>& node_creation_finished_ids() { return node_creation_finished_ids_; } - const std::vector<int32>& subtree_creation_finished_ids() { + const std::vector<int32_t>& subtree_creation_finished_ids() { return subtree_creation_finished_ids_; } - const std::vector<int32>& change_finished_ids() { + const std::vector<int32_t>& change_finished_ids() { return change_finished_ids_; } private: bool tree_data_changed_; bool root_changed_; - std::vector<int32> deleted_ids_; - std::vector<int32> subtree_deleted_ids_; - std::vector<int32> created_ids_; - std::vector<int32> changed_ids_; - std::vector<int32> node_creation_finished_ids_; - std::vector<int32> subtree_creation_finished_ids_; - std::vector<int32> change_finished_ids_; + std::vector<int32_t> deleted_ids_; + std::vector<int32_t> subtree_deleted_ids_; + std::vector<int32_t> created_ids_; + std::vector<int32_t> changed_ids_; + std::vector<int32_t> node_creation_finished_ids_; + std::vector<int32_t> subtree_creation_finished_ids_; + std::vector<int32_t> change_finished_ids_; }; } // namespace
diff --git a/ui/accessibility/ax_tree_update.h b/ui/accessibility/ax_tree_update.h index c7d272f..662bdfa 100644 --- a/ui/accessibility/ax_tree_update.h +++ b/ui/accessibility/ax_tree_update.h
@@ -5,6 +5,9 @@ #ifndef UI_ACCESSIBILITY_AX_TREE_UPDATE_H_ #define UI_ACCESSIBILITY_AX_TREE_UPDATE_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> @@ -95,7 +98,7 @@ // to the rest of the tree for context, so we have to try to show the // relative indentation of child nodes in this update relative to their // parents. - base::hash_map<int32, int> id_to_indentation; + base::hash_map<int32_t, int> id_to_indentation; for (size_t i = 0; i < nodes.size(); ++i) { int indent = id_to_indentation[nodes[i].id]; result += std::string(2 * indent, ' ');
diff --git a/ui/accessibility/ax_view_state.h b/ui/accessibility/ax_view_state.h index 2f1aab09..6126edb 100644 --- a/ui/accessibility/ax_view_state.h +++ b/ui/accessibility/ax_view_state.h
@@ -5,7 +5,8 @@ #ifndef UI_ACCESSIBILITY_AX_VIEW_STATE_H_ #define UI_ACCESSIBILITY_AX_VIEW_STATE_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/callback.h" #include "base/strings/string16.h" #include "ui/accessibility/ax_enums.h" @@ -33,7 +34,7 @@ // The view's state, a bitmask containing fields such as checked // (for a checkbox) and protected (for a password text box). This "state" // should not be confused with the class's name. - uint32 state() { return state_; } + uint32_t state() { return state_; } // The view's role, like button or list box. AXRole role; @@ -73,7 +74,7 @@ base::Callback<void(const base::string16&)> set_value_callback; private: - uint32 state_; + uint32_t state_; }; } // namespace ui
diff --git a/ui/accessibility/platform/ax_platform_node.cc b/ui/accessibility/platform/ax_platform_node.cc index 43ac5c23..8f889458 100644 --- a/ui/accessibility/platform/ax_platform_node.cc +++ b/ui/accessibility/platform/ax_platform_node.cc
@@ -4,6 +4,7 @@ #include "ui/accessibility/platform/ax_platform_node.h" +#include "build/build_config.h" #include "ui/accessibility/ax_node_data.h" #include "ui/accessibility/platform/ax_platform_node_delegate.h"
diff --git a/ui/accessibility/platform/ax_platform_node.h b/ui/accessibility/platform/ax_platform_node.h index 9c4e9e3..1d0ed51 100644 --- a/ui/accessibility/platform/ax_platform_node.h +++ b/ui/accessibility/platform/ax_platform_node.h
@@ -5,6 +5,7 @@ #ifndef UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_NODE_H_ #define UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_NODE_H_ +#include "build/build_config.h" #include "ui/accessibility/ax_enums.h" #include "ui/accessibility/ax_export.h" #include "ui/gfx/native_widget_types.h"
diff --git a/ui/accessibility/platform/ax_platform_node_auralinux.cc b/ui/accessibility/platform/ax_platform_node_auralinux.cc index 722280a..801c347 100644 --- a/ui/accessibility/platform/ax_platform_node_auralinux.cc +++ b/ui/accessibility/platform/ax_platform_node_auralinux.cc
@@ -4,6 +4,8 @@ #include "ui/accessibility/platform/ax_platform_node_auralinux.h" +#include <stdint.h> + #include "base/command_line.h" #include "base/strings/sys_string_conversions.h" #include "base/task_runner.h" @@ -432,7 +434,7 @@ } void AXPlatformNodeAuraLinux::GetAtkState(AtkStateSet* atk_state_set) { - uint32 state = GetData().state; + uint32_t state = GetData().state; if (state & (1 << ui::AX_STATE_CHECKED)) atk_state_set_add_state(atk_state_set, ATK_STATE_CHECKED);
diff --git a/ui/accessibility/platform/ax_platform_node_auralinux.h b/ui/accessibility/platform/ax_platform_node_auralinux.h index 1c1fd8a6..c80b1bf 100644 --- a/ui/accessibility/platform/ax_platform_node_auralinux.h +++ b/ui/accessibility/platform/ax_platform_node_auralinux.h
@@ -7,6 +7,7 @@ #include <atk/atk.h> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ui/accessibility/ax_export.h" #include "ui/accessibility/platform/ax_platform_node_base.h"
diff --git a/ui/accessibility/platform/ax_platform_node_base.h b/ui/accessibility/platform/ax_platform_node_base.h index 324b239..d0684cb6 100644 --- a/ui/accessibility/platform/ax_platform_node_base.h +++ b/ui/accessibility/platform/ax_platform_node_base.h
@@ -5,6 +5,7 @@ #ifndef UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_NODE_BASE_H_ #define UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_NODE_BASE_H_ +#include "base/macros.h" #include "ui/accessibility/ax_enums.h" #include "ui/accessibility/platform/ax_platform_node.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ui/accessibility/platform/ax_platform_node_mac.h b/ui/accessibility/platform/ax_platform_node_mac.h index ed763350..b6a7b1d 100644 --- a/ui/accessibility/platform/ax_platform_node_mac.h +++ b/ui/accessibility/platform/ax_platform_node_mac.h
@@ -8,6 +8,7 @@ #import <Foundation/Foundation.h> #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "ui/accessibility/ax_export.h" #include "ui/accessibility/platform/ax_platform_node_base.h"
diff --git a/ui/accessibility/platform/ax_platform_node_mac.mm b/ui/accessibility/platform/ax_platform_node_mac.mm index 43c1dd1..a4384f9 100644 --- a/ui/accessibility/platform/ax_platform_node_mac.mm +++ b/ui/accessibility/platform/ax_platform_node_mac.mm
@@ -5,7 +5,9 @@ #import "ui/accessibility/platform/ax_platform_node_mac.h" #import <Cocoa/Cocoa.h> +#include <stddef.h> +#include "base/macros.h" #include "base/strings/sys_string_conversions.h" #import "ui/accessibility/ax_node_data.h" #import "ui/accessibility/platform/ax_platform_node_delegate.h"
diff --git a/ui/accessibility/platform/ax_platform_node_win.cc b/ui/accessibility/platform/ax_platform_node_win.cc index 37ad446..51bfed9 100644 --- a/ui/accessibility/platform/ax_platform_node_win.cc +++ b/ui/accessibility/platform/ax_platform_node_win.cc
@@ -5,6 +5,7 @@ #include <atlbase.h> #include <atlcom.h> #include <oleacc.h> +#include <stdint.h> #include "base/containers/hash_tables.h" #include "base/lazy_instance.h" @@ -967,7 +968,7 @@ } int AXPlatformNodeWin::MSAAState() { - uint32 state = GetData().state; + uint32_t state = GetData().state; int msaa_state = 0; if (state & (1 << ui::AX_STATE_CHECKED)) @@ -1103,7 +1104,7 @@ ui::TextBoundaryDirection direction) { HandleSpecialTextOffset(text, &start_offset); ui::TextBoundaryType boundary = IA2TextBoundaryToTextBoundary(ia2_boundary); - std::vector<int32> line_breaks; + std::vector<int32_t> line_breaks; return static_cast<LONG>(ui::FindAccessibleTextBoundary( text, line_breaks, boundary, start_offset, direction)); }
diff --git a/ui/android/edge_effect.cc b/ui/android/edge_effect.cc index 86579e3..5796c023 100644 --- a/ui/android/edge_effect.cc +++ b/ui/android/edge_effect.cc
@@ -4,6 +4,7 @@ #include "ui/android/edge_effect.h" +#include "base/macros.h" #include "cc/layers/layer.h" #include "cc/layers/ui_resource_layer.h" #include "ui/android/animation_utils.h"
diff --git a/ui/android/edge_effect_base.h b/ui/android/edge_effect_base.h index c0bc753..ccd1b03 100644 --- a/ui/android/edge_effect_base.h +++ b/ui/android/edge_effect_base.h
@@ -5,7 +5,6 @@ #ifndef UI_ANDROID_EDGE_EFFECT_BASE_H_ #define UI_ANDROID_EDGE_EFFECT_BASE_H_ -#include "base/basictypes.h" #include "base/time/time.h" #include "ui/gfx/geometry/size_f.h" #include "ui/gfx/transform.h"
diff --git a/ui/android/overscroll_glow.cc b/ui/android/overscroll_glow.cc index 613a1ad..3f9fb02 100644 --- a/ui/android/overscroll_glow.cc +++ b/ui/android/overscroll_glow.cc
@@ -4,6 +4,8 @@ #include "ui/android/overscroll_glow.h" +#include <stddef.h> + #include "cc/layers/layer.h" #include "ui/android/edge_effect_base.h" #include "ui/android/window_android_compositor.h"
diff --git a/ui/android/resources/resource_manager_impl.cc b/ui/android/resources/resource_manager_impl.cc index 9a5b5910..8a68bf7 100644 --- a/ui/android/resources/resource_manager_impl.cc +++ b/ui/android/resources/resource_manager_impl.cc
@@ -4,6 +4,8 @@ #include "ui/android/resources/resource_manager_impl.h" +#include <stddef.h> + #include <utility> #include <vector>
diff --git a/ui/android/resources/resource_manager_impl.h b/ui/android/resources/resource_manager_impl.h index 6b0d0cd..4e08989 100644 --- a/ui/android/resources/resource_manager_impl.h +++ b/ui/android/resources/resource_manager_impl.h
@@ -6,6 +6,7 @@ #define UI_ANDROID_RESOURCES_RESOURCE_MANAGER_IMPL_H_ #include "base/id_map.h" +#include "base/macros.h" #include "ui/android/resources/resource_manager.h" #include "ui/android/ui_android_export.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ui/android/resources/resource_manager_impl_unittest.cc b/ui/android/resources/resource_manager_impl_unittest.cc index 82ed7b1..649ce7b 100644 --- a/ui/android/resources/resource_manager_impl_unittest.cc +++ b/ui/android/resources/resource_manager_impl_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "cc/resources/ui_resource_bitmap.h" #include "cc/test/fake_layer_tree_host_client.h" #include "cc/test/test_task_graph_runner.h"
diff --git a/ui/android/ui_android_jni_registrar.cc b/ui/android/ui_android_jni_registrar.cc index 9ed2d93..8441dd2 100644 --- a/ui/android/ui_android_jni_registrar.cc +++ b/ui/android/ui_android_jni_registrar.cc
@@ -6,6 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" +#include "base/macros.h" #include "ui/android/resources/resource_manager_impl.h" #include "ui/android/view_android.h" #include "ui/android/window_android.h"
diff --git a/ui/android/window_android.h b/ui/android/window_android.h index f49e121b..258afcd 100644 --- a/ui/android/window_android.h +++ b/ui/android/window_android.h
@@ -11,6 +11,7 @@ #include "base/android/jni_weak_ref.h" #include "base/android/scoped_java_ref.h" +#include "base/macros.h" #include "base/observer_list.h" #include "base/time/time.h" #include "ui/android/ui_android_export.h"
diff --git a/ui/aura_extra/image_window_delegate.h b/ui/aura_extra/image_window_delegate.h index faf49e42..32f6479 100644 --- a/ui/aura_extra/image_window_delegate.h +++ b/ui/aura_extra/image_window_delegate.h
@@ -5,6 +5,7 @@ #ifndef UI_AURA_EXTRA_IMAGE_WINDOW_DELEGATE_H_ #define UI_AURA_EXTRA_IMAGE_WINDOW_DELEGATE_H_ +#include "base/macros.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/aura/window_delegate.h" #include "ui/aura_extra/aura_extra_export.h"
diff --git a/ui/chromeos/ime/candidate_view.cc b/ui/chromeos/ime/candidate_view.cc index db90b6f..4755806 100644 --- a/ui/chromeos/ime/candidate_view.cc +++ b/ui/chromeos/ime/candidate_view.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 "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/ime/candidate_window.h" #include "ui/chromeos/ime/candidate_view.h"
diff --git a/ui/chromeos/ime/candidate_view.h b/ui/chromeos/ime/candidate_view.h index bc89160..010f238 100644 --- a/ui/chromeos/ime/candidate_view.h +++ b/ui/chromeos/ime/candidate_view.h
@@ -6,6 +6,7 @@ #define UI_CHROMEOS_IME_CANDIDATE_VIEW_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "ui/base/ime/candidate_window.h" #include "ui/chromeos/ui_chromeos_export.h" #include "ui/views/controls/button/custom_button.h"
diff --git a/ui/chromeos/ime/candidate_view_unittest.cc b/ui/chromeos/ime/candidate_view_unittest.cc index e7ce9cd8..bc36db6f 100644 --- a/ui/chromeos/ime/candidate_view_unittest.cc +++ b/ui/chromeos/ime/candidate_view_unittest.cc
@@ -4,7 +4,10 @@ #include "ui/chromeos/ime/candidate_view.h" +#include <stddef.h> + #include "base/logging.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/window.h" #include "ui/events/test/event_generator.h"
diff --git a/ui/chromeos/ime/candidate_window_view.cc b/ui/chromeos/ime/candidate_window_view.cc index 7532703..6007778 100644 --- a/ui/chromeos/ime/candidate_window_view.cc +++ b/ui/chromeos/ime/candidate_window_view.cc
@@ -4,8 +4,11 @@ #include "ui/chromeos/ime/candidate_window_view.h" +#include <stddef.h> + #include <string> +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/chromeos/ime/candidate_view.h" #include "ui/chromeos/ime/candidate_window_constants.h"
diff --git a/ui/chromeos/ime/candidate_window_view.h b/ui/chromeos/ime/candidate_window_view.h index 6861e1bfd..a7ec7ec 100644 --- a/ui/chromeos/ime/candidate_window_view.h +++ b/ui/chromeos/ime/candidate_window_view.h
@@ -5,6 +5,7 @@ #ifndef UI_CHROMEOS_IME_CANDIDATE_WINDOW_VIEW_H_ #define UI_CHROMEOS_IME_CANDIDATE_WINDOW_VIEW_H_ +#include "base/macros.h" #include "ui/base/ime/candidate_window.h" #include "ui/chromeos/ui_chromeos_export.h" #include "ui/views/bubble/bubble_delegate.h"
diff --git a/ui/chromeos/ime/candidate_window_view_unittest.cc b/ui/chromeos/ime/candidate_window_view_unittest.cc index 6b18a48..cd8534c 100644 --- a/ui/chromeos/ime/candidate_window_view_unittest.cc +++ b/ui/chromeos/ime/candidate_window_view_unittest.cc
@@ -4,8 +4,11 @@ #include "ui/chromeos/ime/candidate_window_view.h" +#include <stddef.h> + #include <string> +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/chromeos/ime/infolist_window.cc b/ui/chromeos/ime/infolist_window.cc index 82aea181..7a0facc 100644 --- a/ui/chromeos/ime/infolist_window.cc +++ b/ui/chromeos/ime/infolist_window.cc
@@ -4,10 +4,13 @@ #include "ui/chromeos/ime/infolist_window.h" +#include <stddef.h> + #include <string> #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "ui/base/l10n/l10n_util.h" #include "ui/chromeos/ime/candidate_window_constants.h" #include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
diff --git a/ui/chromeos/ime/infolist_window.h b/ui/chromeos/ime/infolist_window.h index f305790..45016c6 100644 --- a/ui/chromeos/ime/infolist_window.h +++ b/ui/chromeos/ime/infolist_window.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/timer/timer.h"
diff --git a/ui/chromeos/ime/input_method_menu_manager.cc b/ui/chromeos/ime/input_method_menu_manager.cc index d6ebff2..f4032f8 100644 --- a/ui/chromeos/ime/input_method_menu_manager.cc +++ b/ui/chromeos/ime/input_method_menu_manager.cc
@@ -4,6 +4,8 @@ #include "ui/chromeos/ime/input_method_menu_manager.h" +#include <stddef.h> + #include "base/logging.h" #include "base/memory/singleton.h"
diff --git a/ui/chromeos/ime/input_method_menu_manager.h b/ui/chromeos/ime/input_method_menu_manager.h index 65427b7..b78e277 100644 --- a/ui/chromeos/ime/input_method_menu_manager.h +++ b/ui/chromeos/ime/input_method_menu_manager.h
@@ -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 "base/macros.h" #include "base/observer_list.h" #include "ui/chromeos/ime/input_method_menu_item.h" #include "ui/chromeos/ui_chromeos_export.h"
diff --git a/ui/chromeos/ime/mode_indicator_view.cc b/ui/chromeos/ime/mode_indicator_view.cc index 38e2f45..a9105eb 100644 --- a/ui/chromeos/ime/mode_indicator_view.cc +++ b/ui/chromeos/ime/mode_indicator_view.cc
@@ -5,6 +5,7 @@ #include "ui/chromeos/ime/mode_indicator_view.h" #include "base/logging.h" +#include "base/macros.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" #include "ui/views/bubble/bubble_delegate.h"
diff --git a/ui/chromeos/ime/mode_indicator_view.h b/ui/chromeos/ime/mode_indicator_view.h index d9c824b..24cab4d 100644 --- a/ui/chromeos/ime/mode_indicator_view.h +++ b/ui/chromeos/ime/mode_indicator_view.h
@@ -5,6 +5,7 @@ #ifndef UI_CHROMEOS_IME_MODE_INDICATOR_VIEW_H_ #define UI_CHROMEOS_IME_MODE_INDICATOR_VIEW_H_ +#include "base/macros.h" #include "base/strings/string16.h" #include "base/timer/timer.h" #include "ui/chromeos/ui_chromeos_export.h"
diff --git a/ui/chromeos/network/network_connect.cc b/ui/chromeos/network/network_connect.cc index 23e1109..6fa57bc 100644 --- a/ui/chromeos/network/network_connect.cc +++ b/ui/chromeos/network/network_connect.cc
@@ -5,6 +5,7 @@ #include "ui/chromeos/network/network_connect.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/ui/chromeos/network/network_connect.h b/ui/chromeos/network/network_connect.h index 6a9a275..b7acddf6 100644 --- a/ui/chromeos/network/network_connect.h +++ b/ui/chromeos/network/network_connect.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/chromeos/ui_chromeos_export.h"
diff --git a/ui/chromeos/network/network_icon.cc b/ui/chromeos/network/network_icon.cc index 6f61a00..b1785d6 100644 --- a/ui/chromeos/network/network_icon.cc +++ b/ui/chromeos/network/network_icon.cc
@@ -4,6 +4,7 @@ #include "ui/chromeos/network/network_icon.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chromeos/network/device_state.h" #include "chromeos/network/network_connection_handler.h"
diff --git a/ui/chromeos/network/network_list.cc b/ui/chromeos/network/network_list.cc index 0941205..374ae49 100644 --- a/ui/chromeos/network/network_list.cc +++ b/ui/chromeos/network/network_list.cc
@@ -4,6 +4,8 @@ #include "ui/chromeos/network/network_list.h" +#include <stddef.h> + #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager/power_supply_properties.pb.h" #include "chromeos/dbus/power_manager_client.h"
diff --git a/ui/chromeos/network/network_list.h b/ui/chromeos/network/network_list.h index 06ee3a6..66af3c1 100644 --- a/ui/chromeos/network/network_list.h +++ b/ui/chromeos/network/network_list.h
@@ -9,6 +9,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "chromeos/network/network_state_handler.h" #include "ui/chromeos/network/network_icon_animation_observer.h" #include "ui/chromeos/network/network_list_view_base.h"
diff --git a/ui/chromeos/network/network_state_notifier.h b/ui/chromeos/network/network_state_notifier.h index ccbff99..2d25fa09 100644 --- a/ui/chromeos/network/network_state_notifier.h +++ b/ui/chromeos/network/network_state_notifier.h
@@ -7,8 +7,8 @@ #include <set> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/ui/chromeos/network/network_state_notifier_unittest.cc b/ui/chromeos/network/network_state_notifier_unittest.cc index 5b759f6..c235d7c 100644 --- a/ui/chromeos/network/network_state_notifier_unittest.cc +++ b/ui/chromeos/network/network_state_notifier_unittest.cc
@@ -4,6 +4,7 @@ #include "ui/chromeos/network/network_state_notifier.h" +#include "base/macros.h" #include "base/run_loop.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/shill_device_client.h"
diff --git a/ui/chromeos/run_all_unittests.cc b/ui/chromeos/run_all_unittests.cc index 91cd23d..d1c9b74 100644 --- a/ui/chromeos/run_all_unittests.cc +++ b/ui/chromeos/run_all_unittests.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/bind.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h"
diff --git a/ui/chromeos/touch_exploration_controller.h b/ui/chromeos/touch_exploration_controller.h index d505273..e7a0d9cd 100644 --- a/ui/chromeos/touch_exploration_controller.h +++ b/ui/chromeos/touch_exploration_controller.h
@@ -5,6 +5,7 @@ #ifndef UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_ #define UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_ +#include "base/macros.h" #include "base/time/tick_clock.h" #include "base/timer/timer.h" #include "base/values.h"
diff --git a/ui/chromeos/touch_exploration_controller_unittest.cc b/ui/chromeos/touch_exploration_controller_unittest.cc index 1f584ba3..556b6189 100644 --- a/ui/chromeos/touch_exploration_controller_unittest.cc +++ b/ui/chromeos/touch_exploration_controller_unittest.cc
@@ -4,6 +4,9 @@ #include "ui/chromeos/touch_exploration_controller.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/test/simple_test_tick_clock.h" #include "base/time/time.h" #include "ui/aura/client/cursor_client.h"
diff --git a/ui/chromeos/user_activity_power_manager_notifier.h b/ui/chromeos/user_activity_power_manager_notifier.h index 1f7babd..123343c5 100644 --- a/ui/chromeos/user_activity_power_manager_notifier.h +++ b/ui/chromeos/user_activity_power_manager_notifier.h
@@ -5,8 +5,8 @@ #ifndef UI_CHROMEOS_USER_ACTIVITY_POWER_MANAGER_NOTIFIER_H_ #define UI_CHROMEOS_USER_ACTIVITY_POWER_MANAGER_NOTIFIER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "ui/base/user_activity/user_activity_observer.h" #include "ui/chromeos/ui_chromeos_export.h"
diff --git a/ui/compositor/callback_layer_animation_observer.h b/ui/compositor/callback_layer_animation_observer.h index cff5fb4..5db3b31 100644 --- a/ui/compositor/callback_layer_animation_observer.h +++ b/ui/compositor/callback_layer_animation_observer.h
@@ -6,6 +6,7 @@ #define UI_COMPOSITOR_CALLBACK_LAYER_ANIMATION_OBSERVER_H_ #include "base/callback.h" +#include "base/macros.h" #include "ui/compositor/compositor_export.h" #include "ui/compositor/layer_animation_observer.h"
diff --git a/ui/compositor/canvas_painter.h b/ui/compositor/canvas_painter.h index 6d8d3902..ac9489f 100644 --- a/ui/compositor/canvas_painter.h +++ b/ui/compositor/canvas_painter.h
@@ -5,6 +5,7 @@ #ifndef UI_COMPOSITOR_CANVAS_PAINTER_H_ #define UI_COMPOSITOR_CANVAS_PAINTER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ui/compositor/compositor_export.h" #include "ui/compositor/paint_context.h"
diff --git a/ui/compositor/compositing_recorder.h b/ui/compositor/compositing_recorder.h index 3a49ab3..86267d0 100644 --- a/ui/compositor/compositing_recorder.h +++ b/ui/compositor/compositing_recorder.h
@@ -5,7 +5,8 @@ #ifndef UI_COMPOSITOR_COMPOSITING_RECORDER_H_ #define UI_COMPOSITOR_COMPOSITING_RECORDER_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/macros.h" #include "ui/compositor/compositor_export.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc index 3eae5f5..fe85bdfa 100644 --- a/ui/compositor/compositor.cc +++ b/ui/compositor/compositor.cc
@@ -4,6 +4,8 @@ #include "ui/compositor/compositor.h" +#include <stddef.h> + #include <algorithm> #include <deque> #include <utility> @@ -15,6 +17,7 @@ #include "base/strings/string_util.h" #include "base/sys_info.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "cc/animation/animation_host.h" #include "cc/animation/animation_id_provider.h" #include "cc/animation/animation_timeline.h"
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h index 6c3c07d5..5222b41 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h
@@ -5,9 +5,12 @@ #ifndef UI_COMPOSITOR_COMPOSITOR_H_ #define UI_COMPOSITOR_COMPOSITOR_H_ +#include <stdint.h> + #include <string> #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" @@ -96,8 +99,8 @@ virtual bool DoesCreateTestContexts() = 0; // Returns the OpenGL target to use for image textures. - virtual uint32 GetImageTextureTarget(gfx::BufferFormat format, - gfx::BufferUsage usage) = 0; + virtual uint32_t GetImageTextureTarget(gfx::BufferFormat format, + gfx::BufferUsage usage) = 0; // Gets the shared bitmap manager for software mode. virtual cc::SharedBitmapManager* GetSharedBitmapManager() = 0;
diff --git a/ui/compositor/compositor_unittest.cc b/ui/compositor/compositor_unittest.cc index 667845a0..50180ad1 100644 --- a/ui/compositor/compositor_unittest.cc +++ b/ui/compositor/compositor_unittest.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 "base/macros.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "cc/output/begin_frame_args.h"
diff --git a/ui/compositor/compositor_vsync_manager.h b/ui/compositor/compositor_vsync_manager.h index 9f3e688..54bcc1a 100644 --- a/ui/compositor/compositor_vsync_manager.h +++ b/ui/compositor/compositor_vsync_manager.h
@@ -5,6 +5,7 @@ #ifndef UI_COMPOSITOR_COMPOSITOR_VSYNC_MANAGER_H_ #define UI_COMPOSITOR_COMPOSITOR_VSYNC_MANAGER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "base/synchronization/lock.h"
diff --git a/ui/compositor/debug_utils.cc b/ui/compositor/debug_utils.cc index a2e4b2c..3d0d42dd 100644 --- a/ui/compositor/debug_utils.cc +++ b/ui/compositor/debug_utils.cc
@@ -6,6 +6,8 @@ #include "ui/compositor/debug_utils.h" +#include <stddef.h> + #include <cmath> #include <iomanip> #include <ostream>
diff --git a/ui/compositor/dip_util.h b/ui/compositor/dip_util.h index b4c02575..0a78361f6 100644 --- a/ui/compositor/dip_util.h +++ b/ui/compositor/dip_util.h
@@ -5,7 +5,6 @@ #ifndef UI_COMPOSITOR_DIP_UTIL_H_ #define UI_COMPOSITOR_DIP_UTIL_H_ -#include "base/basictypes.h" #include "ui/compositor/compositor_export.h" #include "ui/gfx/geometry/point_f.h"
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h index 3e80538..143a4e7 100644 --- a/ui/compositor/layer.h +++ b/ui/compositor/layer.h
@@ -5,10 +5,13 @@ #ifndef UI_COMPOSITOR_LAYER_H_ #define UI_COMPOSITOR_LAYER_H_ +#include <stddef.h> + #include <string> #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h"
diff --git a/ui/compositor/layer_animation_element.cc b/ui/compositor/layer_animation_element.cc index 0e2a976..5e0f558 100644 --- a/ui/compositor/layer_animation_element.cc +++ b/ui/compositor/layer_animation_element.cc
@@ -7,6 +7,7 @@ #include <utility> #include "base/compiler_specific.h" +#include "base/macros.h" #include "cc/animation/animation.h" #include "cc/animation/animation_id_provider.h" #include "ui/compositor/float_animation_curve_adapter.h"
diff --git a/ui/compositor/layer_animation_element.h b/ui/compositor/layer_animation_element.h index e2b92e1..cf21d15 100644 --- a/ui/compositor/layer_animation_element.h +++ b/ui/compositor/layer_animation_element.h
@@ -5,8 +5,11 @@ #ifndef UI_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_ #define UI_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_ +#include <stdint.h> + #include <set> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "cc/animation/animation.h" @@ -59,7 +62,7 @@ SkColor color; }; - typedef uint32 AnimatableProperties; + typedef uint32_t AnimatableProperties; LayerAnimationElement(AnimatableProperties properties, base::TimeDelta duration);
diff --git a/ui/compositor/layer_animation_element_unittest.cc b/ui/compositor/layer_animation_element_unittest.cc index b58765a..bc2b1e1 100644 --- a/ui/compositor/layer_animation_element_unittest.cc +++ b/ui/compositor/layer_animation_element_unittest.cc
@@ -4,7 +4,6 @@ #include "ui/compositor/layer_animation_element.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h"
diff --git a/ui/compositor/layer_animation_observer.h b/ui/compositor/layer_animation_observer.h index 01486cc..cd57479 100644 --- a/ui/compositor/layer_animation_observer.h +++ b/ui/compositor/layer_animation_observer.h
@@ -8,7 +8,6 @@ #include <map> #include <set> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/compositor/compositor_export.h" #include "ui/compositor/layer_animation_element.h"
diff --git a/ui/compositor/layer_animation_sequence.h b/ui/compositor/layer_animation_sequence.h index 98afe9e..898f65bb 100644 --- a/ui/compositor/layer_animation_sequence.h +++ b/ui/compositor/layer_animation_sequence.h
@@ -5,9 +5,12 @@ #ifndef UI_COMPOSITOR_LAYER_ANIMATION_SEQUENCE_H_ #define UI_COMPOSITOR_LAYER_ANIMATION_SEQUENCE_H_ +#include <stddef.h> + #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/ui/compositor/layer_animation_sequence_unittest.cc b/ui/compositor/layer_animation_sequence_unittest.cc index c416fabc..e1bb123 100644 --- a/ui/compositor/layer_animation_sequence_unittest.cc +++ b/ui/compositor/layer_animation_sequence_unittest.cc
@@ -4,7 +4,6 @@ #include "ui/compositor/layer_animation_sequence.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h"
diff --git a/ui/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc index 691e020..2e2d457 100644 --- a/ui/compositor/layer_animator.cc +++ b/ui/compositor/layer_animator.cc
@@ -4,6 +4,8 @@ #include "ui/compositor/layer_animator.h" +#include <stddef.h> + #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/trace_event/trace_event.h"
diff --git a/ui/compositor/layer_animator.h b/ui/compositor/layer_animator.h index 897bff9..a0f5e92 100644 --- a/ui/compositor/layer_animator.h +++ b/ui/compositor/layer_animator.h
@@ -10,6 +10,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h"
diff --git a/ui/compositor/layer_animator_collection.h b/ui/compositor/layer_animator_collection.h index d00fcea..7e909bd 100644 --- a/ui/compositor/layer_animator_collection.h +++ b/ui/compositor/layer_animator_collection.h
@@ -8,6 +8,7 @@ #include <set> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "ui/compositor/compositor_animation_observer.h"
diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc index 633a801..253b174 100644 --- a/ui/compositor/layer_animator_unittest.cc +++ b/ui/compositor/layer_animator_unittest.cc
@@ -4,8 +4,8 @@ #include "ui/compositor/layer_animator.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "base/time/time.h"
diff --git a/ui/compositor/layer_owner.h b/ui/compositor/layer_owner.h index ec87c2ec..5e19df4 100644 --- a/ui/compositor/layer_owner.h +++ b/ui/compositor/layer_owner.h
@@ -6,6 +6,7 @@ #define UI_COMPOSITOR_LAYER_OWNER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/compositor/compositor_export.h" #include "ui/compositor/layer.h"
diff --git a/ui/compositor/layer_owner_unittest.cc b/ui/compositor/layer_owner_unittest.cc index 3eb088e7..75ec44c 100644 --- a/ui/compositor/layer_owner_unittest.cc +++ b/ui/compositor/layer_owner_unittest.cc
@@ -4,6 +4,7 @@ #include "ui/compositor/layer_owner.h" +#include "base/macros.h" #include "base/test/null_task_runner.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/compositor/compositor.h"
diff --git a/ui/compositor/layer_tree_owner.h b/ui/compositor/layer_tree_owner.h index 0b2c4783..a54142b 100644 --- a/ui/compositor/layer_tree_owner.h +++ b/ui/compositor/layer_tree_owner.h
@@ -5,8 +5,8 @@ #ifndef UI_COMPOSITOR_LAYER_TREE_OWNER_H_ #define UI_COMPOSITOR_LAYER_TREE_OWNER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/compositor/compositor_export.h" namespace ui {
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc index b469141..70581b6 100644 --- a/ui/compositor/layer_unittest.cc +++ b/ui/compositor/layer_unittest.cc
@@ -4,14 +4,16 @@ #include "ui/compositor/layer.h" +#include <stddef.h> + #include <utility> -#include "base/basictypes.h" #include "base/bind.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h"
diff --git a/ui/compositor/paint_cache.h b/ui/compositor/paint_cache.h index 516424f..f8119d09 100644 --- a/ui/compositor/paint_cache.h +++ b/ui/compositor/paint_cache.h
@@ -5,6 +5,7 @@ #ifndef UI_COMPOSITOR_PAINT_CACHE_H_ #define UI_COMPOSITOR_PAINT_CACHE_H_ +#include "base/macros.h" #include "cc/playback/drawing_display_item.h" #include "ui/compositor/compositor_export.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ui/compositor/paint_context.h b/ui/compositor/paint_context.h index afa1426..3473f236 100644 --- a/ui/compositor/paint_context.h +++ b/ui/compositor/paint_context.h
@@ -6,6 +6,7 @@ #define UI_COMPOSITOR_PAINT_CONTEXT_H_ #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/compositor/compositor_export.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ui/compositor/scoped_animation_duration_scale_mode.h b/ui/compositor/scoped_animation_duration_scale_mode.h index 94446517..04b64c69 100644 --- a/ui/compositor/scoped_animation_duration_scale_mode.h +++ b/ui/compositor/scoped_animation_duration_scale_mode.h
@@ -5,7 +5,7 @@ #ifndef UI_COMPOSITOR_SCOPED_ANIMATION_DURATION_SCALE_MODE_H_ #define UI_COMPOSITOR_SCOPED_ANIMATION_DURATION_SCALE_MODE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/compositor/compositor_export.h" namespace ui {
diff --git a/ui/compositor/scoped_layer_animation_settings.cc b/ui/compositor/scoped_layer_animation_settings.cc index 9316a4a..2b3211a 100644 --- a/ui/compositor/scoped_layer_animation_settings.cc +++ b/ui/compositor/scoped_layer_animation_settings.cc
@@ -4,6 +4,8 @@ #include "ui/compositor/scoped_layer_animation_settings.h" +#include <stddef.h> + #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/layer_animation_sequence.h"
diff --git a/ui/compositor/scoped_layer_animation_settings.h b/ui/compositor/scoped_layer_animation_settings.h index d4de1402..22e547b 100644 --- a/ui/compositor/scoped_layer_animation_settings.h +++ b/ui/compositor/scoped_layer_animation_settings.h
@@ -7,8 +7,8 @@ #include <set> +#include "base/macros.h" #include "base/time/time.h" - #include "ui/compositor/compositor_export.h" #include "ui/compositor/layer_animator.h" #include "ui/gfx/animation/tween.h"
diff --git a/ui/compositor/test/draw_waiter_for_test.h b/ui/compositor/test/draw_waiter_for_test.h index 7e3de14f..40e5342 100644 --- a/ui/compositor/test/draw_waiter_for_test.h +++ b/ui/compositor/test/draw_waiter_for_test.h
@@ -5,6 +5,7 @@ #ifndef UI_COMPOSITOR_TEST_DRAW_WAITER_H_ #define UI_COMPOSITOR_TEST_DRAW_WAITER_H_ +#include "base/macros.h" #include "base/run_loop.h" #include "ui/compositor/compositor_observer.h"
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc index d9422dd..a7f8d0a 100644 --- a/ui/compositor/test/in_process_context_factory.cc +++ b/ui/compositor/test/in_process_context_factory.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/threading/thread.h" #include "cc/output/compositor_frame.h" #include "cc/output/context_provider.h" @@ -210,8 +211,9 @@ return context_factory_for_test_; } -uint32 InProcessContextFactory::GetImageTextureTarget(gfx::BufferFormat format, - gfx::BufferUsage usage) { +uint32_t InProcessContextFactory::GetImageTextureTarget( + gfx::BufferFormat format, + gfx::BufferUsage usage) { return GL_TEXTURE_2D; }
diff --git a/ui/compositor/test/in_process_context_factory.h b/ui/compositor/test/in_process_context_factory.h index 3c4e176d..623047098 100644 --- a/ui/compositor/test/in_process_context_factory.h +++ b/ui/compositor/test/in_process_context_factory.h
@@ -5,6 +5,9 @@ #ifndef UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_ #define UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_FACTORY_H_ +#include <stdint.h> + +#include "base/macros.h" #include "cc/test/test_gpu_memory_buffer_manager.h" #include "cc/test/test_image_factory.h" #include "cc/test/test_shared_bitmap_manager.h" @@ -47,8 +50,8 @@ scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override; void RemoveCompositor(Compositor* compositor) override; bool DoesCreateTestContexts() override; - uint32 GetImageTextureTarget(gfx::BufferFormat format, - gfx::BufferUsage usage) override; + uint32_t GetImageTextureTarget(gfx::BufferFormat format, + gfx::BufferUsage usage) override; cc::SharedBitmapManager* GetSharedBitmapManager() override; gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; cc::TaskGraphRunner* GetTaskGraphRunner() override;
diff --git a/ui/compositor/test/in_process_context_provider.cc b/ui/compositor/test/in_process_context_provider.cc index dc7deaf4..01380345 100644 --- a/ui/compositor/test/in_process_context_provider.cc +++ b/ui/compositor/test/in_process_context_provider.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event.h" #include "cc/output/managed_memory_policy.h"
diff --git a/ui/compositor/test/in_process_context_provider.h b/ui/compositor/test/in_process_context_provider.h index 0f4fb74e..b7c8565 100644 --- a/ui/compositor/test/in_process_context_provider.h +++ b/ui/compositor/test/in_process_context_provider.h
@@ -5,6 +5,8 @@ #ifndef UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_ #define UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_ +#include <stdint.h> + #include <string> #include "base/macros.h"
diff --git a/ui/compositor/test/layer_animator_test_controller.cc b/ui/compositor/test/layer_animator_test_controller.cc index e7435c57..9e07d05e 100644 --- a/ui/compositor/test/layer_animator_test_controller.cc +++ b/ui/compositor/test/layer_animator_test_controller.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "cc/animation/animation.h" #include "ui/compositor/layer_animation_sequence.h" #include "ui/compositor/test/layer_animator_test_controller.h"
diff --git a/ui/compositor/test/test_compositor_host_android.cc b/ui/compositor/test/test_compositor_host_android.cc index 3558b0d..2739fc2 100644 --- a/ui/compositor/test/test_compositor_host_android.cc +++ b/ui/compositor/test/test_compositor_host_android.cc
@@ -5,6 +5,7 @@ #include "ui/compositor/test/test_compositor_host.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/thread_task_runner_handle.h" #include "ui/compositor/compositor.h"
diff --git a/ui/compositor/test/test_compositor_host_mac.mm b/ui/compositor/test/test_compositor_host_mac.mm index f18b174..7857ca33 100644 --- a/ui/compositor/test/test_compositor_host_mac.mm +++ b/ui/compositor/test/test_compositor_host_mac.mm
@@ -12,6 +12,7 @@ #include "base/compiler_specific.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/thread_task_runner_handle.h" #include "ui/compositor/compositor.h"
diff --git a/ui/compositor/test/test_compositor_host_ozone.cc b/ui/compositor/test/test_compositor_host_ozone.cc index b7f9d00..c5c7f6db 100644 --- a/ui/compositor/test/test_compositor_host_ozone.cc +++ b/ui/compositor/test/test_compositor_host_ozone.cc
@@ -4,10 +4,10 @@ #include "ui/compositor/test/test_compositor_host.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/thread_task_runner_handle.h"
diff --git a/ui/compositor/test/test_compositor_host_win.cc b/ui/compositor/test/test_compositor_host_win.cc index b0e00706..94a48cc 100644 --- a/ui/compositor/test/test_compositor_host_win.cc +++ b/ui/compositor/test/test_compositor_host_win.cc
@@ -5,6 +5,7 @@ #include "ui/compositor/test/test_compositor_host.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/thread_task_runner_handle.h" #include "ui/compositor/compositor.h"
diff --git a/ui/compositor/test/test_compositor_host_x11.cc b/ui/compositor/test/test_compositor_host_x11.cc index 0ce963f..758c8891 100644 --- a/ui/compositor/test/test_compositor_host_x11.cc +++ b/ui/compositor/test/test_compositor_host_x11.cc
@@ -6,10 +6,10 @@ #include <X11/Xlib.h> -#include "base/basictypes.h" #include "base/bind.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/thread_task_runner_handle.h"
diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc index 1c246d2..3b38b6f 100644 --- a/ui/compositor/test/test_suite.cc +++ b/ui/compositor/test/test_suite.cc
@@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "ui/compositor/compositor.h" #include "ui/compositor/compositor_switches.h" #include "ui/compositor/layer.h"
diff --git a/ui/compositor/test/test_suite.h b/ui/compositor/test/test_suite.h index 5cbefe7..9afb958a 100644 --- a/ui/compositor/test/test_suite.h +++ b/ui/compositor/test/test_suite.h
@@ -5,8 +5,8 @@ #ifndef UI_COMPOSITOR_TEST_TEST_SUITE_H_ #define UI_COMPOSITOR_TEST_TEST_SUITE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/test/test_suite.h"
diff --git a/ui/compositor/transform_animation_curve_adapter.h b/ui/compositor/transform_animation_curve_adapter.h index 5713bad..05b5644 100644 --- a/ui/compositor/transform_animation_curve_adapter.h +++ b/ui/compositor/transform_animation_curve_adapter.h
@@ -5,6 +5,7 @@ #ifndef UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_ #define UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_ +#include "base/macros.h" #include "base/time/time.h" #include "cc/animation/animation_curve.h" #include "ui/compositor/compositor_export.h"
diff --git a/ui/content_accelerators/accelerator_util.cc b/ui/content_accelerators/accelerator_util.cc index 9930cb6..1a3ee956 100644 --- a/ui/content_accelerators/accelerator_util.cc +++ b/ui/content_accelerators/accelerator_util.cc
@@ -4,6 +4,7 @@ #include "ui/content_accelerators/accelerator_util.h" +#include "build/build_config.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/events/event.h" #include "ui/events/event_constants.h"
diff --git a/ui/content_accelerators/accelerator_util.h b/ui/content_accelerators/accelerator_util.h index 5fcc4c6..a3ed5c66 100644 --- a/ui/content_accelerators/accelerator_util.h +++ b/ui/content_accelerators/accelerator_util.h
@@ -5,7 +5,6 @@ #ifndef UI_CONTENT_ACCELERATORS_ACCELERATOR_UTIL_H_ #define UI_CONTENT_ACCELERATORS_ACCELERATOR_UTIL_H_ -#include "base/basictypes.h" #include "content/public/browser/native_web_keyboard_event.h" #include "ui/base/accelerators/accelerator.h"
diff --git a/ui/display/chromeos/apply_content_protection_task.h b/ui/display/chromeos/apply_content_protection_task.h index 48fa59f..bad2c86 100644 --- a/ui/display/chromeos/apply_content_protection_task.h +++ b/ui/display/chromeos/apply_content_protection_task.h
@@ -5,9 +5,13 @@ #ifndef UI_DISPLAY_CHROMEOS_APPLY_CONTENT_PROTECTION_TASK_H_ #define UI_DISPLAY_CHROMEOS_APPLY_CONTENT_PROTECTION_TASK_H_ +#include <stddef.h> +#include <stdint.h> + #include <map> #include <vector> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ui/display/chromeos/display_configurator.h"
diff --git a/ui/display/chromeos/apply_content_protection_task_unittest.cc b/ui/display/chromeos/apply_content_protection_task_unittest.cc index df279c9..33695d7 100644 --- a/ui/display/chromeos/apply_content_protection_task_unittest.cc +++ b/ui/display/chromeos/apply_content_protection_task_unittest.cc
@@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/display/chromeos/apply_content_protection_task.h" #include "ui/display/chromeos/display_layout_manager.h"
diff --git a/ui/display/chromeos/configure_displays_task.h b/ui/display/chromeos/configure_displays_task.h index 1d89915..6a734c61 100644 --- a/ui/display/chromeos/configure_displays_task.h +++ b/ui/display/chromeos/configure_displays_task.h
@@ -5,10 +5,13 @@ #ifndef UI_DISPLAY_CHROMEOS_CONFIGURATION_TASK_H_ #define UI_DISPLAY_CHROMEOS_CONFIGURATION_TASK_H_ +#include <stddef.h> + #include <queue> #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ui/display/display_export.h" #include "ui/gfx/geometry/point.h"
diff --git a/ui/display/chromeos/configure_displays_task_unittest.cc b/ui/display/chromeos/configure_displays_task_unittest.cc index 49e41fd..271224f 100644 --- a/ui/display/chromeos/configure_displays_task_unittest.cc +++ b/ui/display/chromeos/configure_displays_task_unittest.cc
@@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/display/chromeos/display_configurator.cc b/ui/display/chromeos/display_configurator.cc index dc2db593..9dca32e6 100644 --- a/ui/display/chromeos/display_configurator.cc +++ b/ui/display/chromeos/display_configurator.cc
@@ -4,9 +4,12 @@ #include "ui/display/chromeos/display_configurator.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/sys_info.h" #include "base/time/time.h" #include "ui/display/chromeos/apply_content_protection_task.h"
diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/chromeos/display_configurator.h index 6fc1773..2301479 100644 --- a/ui/display/chromeos/display_configurator.h +++ b/ui/display/chromeos/display_configurator.h
@@ -13,6 +13,7 @@ #include <vector> #include "base/event_types.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h"
diff --git a/ui/display/chromeos/display_configurator_unittest.cc b/ui/display/chromeos/display_configurator_unittest.cc index 9ede75770..4cf8fadf 100644 --- a/ui/display/chromeos/display_configurator_unittest.cc +++ b/ui/display/chromeos/display_configurator_unittest.cc
@@ -4,6 +4,10 @@ #include "ui/display/chromeos/display_configurator.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/display/chromeos/display_snapshot_virtual.h b/ui/display/chromeos/display_snapshot_virtual.h index 8ecd51e..4be55ab 100644 --- a/ui/display/chromeos/display_snapshot_virtual.h +++ b/ui/display/chromeos/display_snapshot_virtual.h
@@ -7,6 +7,8 @@ #include "ui/display/types/display_snapshot.h" +#include <stdint.h> + #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/display/types/display_mode.h"
diff --git a/ui/display/chromeos/display_util.cc b/ui/display/chromeos/display_util.cc index 93bfee0..359165f 100644 --- a/ui/display/chromeos/display_util.cc +++ b/ui/display/chromeos/display_util.cc
@@ -4,6 +4,8 @@ #include "ui/display/chromeos/display_util.h" +#include <stddef.h> + #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/ui/display/chromeos/query_content_protection_task.h b/ui/display/chromeos/query_content_protection_task.h index 863b286..525d8579 100644 --- a/ui/display/chromeos/query_content_protection_task.h +++ b/ui/display/chromeos/query_content_protection_task.h
@@ -5,7 +5,11 @@ #ifndef UI_DISPLAY_CHROMEOS_QUERY_CONTENT_PROTECTION_TASK_H_ #define UI_DISPLAY_CHROMEOS_QUERY_CONTENT_PROTECTION_TASK_H_ +#include <stddef.h> +#include <stdint.h> + #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ui/display/display_export.h" #include "ui/display/types/display_constants.h"
diff --git a/ui/display/chromeos/query_content_protection_task_unittest.cc b/ui/display/chromeos/query_content_protection_task_unittest.cc index 2cd2cb2..890e04e4 100644 --- a/ui/display/chromeos/query_content_protection_task_unittest.cc +++ b/ui/display/chromeos/query_content_protection_task_unittest.cc
@@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/display/chromeos/display_layout_manager.h" #include "ui/display/chromeos/query_content_protection_task.h"
diff --git a/ui/display/chromeos/test/action_logger_util.cc b/ui/display/chromeos/test/action_logger_util.cc index bbdad78..1e3e938 100644 --- a/ui/display/chromeos/test/action_logger_util.cc +++ b/ui/display/chromeos/test/action_logger_util.cc
@@ -4,6 +4,8 @@ #include "ui/display/chromeos/test/action_logger_util.h" +#include <stddef.h> + #include "base/format_macros.h" #include "base/logging.h" #include "base/strings/stringprintf.h"
diff --git a/ui/display/chromeos/test/action_logger_util.h b/ui/display/chromeos/test/action_logger_util.h index 35609de5..2a90809 100644 --- a/ui/display/chromeos/test/action_logger_util.h +++ b/ui/display/chromeos/test/action_logger_util.h
@@ -5,6 +5,8 @@ #ifndef UI_DISPLAY_CHROMEOS_TEST_ACTION_LOGGER_UTIL_H_ #define UI_DISPLAY_CHROMEOS_TEST_ACTION_LOGGER_UTIL_H_ +#include <stdint.h> + #include <string> #include <vector>
diff --git a/ui/display/chromeos/test/test_display_layout_manager.h b/ui/display/chromeos/test/test_display_layout_manager.h index c46f850..44b97f7 100644 --- a/ui/display/chromeos/test/test_display_layout_manager.h +++ b/ui/display/chromeos/test/test_display_layout_manager.h
@@ -5,6 +5,7 @@ #ifndef UI_DISPLAY_CHROMEOS_TEST_TEST_DISPLAY_LAYOUT_MANAGER_H_ #define UI_DISPLAY_CHROMEOS_TEST_TEST_DISPLAY_LAYOUT_MANAGER_H_ +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "ui/display/chromeos/display_configurator.h" #include "ui/display/chromeos/display_layout_manager.h"
diff --git a/ui/display/chromeos/test/test_display_snapshot.h b/ui/display/chromeos/test/test_display_snapshot.h index 77bdc84..81b09a3 100644 --- a/ui/display/chromeos/test/test_display_snapshot.h +++ b/ui/display/chromeos/test/test_display_snapshot.h
@@ -5,6 +5,9 @@ #ifndef UI_DISPLAY_CHROMEOS_TEST_TEST_DISPLAY_SNAPSHOT_H_ #define UI_DISPLAY_CHROMEOS_TEST_TEST_DISPLAY_SNAPSHOT_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ui/display/display_export.h" #include "ui/display/types/display_snapshot.h"
diff --git a/ui/display/chromeos/test/test_native_display_delegate.h b/ui/display/chromeos/test/test_native_display_delegate.h index 47a52f7..4cb983d 100644 --- a/ui/display/chromeos/test/test_native_display_delegate.h +++ b/ui/display/chromeos/test/test_native_display_delegate.h
@@ -5,6 +5,8 @@ #ifndef UI_DISPLAY_CHROMEOS_TEST_TEST_NATIVE_DISPLAY_DELEGATE_H_ #define UI_DISPLAY_CHROMEOS_TEST_TEST_NATIVE_DISPLAY_DELEGATE_H_ +#include <stdint.h> + #include <vector> #include "base/macros.h"
diff --git a/ui/display/chromeos/update_display_configuration_task.h b/ui/display/chromeos/update_display_configuration_task.h index c3c9ba2..0f2550e 100644 --- a/ui/display/chromeos/update_display_configuration_task.h +++ b/ui/display/chromeos/update_display_configuration_task.h
@@ -5,8 +5,11 @@ #ifndef UI_DISPLAY_CHROMEOS_UPDATE_DISPLAY_CONFIGURATION_TASK_H_ #define UI_DISPLAY_CHROMEOS_UPDATE_DISPLAY_CONFIGURATION_TASK_H_ +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ui/display/chromeos/configure_displays_task.h" #include "ui/display/chromeos/display_configurator.h"
diff --git a/ui/display/chromeos/update_display_configuration_task_unittest.cc b/ui/display/chromeos/update_display_configuration_task_unittest.cc index 0abb9f12..59534fa 100644 --- a/ui/display/chromeos/update_display_configuration_task_unittest.cc +++ b/ui/display/chromeos/update_display_configuration_task_unittest.cc
@@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/display/chromeos/x11/display_mode_x11.h b/ui/display/chromeos/x11/display_mode_x11.h index d3e204b..7f833101 100644 --- a/ui/display/chromeos/x11/display_mode_x11.h +++ b/ui/display/chromeos/x11/display_mode_x11.h
@@ -5,6 +5,7 @@ #ifndef UI_DISPLAY_CHROMEOS_X11_DISPLAY_MODE_X11_H_ #define UI_DISPLAY_CHROMEOS_X11_DISPLAY_MODE_X11_H_ +#include "base/macros.h" #include "ui/display/display_export.h" #include "ui/display/types/display_mode.h"
diff --git a/ui/display/chromeos/x11/display_snapshot_x11.h b/ui/display/chromeos/x11/display_snapshot_x11.h index 95d75e8..cbff8e50 100644 --- a/ui/display/chromeos/x11/display_snapshot_x11.h +++ b/ui/display/chromeos/x11/display_snapshot_x11.h
@@ -5,6 +5,9 @@ #ifndef UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ #define UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ui/display/display_export.h" #include "ui/display/types/display_snapshot.h"
diff --git a/ui/display/chromeos/x11/native_display_delegate_x11.cc b/ui/display/chromeos/x11/native_display_delegate_x11.cc index e235453..35f3819 100644 --- a/ui/display/chromeos/x11/native_display_delegate_x11.cc +++ b/ui/display/chromeos/x11/native_display_delegate_x11.cc
@@ -13,6 +13,7 @@ #include <utility> #include "base/logging.h" +#include "base/macros.h" #include "base/stl_util.h" #include "ui/display/chromeos/x11/display_mode_x11.h" #include "ui/display/chromeos/x11/display_snapshot_x11.h"
diff --git a/ui/display/chromeos/x11/native_display_delegate_x11.h b/ui/display/chromeos/x11/native_display_delegate_x11.h index fadcf56..1e6d0044 100644 --- a/ui/display/chromeos/x11/native_display_delegate_x11.h +++ b/ui/display/chromeos/x11/native_display_delegate_x11.h
@@ -13,6 +13,7 @@ #include "base/compiler_specific.h" #include "base/event_types.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/observer_list.h"
diff --git a/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h b/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h index b137b70..1a1c650 100644 --- a/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h +++ b/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h
@@ -5,6 +5,9 @@ #ifndef UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_ #define UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/time/tick_clock.h" #include "base/time/time.h" #include "ui/display/chromeos/x11/native_display_delegate_x11.h"
diff --git a/ui/display/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc b/ui/display/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc index 750f0e09..c371858 100644 --- a/ui/display/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc +++ b/ui/display/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc
@@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> #include <X11/extensions/Xrandr.h> #undef Bool #undef None +#include "base/macros.h" #include "base/test/simple_test_tick_clock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/display/chromeos/x11/display_mode_x11.h"
diff --git a/ui/display/display_switches.cc b/ui/display/display_switches.cc index 7d32b5b..296e8c7 100644 --- a/ui/display/display_switches.cc +++ b/ui/display/display_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 "ui/display/display_switches.h" namespace ui {
diff --git a/ui/display/display_switches.h b/ui/display/display_switches.h index 362853b7..addfb71 100644 --- a/ui/display/display_switches.h +++ b/ui/display/display_switches.h
@@ -6,6 +6,7 @@ #define UI_DISPLAY_DISPLAY_SWITCHES_H_ #include "base/compiler_specific.h" +#include "build/build_config.h" #include "ui/display/display_export.h" namespace ui {
diff --git a/ui/display/types/display_snapshot.h b/ui/display/types/display_snapshot.h index c59ecde..84cd105 100644 --- a/ui/display/types/display_snapshot.h +++ b/ui/display/types/display_snapshot.h
@@ -5,8 +5,11 @@ #ifndef UI_DISPLAY_TYPES_DISPLAY_SNAPSHOT_H_ #define UI_DISPLAY_TYPES_DISPLAY_SNAPSHOT_H_ +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "ui/display/types/display_constants.h" #include "ui/display/types/display_mode.h" #include "ui/gfx/geometry/point.h"
diff --git a/ui/display/util/display_util.cc b/ui/display/util/display_util.cc index 26d7865a..676c898 100644 --- a/ui/display/util/display_util.cc +++ b/ui/display/util/display_util.cc
@@ -4,7 +4,10 @@ #include "ui/display/util/display_util.h" +#include <stddef.h> + #include "base/logging.h" +#include "base/macros.h" namespace ui {
diff --git a/ui/display/util/display_util.h b/ui/display/util/display_util.h index 1eb4750c..c2978541 100644 --- a/ui/display/util/display_util.h +++ b/ui/display/util/display_util.h
@@ -5,6 +5,8 @@ #ifndef UI_DISPLAY_UTIL_DISPLAY_UTIL_H_ #define UI_DISPLAY_UTIL_DISPLAY_UTIL_H_ +#include <stdint.h> + #include "ui/display/util/display_util_export.h" #include "ui/gfx/geometry/size.h"
diff --git a/ui/display/util/edid_parser.cc b/ui/display/util/edid_parser.cc index 37031c86..5bc2e62 100644 --- a/ui/display/util/edid_parser.cc +++ b/ui/display/util/edid_parser.cc
@@ -4,6 +4,8 @@ #include "ui/display/util/edid_parser.h" +#include <stddef.h> + #include <algorithm> #include "base/hash.h"
diff --git a/ui/display/util/edid_parser_unittest.cc b/ui/display/util/edid_parser_unittest.cc index fb468539..2d0ad7f 100644 --- a/ui/display/util/edid_parser_unittest.cc +++ b/ui/display/util/edid_parser_unittest.cc
@@ -4,6 +4,9 @@ #include "ui/display/util/edid_parser.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/geometry/size.h"
diff --git a/ui/file_manager/file_manager_resource_util.h b/ui/file_manager/file_manager_resource_util.h index 826eb99..2b3b32f1 100644 --- a/ui/file_manager/file_manager_resource_util.h +++ b/ui/file_manager/file_manager_resource_util.h
@@ -5,7 +5,7 @@ #ifndef UI_FILE_MANAGER_FILE_MANAGER_RESOURCE_UTIL_H_ #define UI_FILE_MANAGER_FILE_MANAGER_RESOURCE_UTIL_H_ -#include <cstddef> +#include <stddef.h> #include "ui/file_manager/file_manager_export.h"
diff --git a/ui/gl/gl_bindings.h b/ui/gl/gl_bindings.h index b570d00..a43c1d3 100644 --- a/ui/gl/gl_bindings.h +++ b/ui/gl/gl_bindings.h
@@ -5,10 +5,6 @@ #ifndef UI_GL_GL_BINDINGS_H_ #define UI_GL_GL_BINDINGS_H_ -#include <stdint.h> - -#include <string> - // Includes the platform independent and platform dependent GL headers. // Only include this in cc files. It pulls in system headers, including // the X11 headers on linux, which define all kinds of macros that are @@ -18,6 +14,9 @@ #include <GL/glext.h> #include <EGL/egl.h> #include <EGL/eglext.h> +#include <stdint.h> + +#include <string> #include "base/logging.h" #include "base/threading/thread_local.h"
diff --git a/ui/keyboard/content/keyboard_content_util.cc b/ui/keyboard/content/keyboard_content_util.cc index 12d9970a1..fe3211a 100644 --- a/ui/keyboard/content/keyboard_content_util.cc +++ b/ui/keyboard/content/keyboard_content_util.cc
@@ -5,6 +5,7 @@ #include "ui/keyboard/content/keyboard_content_util.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "grit/keyboard_resources.h" #include "grit/keyboard_resources_map.h" #include "url/gurl.h"
diff --git a/ui/keyboard/content/keyboard_content_util.h b/ui/keyboard/content/keyboard_content_util.h index 65314be0..e96cdfe 100644 --- a/ui/keyboard/content/keyboard_content_util.h +++ b/ui/keyboard/content/keyboard_content_util.h
@@ -5,6 +5,8 @@ #ifndef UI_KEYBOARD_CONTENT_KEYBOARD_COTNENT_UTIL_H_ #define UI_KEYBOARD_CONTENT_KEYBOARD_COTNENT_UTIL_H_ +#include <stddef.h> + #include "base/strings/string16.h" #include "ui/keyboard/keyboard_export.h"
diff --git a/ui/keyboard/content/keyboard_ui_content.cc b/ui/keyboard/content/keyboard_ui_content.cc index 5a31729..967548b7 100644 --- a/ui/keyboard/content/keyboard_ui_content.cc +++ b/ui/keyboard/content/keyboard_ui_content.cc
@@ -5,6 +5,7 @@ #include "ui/keyboard/content/keyboard_ui_content.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/values.h" #include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host_iterator.h"
diff --git a/ui/keyboard/content/keyboard_ui_content.h b/ui/keyboard/content/keyboard_ui_content.h index af45c12..909c8bc 100644 --- a/ui/keyboard/content/keyboard_ui_content.h +++ b/ui/keyboard/content/keyboard_ui_content.h
@@ -5,6 +5,7 @@ #ifndef UI_KEYBOARD_CONTENT_KEYBOARD_UI_CONTENT_H_ #define UI_KEYBOARD_CONTENT_KEYBOARD_UI_CONTENT_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/common/media_stream_request.h" #include "ui/aura/window_observer.h"
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc index a50f7c7..9eeb347 100644 --- a/ui/keyboard/keyboard_controller.cc +++ b/ui/keyboard/keyboard_controller.cc
@@ -8,6 +8,8 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" +#include "build/build_config.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/aura/window_observer.h"
diff --git a/ui/keyboard/keyboard_controller.h b/ui/keyboard/keyboard_controller.h index 5211d0de..ecd991d2 100644 --- a/ui/keyboard/keyboard_controller.h +++ b/ui/keyboard/keyboard_controller.h
@@ -5,8 +5,8 @@ #ifndef UI_KEYBOARD_KEYBOARD_CONTROLLER_H_ #define UI_KEYBOARD_KEYBOARD_CONTROLLER_H_ -#include "base/basictypes.h" #include "base/event_types.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "ui/aura/window_observer.h"
diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc index a999b207..ac9c7440 100644 --- a/ui/keyboard/keyboard_controller_unittest.cc +++ b/ui/keyboard/keyboard_controller_unittest.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/keyboard/keyboard_layout_manager.h b/ui/keyboard/keyboard_layout_manager.h index 1500d51d..aa036a3 100644 --- a/ui/keyboard/keyboard_layout_manager.h +++ b/ui/keyboard/keyboard_layout_manager.h
@@ -5,6 +5,7 @@ #ifndef UI_KEYBOARD_KEYBOARD_LAYOUT_MANAGER_H_ #define UI_KEYBOARD_KEYBOARD_LAYOUT_MANAGER_H_ +#include "base/macros.h" #include "ui/aura/layout_manager.h" #include "ui/aura/window.h"
diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc index 3d1f6f1..23404bc 100644 --- a/ui/keyboard/keyboard_util.cc +++ b/ui/keyboard/keyboard_util.cc
@@ -6,7 +6,6 @@ #include <string> -#include "base/basictypes.h" #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/logging.h"
diff --git a/ui/keyboard/keyboard_util_unittest.cc b/ui/keyboard/keyboard_util_unittest.cc index aadd3d7d..effe4043 100644 --- a/ui/keyboard/keyboard_util_unittest.cc +++ b/ui/keyboard/keyboard_util_unittest.cc
@@ -4,6 +4,7 @@ #include "ui/keyboard/keyboard_util.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" namespace keyboard {
diff --git a/ui/keyboard/test/run_all_unittests.cc b/ui/keyboard/test/run_all_unittests.cc index 5f8eb9a..201b438e 100644 --- a/ui/keyboard/test/run_all_unittests.cc +++ b/ui/keyboard/test/run_all_unittests.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/bind.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h"
diff --git a/ui/message_center/views/message_center_view.h b/ui/message_center/views/message_center_view.h index 2a99bea..af91c4a 100644 --- a/ui/message_center/views/message_center_view.h +++ b/ui/message_center/views/message_center_view.h
@@ -5,7 +5,6 @@ #ifndef UI_MESSAGE_CENTER_VIEWS_MESSAGE_CENTER_VIEW_H_ #define UI_MESSAGE_CENTER_VIEWS_MESSAGE_CENTER_VIEW_H_ - #include <stddef.h> #include "base/macros.h"
diff --git a/ui/metro_viewer/ime_types.h b/ui/metro_viewer/ime_types.h index 0fb701d..d37b40bae 100644 --- a/ui/metro_viewer/ime_types.h +++ b/ui/metro_viewer/ime_types.h
@@ -5,9 +5,10 @@ #ifndef UI_METRO_VIEWER_IME_TYPES_H_ #define UI_METRO_VIEWER_IME_TYPES_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/strings/string16.h" namespace metro_viewer { @@ -17,8 +18,8 @@ // on ui.gyp from metro_driver.gyp. struct UnderlineInfo { UnderlineInfo(); - int32 start_offset; - int32 end_offset; + int32_t start_offset; + int32_t end_offset; bool thick; }; @@ -29,8 +30,8 @@ Composition(); ~Composition(); base::string16 text; - int32 selection_start; - int32 selection_end; + int32_t selection_start; + int32_t selection_end; std::vector<UnderlineInfo> underlines; }; @@ -38,10 +39,10 @@ // here to avoid dependency on gfx.gyp from metro_driver.gyp. struct CharacterBounds { CharacterBounds(); - int32 left; - int32 top; - int32 right; - int32 bottom; + int32_t left; + int32_t top; + int32_t right; + int32_t bottom; }; } // namespace metro_viewer
diff --git a/ui/metro_viewer/metro_viewer_messages.h b/ui/metro_viewer/metro_viewer_messages.h index 068909f26..8dfab4d 100644 --- a/ui/metro_viewer/metro_viewer_messages.h +++ b/ui/metro_viewer/metro_viewer_messages.h
@@ -4,9 +4,10 @@ // Multiply-included message file, no include guard. +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "ipc/ipc_message_macros.h" #include "ui/events/event_constants.h" #include "ui/gfx/native_widget_types.h" @@ -20,11 +21,11 @@ // Contains the parameters sent for a mousebutton message. IPC_STRUCT_BEGIN(MetroViewerHostMsg_MouseButtonParams) - IPC_STRUCT_MEMBER(int32, x) - IPC_STRUCT_MEMBER(int32, y) - IPC_STRUCT_MEMBER(int32, extra) + IPC_STRUCT_MEMBER(int32_t, x) + IPC_STRUCT_MEMBER(int32_t, y) + IPC_STRUCT_MEMBER(int32_t, extra) IPC_STRUCT_MEMBER(ui::EventType, event_type) - IPC_STRUCT_MEMBER(uint32, flags) + IPC_STRUCT_MEMBER(uint32_t, flags) IPC_STRUCT_MEMBER(ui::EventFlags, changed_button) IPC_STRUCT_MEMBER(bool, is_horizontal_wheel) @@ -38,29 +39,29 @@ float /* device scale */) // Informs the browser that the mouse moved. IPC_MESSAGE_CONTROL3(MetroViewerHostMsg_MouseMoved, - int32, /* x-coordinate */ - int32, /* y-coordinate */ - int32 /* flags */) + int32_t, /* x-coordinate */ + int32_t, /* y-coordinate */ + int32_t /* flags */) // Informs the brower that a mouse button was pressed. IPC_MESSAGE_CONTROL1(MetroViewerHostMsg_MouseButton, MetroViewerHostMsg_MouseButtonParams) // Informs the browser that a key was pressed. IPC_MESSAGE_CONTROL4(MetroViewerHostMsg_KeyDown, - uint32, /* virtual key */ - uint32, /* repeat count */ - uint32, /* scan code */ - uint32 /* key state */) + uint32_t, /* virtual key */ + uint32_t, /* repeat count */ + uint32_t, /* scan code */ + uint32_t /* key state */) // Informs the browser that a key was released. IPC_MESSAGE_CONTROL4(MetroViewerHostMsg_KeyUp, - uint32, /* virtual key */ - uint32, /* repeat count */ - uint32, /* scan code */ - uint32 /* key state */) + uint32_t, /* virtual key */ + uint32_t, /* repeat count */ + uint32_t, /* scan code */ + uint32_t /* key state */) IPC_MESSAGE_CONTROL4(MetroViewerHostMsg_Character, - uint32, /* virtual key */ - uint32, /* repeat count */ - uint32, /* scan code */ - uint32 /* key state */) + uint32_t, /* virtual key */ + uint32_t, /* repeat count */ + uint32_t, /* scan code */ + uint32_t /* key state */) // Informs the browser that the Metro window has been activated. IPC_MESSAGE_CONTROL1(MetroViewerHostMsg_WindowActivated, bool /* Whether the window should be repainted */) @@ -69,20 +70,20 @@ IPC_MESSAGE_CONTROL0(MetroViewerHostMsg_EdgeGesture) IPC_MESSAGE_CONTROL4(MetroViewerHostMsg_TouchDown, - int32, /* x-coordinate */ - int32, /* y-coordinate */ - uint64, /* timestamp */ - uint32) /* pointer_id */ + int32_t, /* x-coordinate */ + int32_t, /* y-coordinate */ + uint64_t, /* timestamp */ + uint32_t) /* pointer_id */ IPC_MESSAGE_CONTROL4(MetroViewerHostMsg_TouchUp, - int32, /* x-coordinate */ - int32, /* y-coordinate */ - uint64, /* timestamp */ - uint32) /* pointer_id */ + int32_t, /* x-coordinate */ + int32_t, /* y-coordinate */ + uint64_t, /* timestamp */ + uint32_t) /* pointer_id */ IPC_MESSAGE_CONTROL4(MetroViewerHostMsg_TouchMoved, - int32, /* x-coordinate */ - int32, /* y-coordinate */ - uint64, /* timestamp */ - uint32) /* pointer_id */ + int32_t, /* x-coordinate */ + int32_t, /* y-coordinate */ + uint64_t, /* timestamp */ + uint32_t) /* pointer_id */ // Informs the browser of the result of a file save as operation. IPC_MESSAGE_CONTROL3(MetroViewerHostMsg_FileSaveAsDone, @@ -120,8 +121,7 @@ base::string16 /* url */) // Requests the viewer to change the pointer to a new cursor. -IPC_MESSAGE_CONTROL1(MetroViewerHostMsg_SetCursor, - int64 /* cursor */) +IPC_MESSAGE_CONTROL1(MetroViewerHostMsg_SetCursor, int64_t /* cursor */) // This structure contains the parameters sent to the viewer process to display // the file save dialog. @@ -137,7 +137,7 @@ IPC_STRUCT_MEMBER(base::string16, filter) // The filter index. - IPC_STRUCT_MEMBER(uint32, filter_index) + IPC_STRUCT_MEMBER(uint32_t, filter_index) // The default extension. IPC_STRUCT_MEMBER(base::string16, default_extension) @@ -177,8 +177,8 @@ // Sent from the metro viewer process to the browser process to indicate that // the viewer window size has changed. IPC_MESSAGE_CONTROL2(MetroViewerHostMsg_WindowSizeChanged, - uint32, /* width */ - uint32) /* height */ + uint32_t, /* width */ + uint32_t) /* height */ IPC_STRUCT_TRAITS_BEGIN(metro_viewer::UnderlineInfo) IPC_STRUCT_TRAITS_MEMBER(start_offset) @@ -188,12 +188,11 @@ // Sent from the metro viewer process to the browser process to update the // composition string. -IPC_MESSAGE_CONTROL4( - MetroViewerHostMsg_ImeCompositionChanged, - base::string16, /* text */ - int32, /* selection_start */ - int32, /* selection_end */ - std::vector<metro_viewer::UnderlineInfo>) /* underlines */ +IPC_MESSAGE_CONTROL4(MetroViewerHostMsg_ImeCompositionChanged, + base::string16, /* text */ + int32_t, /* selection_start */ + int32_t, /* selection_end */ + std::vector<metro_viewer::UnderlineInfo>) /* underlines */ // Sent from the metro viewer process to the browser process to update the // status of popup window that is managed by an IME. @@ -208,8 +207,8 @@ // Sent from the metro viewer process to the browser process to notify that the // active text input source is changed. IPC_MESSAGE_CONTROL2(MetroViewerHostMsg_ImeInputSourceChanged, - uint16, /* Win32 LangID */ - bool) /* is IME or not */ + uint16_t, /* Win32 LangID */ + bool) /* is IME or not */ // Requests the viewer to cancel the on-going composition. IPC_MESSAGE_CONTROL0(MetroViewerHostMsg_ImeCancelComposition) @@ -225,5 +224,5 @@ // InputScopes and character bounds. IPC_MESSAGE_CONTROL2( MetroViewerHostMsg_ImeTextInputClientUpdated, - std::vector<int32>, /* InputScope enums */ - std::vector<metro_viewer::CharacterBounds>) /* character bounds */ + std::vector<int32_t>, /* InputScope enums */ + std::vector<metro_viewer::CharacterBounds>) /* character bounds */
diff --git a/ui/mojo/init/screen_mojo.h b/ui/mojo/init/screen_mojo.h index 3a3df06..b846e68 100644 --- a/ui/mojo/init/screen_mojo.h +++ b/ui/mojo/init/screen_mojo.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h"
diff --git a/ui/mojo/init/ui_init.cc b/ui/mojo/init/ui_init.cc index d4e8f275..7be35c7 100644 --- a/ui/mojo/init/ui_init.cc +++ b/ui/mojo/init/ui_init.cc
@@ -4,7 +4,9 @@ #include "ui/mojo/init/ui_init.h" +#include "base/macros.h" #include "base/memory/singleton.h" +#include "build/build_config.h" #include "ui/mojo/init/screen_mojo.h" #if defined(OS_ANDROID)
diff --git a/ui/mojo/init/ui_init.h b/ui/mojo/init/ui_init.h index 48ca7db..9956b17 100644 --- a/ui/mojo/init/ui_init.h +++ b/ui/mojo/init/ui_init.h
@@ -7,9 +7,10 @@ #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" namespace gfx { class Display;
diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h index 2f25e73..931a76f 100644 --- a/ui/native_theme/native_theme.h +++ b/ui/native_theme/native_theme.h
@@ -5,7 +5,9 @@ #ifndef UI_NATIVE_THEME_NATIVE_THEME_H_ #define UI_NATIVE_THEME_NATIVE_THEME_H_ +#include "base/macros.h" #include "base/observer_list.h" +#include "build/build_config.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/native_widget_types.h" #include "ui/native_theme/native_theme_export.h"
diff --git a/ui/native_theme/native_theme_android.cc b/ui/native_theme/native_theme_android.cc index f3963fd..7f799d9a 100644 --- a/ui/native_theme/native_theme_android.cc +++ b/ui/native_theme/native_theme_android.cc
@@ -4,7 +4,6 @@ #include "ui/native_theme/native_theme_android.h" -#include "base/basictypes.h" #include "base/logging.h" #include "ui/gfx/geometry/size.h"
diff --git a/ui/native_theme/native_theme_android.h b/ui/native_theme/native_theme_android.h index a839702..e504252 100644 --- a/ui/native_theme/native_theme_android.h +++ b/ui/native_theme/native_theme_android.h
@@ -5,6 +5,7 @@ #ifndef UI_NATIVE_THEME_NATIVE_THEME_ANDROID_H_ #define UI_NATIVE_THEME_NATIVE_THEME_ANDROID_H_ +#include "base/macros.h" #include "ui/native_theme/native_theme_base.h" namespace ui {
diff --git a/ui/native_theme/native_theme_aura.cc b/ui/native_theme/native_theme_aura.cc index 19f066f..c9385179 100644 --- a/ui/native_theme/native_theme_aura.cc +++ b/ui/native_theme/native_theme_aura.cc
@@ -8,6 +8,7 @@ #include <utility> #include "base/logging.h" +#include "build/build_config.h" #include "ui/base/layout.h" #include "ui/base/nine_image_painter_factory.h" #include "ui/base/resource/material_design/material_design_controller.h" @@ -45,18 +46,18 @@ IMAGE_GRID(IDR_SCROLLBAR_ARROW_BUTTON_BASE_PRESSED) }; -const uint8 kScrollbarOverlayThumbFillAlphas[NativeTheme::kNumStates] = { - 0, // Does not matter, will not paint for disabled state. - 178, // Hover state, opacity 70%, alpha would be 0.7 * 255. - 140, // Normal state, opacity 55%, alpha would be 0.55 * 255. - 178 // Pressed state, opacity 70%, alpha would be 0.7 * 255. +const uint8_t kScrollbarOverlayThumbFillAlphas[NativeTheme::kNumStates] = { + 0, // Does not matter, will not paint for disabled state. + 178, // Hover state, opacity 70%, alpha would be 0.7 * 255. + 140, // Normal state, opacity 55%, alpha would be 0.55 * 255. + 178 // Pressed state, opacity 70%, alpha would be 0.7 * 255. }; -const uint8 kScrollbarOverlayThumbStrokeAlphas[NativeTheme::kNumStates] = { - 0, // Does not matter, will not paint for disabled state. - 51, // Hover state, opacity 20%, alpha would be 0.2 * 255. - 38, // Normal state, opacity 15%, alpha would be 0.15 * 255. - 51 // Pressed state, opacity 20%, alpha would be 0.2 * 255. +const uint8_t kScrollbarOverlayThumbStrokeAlphas[NativeTheme::kNumStates] = { + 0, // Does not matter, will not paint for disabled state. + 51, // Hover state, opacity 20%, alpha would be 0.2 * 255. + 38, // Normal state, opacity 15%, alpha would be 0.15 * 255. + 51 // Pressed state, opacity 20%, alpha would be 0.2 * 255. }; const int kScrollbarOverlayThumbStrokeImages[9] = @@ -275,9 +276,9 @@ scoped_ptr<NativeThemeAura::DualPainter> NativeThemeAura::CreateDualPainter( const int fill_image_ids[9], - const uint8 fill_alphas[kNumStates], + const uint8_t fill_alphas[kNumStates], const int stroke_image_ids[9], - const uint8 stroke_alphas[kNumStates]) const { + const uint8_t stroke_alphas[kNumStates]) const { scoped_ptr<NativeThemeAura::DualPainter> dual_painter( new NativeThemeAura::DualPainter(CreateNineImagePainter(fill_image_ids), fill_alphas, @@ -308,14 +309,14 @@ double progress) const { DCHECK(dual_painter); scoped_ptr<gfx::Canvas> canvas(CommonThemeCreateCanvas(sk_canvas)); - uint8 fill_alpha = dual_painter->fill_alphas[startState] + - (dual_painter->fill_alphas[endState] - - dual_painter->fill_alphas[startState]) * - progress; - uint8 stroke_alpha = dual_painter->stroke_alphas[startState] + - (dual_painter->stroke_alphas[endState] - - dual_painter->stroke_alphas[startState]) * + uint8_t fill_alpha = dual_painter->fill_alphas[startState] + + (dual_painter->fill_alphas[endState] - + dual_painter->fill_alphas[startState]) * progress; + uint8_t stroke_alpha = dual_painter->stroke_alphas[startState] + + (dual_painter->stroke_alphas[endState] - + dual_painter->stroke_alphas[startState]) * + progress; dual_painter->fill_painter->Paint(canvas.get(), rect, fill_alpha); dual_painter->stroke_painter->Paint(canvas.get(), rect, stroke_alpha); @@ -323,9 +324,9 @@ NativeThemeAura::DualPainter::DualPainter( scoped_ptr<NineImagePainter> fill_painter, - const uint8 fill_alphas[kNumStates], + const uint8_t fill_alphas[kNumStates], scoped_ptr<NineImagePainter> stroke_painter, - const uint8 stroke_alphas[kNumStates]) + const uint8_t stroke_alphas[kNumStates]) : fill_painter(std::move(fill_painter)), fill_alphas(fill_alphas), stroke_painter(std::move(stroke_painter)),
diff --git a/ui/native_theme/native_theme_aura.h b/ui/native_theme/native_theme_aura.h index dde0a8a..8482131 100644 --- a/ui/native_theme/native_theme_aura.h +++ b/ui/native_theme/native_theme_aura.h
@@ -5,8 +5,10 @@ #ifndef UI_NATIVE_THEME_NATIVE_THEME_AURA_H_ #define UI_NATIVE_THEME_NATIVE_THEME_AURA_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/native_theme/native_theme_base.h" namespace gfx { @@ -87,23 +89,23 @@ // value associated with each state, so that a DualPainter for overlay // scrollbar thumb would only need state as input to paint correctly. DualPainter(scoped_ptr<gfx::NineImagePainter> fill_painter, - const uint8 fill_alphas[kNumStates], + const uint8_t fill_alphas[kNumStates], scoped_ptr<gfx::NineImagePainter> stroke_painter, - const uint8 stroke_alphas[kNumStates]); + const uint8_t stroke_alphas[kNumStates]); ~DualPainter(); scoped_ptr<gfx::NineImagePainter> fill_painter; - const uint8* const fill_alphas; + const uint8_t* const fill_alphas; scoped_ptr<gfx::NineImagePainter> stroke_painter; - const uint8* const stroke_alphas; + const uint8_t* const stroke_alphas; }; // Returns DualPainter from specific fill and stroke, creating if necessary. scoped_ptr<DualPainter> CreateDualPainter( const int fill_image_ids[9], - const uint8 fill_alphas[kNumStates], + const uint8_t fill_alphas[kNumStates], const int stroke_image_ids[9], - const uint8 stroke_alphas[kNumStates]) const; + const uint8_t stroke_alphas[kNumStates]) const; // Paints |dualPainter| into the canvas using |rect| and specific alpha. void PaintDualPainter(DualPainter* dual_painter,
diff --git a/ui/native_theme/native_theme_aurawin.h b/ui/native_theme/native_theme_aurawin.h index 11bb87d2..1b02b16 100644 --- a/ui/native_theme/native_theme_aurawin.h +++ b/ui/native_theme/native_theme_aurawin.h
@@ -5,8 +5,8 @@ #ifndef UI_NATIVE_THEME_NATIVE_THEME_AURAWIN_H_ #define UI_NATIVE_THEME_NATIVE_THEME_AURAWIN_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/native_theme/native_theme_aura.h" namespace ui {
diff --git a/ui/native_theme/native_theme_base.h b/ui/native_theme/native_theme_base.h index 2eaf04b..f76908b 100644 --- a/ui/native_theme/native_theme_base.h +++ b/ui/native_theme/native_theme_base.h
@@ -5,8 +5,8 @@ #ifndef UI_NATIVE_THEME_NATIVE_THEME_BASE_H_ #define UI_NATIVE_THEME_NATIVE_THEME_BASE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "skia/ext/platform_canvas.h" #include "ui/native_theme/native_theme.h"
diff --git a/ui/native_theme/native_theme_dark_win.h b/ui/native_theme/native_theme_dark_win.h index 73b564b..e88bb66 100644 --- a/ui/native_theme/native_theme_dark_win.h +++ b/ui/native_theme/native_theme_dark_win.h
@@ -5,8 +5,8 @@ #ifndef UI_NATIVE_THEME_NATIVE_THEME_DARK_WIN_H_ #define UI_NATIVE_THEME_NATIVE_THEME_DARK_WIN_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/native_theme/native_theme_win.h" namespace ui {
diff --git a/ui/native_theme/native_theme_mac.h b/ui/native_theme/native_theme_mac.h index b269b130..7970a58 100644 --- a/ui/native_theme/native_theme_mac.h +++ b/ui/native_theme/native_theme_mac.h
@@ -5,6 +5,7 @@ #ifndef UI_NATIVE_THEME_NATIVE_THEME_MAC_H_ #define UI_NATIVE_THEME_NATIVE_THEME_MAC_H_ +#include "base/macros.h" #include "ui/native_theme/native_theme_base.h" #include "ui/native_theme/native_theme_export.h"
diff --git a/ui/native_theme/native_theme_mac.mm b/ui/native_theme/native_theme_mac.mm index edc3029..43eb1296 100644 --- a/ui/native_theme/native_theme_mac.mm +++ b/ui/native_theme/native_theme_mac.mm
@@ -5,11 +5,12 @@ #include "ui/native_theme/native_theme_mac.h" #import <Cocoa/Cocoa.h> +#include <stddef.h> -#include "base/basictypes.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/mac/sdk_forward_declarations.h" +#include "base/macros.h" #import "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc index 3f8fb05..4858f04 100644 --- a/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc
@@ -5,12 +5,13 @@ #include "ui/native_theme/native_theme_win.h" #include <windows.h> +#include <stddef.h> #include <uxtheme.h> #include <vsstyle.h> #include <vssym32.h> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/win/scoped_gdi_object.h" #include "base/win/scoped_hdc.h"
diff --git a/ui/native_theme/native_theme_win.h b/ui/native_theme/native_theme_win.h index f84e329..8a1c3bf2 100644 --- a/ui/native_theme/native_theme_win.h +++ b/ui/native_theme/native_theme_win.h
@@ -16,8 +16,8 @@ #include <windows.h> #include <uxtheme.h> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/geometry/size.h" #include "ui/gfx/sys_color_change_listener.h"
diff --git a/ui/platform_window/stub/stub_window.h b/ui/platform_window/stub/stub_window.h index 48f74b41..13fa2b7 100644 --- a/ui/platform_window/stub/stub_window.h +++ b/ui/platform_window/stub/stub_window.h
@@ -6,6 +6,7 @@ #define UI_PLATFORM_WINDOW_STUB_STUB_WINDOW_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/gfx/geometry/rect.h" #include "ui/platform_window/platform_window.h" #include "ui/platform_window/stub/stub_window_export.h"
diff --git a/ui/platform_window/win/win_window.h b/ui/platform_window/win/win_window.h index cc35c01..41d26dc 100644 --- a/ui/platform_window/win/win_window.h +++ b/ui/platform_window/win/win_window.h
@@ -6,6 +6,7 @@ #define UI_PLATFORM_WINDOW_WIN_WIN_WINDOW_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/gfx/win/window_impl.h" #include "ui/platform_window/platform_window.h" #include "ui/platform_window/win/win_window_export.h"
diff --git a/ui/platform_window/x11/x11_window.h b/ui/platform_window/x11/x11_window.h index 84a4899..54bbed86 100644 --- a/ui/platform_window/x11/x11_window.h +++ b/ui/platform_window/x11/x11_window.h
@@ -5,6 +5,9 @@ #ifndef UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ #define UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ui/events/platform/platform_event_dispatcher.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/x/x11_atom_cache.h"
diff --git a/ui/shell_dialogs/android/shell_dialogs_jni_registrar.cc b/ui/shell_dialogs/android/shell_dialogs_jni_registrar.cc index d62392a..6cdb835 100644 --- a/ui/shell_dialogs/android/shell_dialogs_jni_registrar.cc +++ b/ui/shell_dialogs/android/shell_dialogs_jni_registrar.cc
@@ -6,6 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" +#include "base/macros.h" #include "ui/shell_dialogs/select_file_dialog_android.h" namespace ui {
diff --git a/ui/shell_dialogs/base_shell_dialog_win.h b/ui/shell_dialogs/base_shell_dialog_win.h index b9fa727..ca5ce0bd 100644 --- a/ui/shell_dialogs/base_shell_dialog_win.h +++ b/ui/shell_dialogs/base_shell_dialog_win.h
@@ -8,6 +8,7 @@ #include <shlobj.h> #include <set> +#include "base/macros.h" #include "ui/shell_dialogs/base_shell_dialog.h" #include "ui/shell_dialogs/shell_dialogs_export.h"
diff --git a/ui/shell_dialogs/select_file_dialog.cc b/ui/shell_dialogs/select_file_dialog.cc index d26fc36d..6249ba8 100644 --- a/ui/shell_dialogs/select_file_dialog.cc +++ b/ui/shell_dialogs/select_file_dialog.cc
@@ -4,6 +4,8 @@ #include "ui/shell_dialogs/select_file_dialog.h" +#include <stddef.h> + #include "base/bind.h" #include "base/logging.h" #include "base/message_loop/message_loop.h"
diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h index b5c877b..bd610f59 100644 --- a/ui/shell_dialogs/select_file_dialog.h +++ b/ui/shell_dialogs/select_file_dialog.h
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h"
diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/select_file_dialog_android.h index 269b739..0dba18e 100644 --- a/ui/shell_dialogs/select_file_dialog_android.h +++ b/ui/shell_dialogs/select_file_dialog_android.h
@@ -9,6 +9,7 @@ #include "base/android/scoped_java_ref.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "ui/shell_dialogs/select_file_dialog.h" namespace ui {
diff --git a/ui/shell_dialogs/select_file_dialog_mac.mm b/ui/shell_dialogs/select_file_dialog_mac.mm index 59d3afe..6fe6a62 100644 --- a/ui/shell_dialogs/select_file_dialog_mac.mm +++ b/ui/shell_dialogs/select_file_dialog_mac.mm
@@ -6,6 +6,7 @@ #import <Cocoa/Cocoa.h> #include <CoreServices/CoreServices.h> +#include <stddef.h> #include <map> #include <set> @@ -18,6 +19,7 @@ #include "base/mac/foundation_util.h" #include "base/mac/scoped_cftyperef.h" #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h"
diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc index a90c3bc..40215a34 100644 --- a/ui/shell_dialogs/select_file_dialog_win.cc +++ b/ui/shell_dialogs/select_file_dialog_win.cc
@@ -5,6 +5,7 @@ #include "ui/shell_dialogs/select_file_dialog_win.h" #include <shlobj.h> +#include <stddef.h> #include <algorithm> #include <set> @@ -13,6 +14,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/i18n/case_conversion.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/threading/thread.h" #include "base/tuple.h"
diff --git a/ui/shell_dialogs/select_file_dialog_win_unittest.cc b/ui/shell_dialogs/select_file_dialog_win_unittest.cc index d9f0cd6..a01ebe8 100644 --- a/ui/shell_dialogs/select_file_dialog_win_unittest.cc +++ b/ui/shell_dialogs/select_file_dialog_win_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/shell_dialogs/select_file_dialog.h" #include "ui/shell_dialogs/select_file_dialog_win.h"
diff --git a/ui/snapshot/screenshot_grabber.cc b/ui/snapshot/screenshot_grabber.cc index e502060..7d44930 100644 --- a/ui/snapshot/screenshot_grabber.cc +++ b/ui/snapshot/screenshot_grabber.cc
@@ -4,6 +4,8 @@ #include "ui/snapshot/screenshot_grabber.h" +#include <stddef.h> + #include <climits> #include <string>
diff --git a/ui/snapshot/screenshot_grabber.h b/ui/snapshot/screenshot_grabber.h index 8461ce88..778168c 100644 --- a/ui/snapshot/screenshot_grabber.h +++ b/ui/snapshot/screenshot_grabber.h
@@ -5,10 +5,10 @@ #ifndef UI_SNAPSHOT_SCREENSHOT_GRABBER_H_ #define UI_SNAPSHOT_SCREENSHOT_GRABBER_H_ -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/ui/snapshot/snapshot_async.h b/ui/snapshot/snapshot_async.h index 41da62b..467bdcb 100644 --- a/ui/snapshot/snapshot_async.h +++ b/ui/snapshot/snapshot_async.h
@@ -5,6 +5,7 @@ #ifndef UI_SNAPSHOT_SNAPSHOT_ASYNC_H_ #define UI_SNAPSHOT_SNAPSHOT_ASYNC_H_ +#include "base/macros.h" #include "cc/output/copy_output_result.h" #include "ui/snapshot/snapshot.h"
diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index 2279480..d360625 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc
@@ -4,7 +4,11 @@ #include "ui/snapshot/snapshot.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/test/test_simple_task_runner.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/test/aura_test_helper.h" @@ -62,8 +66,8 @@ size_t GetFailedPixelsCountWithScaleFactor(const gfx::Image& image, int scale_factor) { const SkBitmap* bitmap = image.ToSkBitmap(); - uint32* bitmap_data = reinterpret_cast<uint32*>( - bitmap->pixelRef()->pixels()); + uint32_t* bitmap_data = + reinterpret_cast<uint32_t*>(bitmap->pixelRef()->pixels()); size_t result = 0; for (int y = 0; y < bitmap->height(); y += scale_factor) { for (int x = 0; x < bitmap->width(); x += scale_factor) {
diff --git a/ui/surface/accelerated_surface_mac.cc b/ui/surface/accelerated_surface_mac.cc index 324c471..630ee7b 100644 --- a/ui/surface/accelerated_surface_mac.cc +++ b/ui/surface/accelerated_surface_mac.cc
@@ -116,7 +116,7 @@ static void AddIntegerValue(CFMutableDictionaryRef dictionary, const CFStringRef key, - int32 value) { + int32_t value) { base::ScopedCFTypeRef<CFNumberRef> number( CFNumberCreate(NULL, kCFNumberSInt32Type, &value)); CFDictionaryAddValue(dictionary, key, number.get()); @@ -181,7 +181,7 @@ glClear(GL_COLOR_BUFFER_BIT); } -uint32 AcceleratedSurface::SetSurfaceSize(const gfx::Size& size) { +uint32_t AcceleratedSurface::SetSurfaceSize(const gfx::Size& size) { if (surface_size_ == size) { // Return 0 to indicate to the caller that no new backing store // allocation occurred. @@ -261,6 +261,6 @@ return io_surface_id_; } -uint32 AcceleratedSurface::GetSurfaceId() { +uint32_t AcceleratedSurface::GetSurfaceId() { return io_surface_id_; }
diff --git a/ui/surface/accelerated_surface_mac.h b/ui/surface/accelerated_surface_mac.h index 4684f5f..9defa33 100644 --- a/ui/surface/accelerated_surface_mac.h +++ b/ui/surface/accelerated_surface_mac.h
@@ -7,6 +7,7 @@ #include <CoreFoundation/CoreFoundation.h> #include <IOSurface/IOSurface.h> +#include <stdint.h> #include "base/callback.h" #include "base/mac/scoped_cftyperef.h" @@ -61,10 +62,10 @@ // the height or width changes. Returns a unique id of the IOSurface to // which the surface is bound, or 0 if no changes were made or an error // occurred. MakeCurrent() will have been called on the new surface. - uint32 SetSurfaceSize(const gfx::Size& size); + uint32_t SetSurfaceSize(const gfx::Size& size); // Returns the id of this surface's IOSurface. - uint32 GetSurfaceId(); + uint32_t GetSurfaceId(); // Sets the GL context to be the current one for drawing. Returns true if // it succeeded. @@ -122,7 +123,7 @@ base::ScopedCFTypeRef<IOSurfaceRef> io_surface_; // The id of |io_surface_| or 0 if that's NULL. - uint32 io_surface_id_; + uint32_t io_surface_id_; gfx::Size surface_size_; // It's important to avoid allocating zero-width or zero-height
diff --git a/ui/surface/transport_dib.h b/ui/surface/transport_dib.h index 3016548..a14be68f 100644 --- a/ui/surface/transport_dib.h +++ b/ui/surface/transport_dib.h
@@ -5,8 +5,12 @@ #ifndef UI_SURFACE_TRANSPORT_DIB_H_ #define UI_SURFACE_TRANSPORT_DIB_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/shared_memory.h" +#include "build/build_config.h" #include "ui/surface/surface_export.h" #if defined(OS_WIN) @@ -43,7 +47,7 @@ // The sequence number is used to uniquely identify the transport DIB. It // should be unique for all transport DIBs ever created in the same // renderer. - static TransportDIB* Create(size_t size, uint32 sequence_num); + static TransportDIB* Create(size_t size, uint32_t sequence_num); // Map the referenced transport DIB. The caller owns the returned object. // Returns NULL on failure. @@ -92,7 +96,7 @@ explicit TransportDIB(base::SharedMemoryHandle dib); base::SharedMemory shared_memory_; - uint32 sequence_num_; + uint32_t sequence_num_; size_t size_; // length, in bytes DISALLOW_COPY_AND_ASSIGN(TransportDIB);
diff --git a/ui/surface/transport_dib_posix.cc b/ui/surface/transport_dib_posix.cc index f52fcbc..be1a373 100644 --- a/ui/surface/transport_dib_posix.cc +++ b/ui/surface/transport_dib_posix.cc
@@ -4,12 +4,15 @@ #include "ui/surface/transport_dib.h" +#include <stddef.h> +#include <stdint.h> #include <sys/stat.h> #include <unistd.h> #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" +#include "build/build_config.h" #include "skia/ext/platform_canvas.h" TransportDIB::TransportDIB() @@ -25,7 +28,7 @@ } // static -TransportDIB* TransportDIB::Create(size_t size, uint32 sequence_num) { +TransportDIB* TransportDIB::Create(size_t size, uint32_t sequence_num) { TransportDIB* dib = new TransportDIB; if (!dib->shared_memory_.CreateAndMapAnonymous(size)) { delete dib;
diff --git a/ui/surface/transport_dib_win.cc b/ui/surface/transport_dib_win.cc index 2d5d5d125..82eabf87 100644 --- a/ui/surface/transport_dib_win.cc +++ b/ui/surface/transport_dib_win.cc
@@ -5,6 +5,8 @@ #include "ui/surface/transport_dib.h" #include <windows.h> +#include <stddef.h> +#include <stdint.h> #include <limits> @@ -24,7 +26,7 @@ : shared_memory_(handle, false /* read write */), size_(0) {} // static -TransportDIB* TransportDIB::Create(size_t size, uint32 sequence_num) { +TransportDIB* TransportDIB::Create(size_t size, uint32_t sequence_num) { TransportDIB* dib = new TransportDIB; if (!dib->shared_memory_.CreateAnonymous(size)) {
diff --git a/ui/touch_selection/BUILD.gn b/ui/touch_selection/BUILD.gn index a16675df..4d69e189 100644 --- a/ui/touch_selection/BUILD.gn +++ b/ui/touch_selection/BUILD.gn
@@ -64,6 +64,7 @@ deps = [ ":touch_selection", + "//base:base", ] }
diff --git a/ui/touch_selection/touch_handle.h b/ui/touch_selection/touch_handle.h index 89a266d..37a7c5a9 100644 --- a/ui/touch_selection/touch_handle.h +++ b/ui/touch_selection/touch_handle.h
@@ -6,6 +6,7 @@ #define UI_TOUCH_SELECTION_TOUCH_HANDLE_H_ #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "ui/events/gesture_detection/motion_event.h"
diff --git a/ui/touch_selection/touch_handle_drawable_aura.h b/ui/touch_selection/touch_handle_drawable_aura.h index 48b5d00..48c7b9edf 100644 --- a/ui/touch_selection/touch_handle_drawable_aura.h +++ b/ui/touch_selection/touch_handle_drawable_aura.h
@@ -5,6 +5,7 @@ #ifndef UI_TOUCH_SELECTION_TOUCH_HANDLE_DRAWABLE_AURA_H_ #define UI_TOUCH_SELECTION_TOUCH_HANDLE_DRAWABLE_AURA_H_ +#include "base/macros.h" #include "ui/touch_selection/touch_handle.h" #include "ui/touch_selection/touch_handle_orientation.h" #include "ui/touch_selection/ui_touch_selection_export.h"
diff --git a/ui/touch_selection/touch_selection_controller.h b/ui/touch_selection/touch_selection_controller.h index ae0161b..f4f0bdf 100644 --- a/ui/touch_selection/touch_selection_controller.h +++ b/ui/touch_selection/touch_selection_controller.h
@@ -5,6 +5,7 @@ #ifndef UI_TOUCH_SELECTION_TOUCH_SELECTION_CONTROLLER_H_ #define UI_TOUCH_SELECTION_TOUCH_SELECTION_CONTROLLER_H_ +#include "base/macros.h" #include "base/time/time.h" #include "ui/base/touch/selection_bound.h" #include "ui/gfx/geometry/point_f.h"
diff --git a/ui/touch_selection/touch_selection_controller_test_api.h b/ui/touch_selection/touch_selection_controller_test_api.h index 42527e02..66ce6db 100644 --- a/ui/touch_selection/touch_selection_controller_test_api.h +++ b/ui/touch_selection/touch_selection_controller_test_api.h
@@ -5,6 +5,7 @@ #ifndef UI_TOUCH_SELECTION_TOUCH_SELECTION_CONTROLLER_TEST_API_H_ #define UI_TOUCH_SELECTION_TOUCH_SELECTION_CONTROLLER_TEST_API_H_ +#include "base/macros.h" #include "ui/touch_selection/touch_selection_controller.h" namespace ui {
diff --git a/ui/touch_selection/touch_selection_controller_unittest.cc b/ui/touch_selection/touch_selection_controller_unittest.cc index cabfd04..d1d4062 100644 --- a/ui/touch_selection/touch_selection_controller_unittest.cc +++ b/ui/touch_selection/touch_selection_controller_unittest.cc
@@ -6,6 +6,7 @@ #include <vector> +#include "base/macros.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/test/motion_event_test_utils.h"
diff --git a/ui/touch_selection/ui_touch_selection_export.h b/ui/touch_selection/ui_touch_selection_export.h index e1f80bbc..def9a7d 100644 --- a/ui/touch_selection/ui_touch_selection_export.h +++ b/ui/touch_selection/ui_touch_selection_export.h
@@ -8,6 +8,8 @@ // Defines UI_TOUCH_SELECTION_EXPORT so that functionality implemented by the UI // touch selection module can be exported to consumers. +#include "build/build_config.h" + #if defined(COMPONENT_BUILD) #if defined(WIN32)
diff --git a/ui/views_content_client/views_content_client.cc b/ui/views_content_client/views_content_client.cc index 95af7dc..a1dcb4e 100644 --- a/ui/views_content_client/views_content_client.cc +++ b/ui/views_content_client/views_content_client.cc
@@ -4,6 +4,7 @@ #include "ui/views_content_client/views_content_client.h" +#include "build/build_config.h" #include "content/public/app/content_main.h" #include "ui/views_content_client/views_content_main_delegate.h"
diff --git a/ui/views_content_client/views_content_client.h b/ui/views_content_client/views_content_client.h index b11cf63..11f653a 100644 --- a/ui/views_content_client/views_content_client.h +++ b/ui/views_content_client/views_content_client.h
@@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/macros.h" +#include "build/build_config.h" #include "ui/gfx/native_widget_types.h" #include "ui/views_content_client/views_content_client_export.h"
diff --git a/ui/views_content_client/views_content_client_main_parts_chromeos.cc b/ui/views_content_client/views_content_client_main_parts_chromeos.cc index dc4162b..d139971 100644 --- a/ui/views_content_client/views_content_client_main_parts_chromeos.cc +++ b/ui/views_content_client/views_content_client_main_parts_chromeos.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 "base/macros.h" #include "content/public/browser/context_factory.h" #include "content/shell/browser/shell_browser_context.h" #include "ui/aura/test/test_screen.h"
diff --git a/ui/views_content_client/views_content_client_main_parts_desktop_aura.cc b/ui/views_content_client/views_content_client_main_parts_desktop_aura.cc index 93401e60..1ac04ecb 100644 --- a/ui/views_content_client/views_content_client_main_parts_desktop_aura.cc +++ b/ui/views_content_client/views_content_client_main_parts_desktop_aura.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 "base/macros.h" #include "content/shell/browser/shell_browser_context.h" #include "ui/aura/env.h" #include "ui/gfx/screen.h"
diff --git a/ui/views_content_client/views_content_client_main_parts_mac.mm b/ui/views_content_client/views_content_client_main_parts_mac.mm index 5fc62f3..3def22c 100644 --- a/ui/views_content_client/views_content_client_main_parts_mac.mm +++ b/ui/views_content_client/views_content_client_main_parts_mac.mm
@@ -6,6 +6,7 @@ #include "base/files/file_path.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/path_service.h" #include "content/public/browser/plugin_service.h" #include "content/public/common/content_paths.h"
diff --git a/ui/views_content_client/views_content_main_delegate.cc b/ui/views_content_client/views_content_main_delegate.cc index 11d8a99..b5951633 100644 --- a/ui/views_content_client/views_content_main_delegate.cc +++ b/ui/views_content_client/views_content_main_delegate.cc
@@ -10,6 +10,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" +#include "build/build_config.h" #include "content/public/common/content_switches.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h"
diff --git a/ui/web_dialogs/test/test_web_contents_handler.h b/ui/web_dialogs/test/test_web_contents_handler.h index 50d7592..190c040 100644 --- a/ui/web_dialogs/test/test_web_contents_handler.h +++ b/ui/web_dialogs/test/test_web_contents_handler.h
@@ -5,8 +5,8 @@ #ifndef UI_WEB_DIALOGS_TEST_TEST_WEB_CONTENTS_HANDLER_H_ #define UI_WEB_DIALOGS_TEST_TEST_WEB_CONTENTS_HANDLER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/web_dialogs/web_dialog_web_contents_delegate.h" namespace ui {
diff --git a/ui/web_dialogs/test/test_web_dialog_delegate.h b/ui/web_dialogs/test/test_web_dialog_delegate.h index bcfa424..e00bee71 100644 --- a/ui/web_dialogs/test/test_web_dialog_delegate.h +++ b/ui/web_dialogs/test/test_web_dialog_delegate.h
@@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/gfx/geometry/size.h" #include "ui/web_dialogs/web_dialog_delegate.h" #include "url/gurl.h"
diff --git a/ui/web_dialogs/web_dialog_ui.h b/ui/web_dialogs/web_dialog_ui.h index e210bf8..f075bee 100644 --- a/ui/web_dialogs/web_dialog_ui.h +++ b/ui/web_dialogs/web_dialog_ui.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_ui_controller.h"
diff --git a/ui/web_dialogs/web_dialog_web_contents_delegate.h b/ui/web_dialogs/web_dialog_web_contents_delegate.h index c8d4f10..7f42f7ca 100644 --- a/ui/web_dialogs/web_dialog_web_contents_delegate.h +++ b/ui/web_dialogs/web_dialog_web_contents_delegate.h
@@ -6,6 +6,7 @@ #define UI_WEB_DIALOGS_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/web_contents_delegate.h" #include "ui/web_dialogs/web_dialogs_export.h"