diff options
48 files changed, 122 insertions, 115 deletions
diff --git a/base/allocator/allocator_extension.h b/base/allocator/allocator_extension.h index de3119f..e65822b 100644 --- a/base/allocator/allocator_extension.h +++ b/base/allocator/allocator_extension.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_ALLOCATOR_ALLOCATOR_EXTENSION_H -#define BASE_ALLOCATOR_ALLOCATOR_EXTENSION_H +#ifndef BASE_ALLOCATOR_ALLOCATOR_EXTENSION_H_ +#define BASE_ALLOCATOR_ALLOCATOR_EXTENSION_H_ #include <stddef.h> // for size_t @@ -56,4 +56,4 @@ BASE_EXPORT void SetReleaseFreeMemoryFunction( } // namespace allocator } // namespace base -#endif +#endif // BASE_ALLOCATOR_ALLOCATOR_EXTENSION_H_ diff --git a/base/allocator/allocator_extension_thunks.h b/base/allocator/allocator_extension_thunks.h index 1e97a84..4e5027b 100644 --- a/base/allocator/allocator_extension_thunks.h +++ b/base/allocator/allocator_extension_thunks.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_ALLOCATOR_ALLOCATOR_THUNKS_EXTENSION_H -#define BASE_ALLOCATOR_ALLOCATOR_THUNKS_EXTENSION_H +#ifndef BASE_ALLOCATOR_ALLOCATOR_EXTENSION_THUNKS_H_ +#define BASE_ALLOCATOR_ALLOCATOR_EXTENSION_THUNKS_H_ #include <stddef.h> // for size_t @@ -33,4 +33,4 @@ ReleaseFreeMemoryFunction GetReleaseFreeMemoryFunction(); } // namespace allocator } // namespace base -#endif +#endif // BASE_ALLOCATOR_ALLOCATOR_EXTENSION_THUNKS_H_ diff --git a/base/android/important_file_writer_android.h b/base/android/important_file_writer_android.h index 20956ba..88e4441 100644 --- a/base/android/important_file_writer_android.h +++ b/base/android/important_file_writer_android.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NATIVE_FRAMEWORK_CHROME_IMPORTANT_FILE_WRITE_ANDROID_H_ -#define NATIVE_FRAMEWORK_CHROME_IMPORTANT_FILE_WRITE_ANDROID_H_ +#ifndef BASE_ANDROID_IMPORTANT_FILE_WRITER_ANDROID_H_ +#define BASE_ANDROID_IMPORTANT_FILE_WRITER_ANDROID_H_ #include <jni.h> @@ -15,4 +15,4 @@ bool RegisterImportantFileWriterAndroid(JNIEnv* env); } // namespace android } // namespace base -#endif // NATIVE_FRAMEWORK_CHROME_IMPORTANT_FILE_WRITE_ANDROID_H_ +#endif // BASE_ANDROID_IMPORTANT_FILE_WRITER_ANDROID_H_ diff --git a/base/android/java_handler_thread.h b/base/android/java_handler_thread.h index 7cd274d..c9a2c02 100644 --- a/base/android/java_handler_thread.h +++ b/base/android/java_handler_thread.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_THREADING_JAVA_THREAD_H_ -#define BASE_THREADING_JAVA_THREAD_H_ +#ifndef BASE_ANDROID_JAVA_HANDLER_THREAD_H_ +#define BASE_ANDROID_JAVA_HANDLER_THREAD_H_ #include <jni.h> @@ -46,4 +46,4 @@ class BASE_EXPORT JavaHandlerThread { } // namespace android } // namespace base -#endif // BASE_THREADING_JAVA_THREAD_H_ +#endif // BASE_ANDROID_JAVA_HANDLER_THREAD_H_ diff --git a/base/android/jni_generator/sample_for_tests.h b/base/android/jni_generator/sample_for_tests.h index 4d76408..c98cf97 100644 --- a/base/android/jni_generator/sample_for_tests.h +++ b/base/android/jni_generator/sample_for_tests.h @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#ifndef BASE_ANDROID_JNI_GENERATOR_SAMPLE_FOR_TESTS_H_ +#define BASE_ANDROID_JNI_GENERATOR_SAMPLE_FOR_TESTS_H_ + #include <jni.h> #include <map> #include <string> @@ -48,3 +51,5 @@ class CPPClass { } // namespace android } // namespace base + +#endif // BASE_ANDROID_JNI_GENERATOR_SAMPLE_FOR_TESTS_H_ diff --git a/base/android/library_loader/library_load_from_apk_status_codes.h b/base/android/library_loader/library_load_from_apk_status_codes.h index f99eebc..9591d3f 100644 --- a/base/android/library_loader/library_load_from_apk_status_codes.h +++ b/base/android/library_loader/library_load_from_apk_status_codes.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_ANDROID_LIBRARY_LOAD_FROM_APK_STATUS_CODES_H_ -#define BASE_ANDROID_LIBRARY_LOAD_FROM_APK_STATUS_CODES_H_ +#ifndef BASE_ANDROID_LIBRARY_LOADER_LIBRARY_LOAD_FROM_APK_STATUS_CODES_H_ +#define BASE_ANDROID_LIBRARY_LOADER_LIBRARY_LOAD_FROM_APK_STATUS_CODES_H_ namespace base { namespace android { @@ -43,4 +43,4 @@ enum LibraryLoadFromApkStatusCodes { } // namespace android } // namespace base -#endif // BASE_ANDROID_LIBRARY_LOAD_FROM_APK_STATUS_CODES_H_ +#endif // BASE_ANDROID_LIBRARY_LOADER_LIBRARY_LOAD_FROM_APK_STATUS_CODES_H_ diff --git a/base/android/library_loader/library_loader_hooks.h b/base/android/library_loader/library_loader_hooks.h index 7e8d527..b1624a0 100644 --- a/base/android/library_loader/library_loader_hooks.h +++ b/base/android/library_loader/library_loader_hooks.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_ANDROID_LIBRARY_LOADER_HOOKS_H_ -#define BASE_ANDROID_LIBRARY_LOADER_HOOKS_H_ +#ifndef BASE_ANDROID_LIBRARY_LOADER_LIBRARY_LOADER_HOOKS_H_ +#define BASE_ANDROID_LIBRARY_LOADER_LIBRARY_LOADER_HOOKS_H_ #include <jni.h> @@ -67,4 +67,4 @@ BASE_EXPORT LibraryProcessType GetLibraryProcessType(JNIEnv* env); } // namespace android } // namespace base -#endif // BASE_ANDROID_LIBRARY_LOADER_HOOKS_H_ +#endif // BASE_ANDROID_LIBRARY_LOADER_LIBRARY_LOADER_HOOKS_H_ diff --git a/base/android/trace_event_binding.h b/base/android/trace_event_binding.h index ed06266..1c1a60b 100644 --- a/base/android/trace_event_binding.h +++ b/base/android/trace_event_binding.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_ANDROID_TRACE_EVENT_H_ -#define BASE_ANDROID_TRACE_EVENT_H_ +#ifndef BASE_ANDROID_TRACE_EVENT_BINDING_H_ +#define BASE_ANDROID_TRACE_EVENT_BINDING_H_ #include <jni.h> @@ -15,4 +15,4 @@ extern bool RegisterTraceEvent(JNIEnv* env); } // namespace android } // namespace base -#endif // CONTENT_COMMON_ANDROID_TRACE_EVENT_H_ +#endif // BASE_ANDROID_TRACE_EVENT_BINDING_H_ diff --git a/base/build_time.h b/base/build_time.h index c7df479..4f0abc3 100644 --- a/base/build_time.h +++ b/base/build_time.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_BUILD_TIME_ -#define BASE_BUILD_TIME_ +#ifndef BASE_BUILD_TIME_H_ +#define BASE_BUILD_TIME_H_ #include "base/base_export.h" #include "base/time/time.h" @@ -25,4 +25,4 @@ Time BASE_EXPORT GetBuildTime(); } // namespace base -#endif // BASE_BUILD_TIME_ +#endif // BASE_BUILD_TIME_H_ diff --git a/base/callback_forward.h b/base/callback_forward.h index 7983248..262c306 100644 --- a/base/callback_forward.h +++ b/base/callback_forward.h @@ -14,4 +14,4 @@ typedef Callback<void(void)> Closure; } // namespace base -#endif // BASE_CALLBACK_FORWARD_H +#endif // BASE_CALLBACK_FORWARD_H_ diff --git a/base/debug/debugger.h b/base/debug/debugger.h index d62ea3f..8680e28 100644 --- a/base/debug/debugger.h +++ b/base/debug/debugger.h @@ -6,8 +6,8 @@ // debuggers. You should use this to test if you're running under a debugger, // and if you would like to yield (breakpoint) into the debugger. -#ifndef BASE_DEBUG_DEBUGGER_H -#define BASE_DEBUG_DEBUGGER_H +#ifndef BASE_DEBUG_DEBUGGER_H_ +#define BASE_DEBUG_DEBUGGER_H_ #include "base/base_export.h" @@ -41,4 +41,4 @@ BASE_EXPORT bool IsDebugUISuppressed(); } // namespace debug } // namespace base -#endif // BASE_DEBUG_DEBUGGER_H +#endif // BASE_DEBUG_DEBUGGER_H_ diff --git a/base/debug/profiler.h b/base/debug/profiler.h index e1dda89..c50555e 100644 --- a/base/debug/profiler.h +++ b/base/debug/profiler.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_DEBUG_PROFILER_H -#define BASE_DEBUG_PROFILER_H +#ifndef BASE_DEBUG_PROFILER_H_ +#define BASE_DEBUG_PROFILER_H_ #include <string> @@ -87,4 +87,4 @@ BASE_EXPORT MoveDynamicSymbol GetProfilerMoveDynamicSymbolFunc(); } // namespace debug } // namespace base -#endif // BASE_DEBUG_DEBUGGER_H +#endif // BASE_DEBUG_PROFILER_H__ diff --git a/base/deferred_sequenced_task_runner.h b/base/deferred_sequenced_task_runner.h index bc8db7a..110d988 100644 --- a/base/deferred_sequenced_task_runner.h +++ b/base/deferred_sequenced_task_runner.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_DEFERRED_SEQUENCED_TASKRUNNER_H_ -#define BASE_DEFERRED_SEQUENCED_TASKRUNNER_H_ +#ifndef BASE_DEFERRED_SEQUENCED_TASK_RUNNER_H_ +#define BASE_DEFERRED_SEQUENCED_TASK_RUNNER_H_ #include <vector> @@ -75,4 +75,4 @@ class BASE_EXPORT DeferredSequencedTaskRunner : public SequencedTaskRunner { } // namespace base -#endif // BASE_DEFERRED_SEQUENCED_TASKRUNNER_H_ +#endif // BASE_DEFERRED_SEQUENCED_TASK_RUNNER_H_ diff --git a/base/event_types.h b/base/event_types.h index af586e4..9905800 100644 --- a/base/event_types.h +++ b/base/event_types.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_EVENT_TYPES_H -#define BASE_EVENT_TYPES_H +#ifndef BASE_EVENT_TYPES_H_ +#define BASE_EVENT_TYPES_H_ #include "build/build_config.h" @@ -34,4 +34,4 @@ typedef void* NativeEvent; } // namespace base -#endif // BASE_EVENT_TYPES_H +#endif // BASE_EVENT_TYPES_H_ diff --git a/base/i18n/string_compare.h b/base/i18n/string_compare.h index f0f3e29..158c93b 100644 --- a/base/i18n/string_compare.h +++ b/base/i18n/string_compare.h @@ -25,4 +25,4 @@ BASE_I18N_EXPORT UCollationResult CompareString16WithCollator( } // namespace i18n } // namespace base -#endif // BASE_I18N_STRING_COMPARATOR_H_ +#endif // BASE_I18N_STRING_COMPARE_H_ diff --git a/base/i18n/timezone.h b/base/i18n/timezone.h index b7275f7..f7fda94 100644 --- a/base/i18n/timezone.h +++ b/base/i18n/timezone.h @@ -18,4 +18,4 @@ BASE_I18N_EXPORT std::string CountryCodeForCurrentTimezone(); } // namespace base -#endif // BASE_TIME_TIMEZONE_H_ +#endif // BASE_I18N_TIMEZONE_H_ diff --git a/base/mac/cocoa_protocols.h b/base/mac/cocoa_protocols.h index ab34a19..a28795c 100644 --- a/base/mac/cocoa_protocols.h +++ b/base/mac/cocoa_protocols.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_COCOA_PROTOCOLS_MAC_H_ -#define BASE_COCOA_PROTOCOLS_MAC_H_ +#ifndef BASE_MAC_COCOA_PROTOCOLS_H_ +#define BASE_MAC_COCOA_PROTOCOLS_H_ #import <Cocoa/Cocoa.h> @@ -28,4 +28,4 @@ DEFINE_EMPTY_PROTOCOL(ICCameraDeviceDownloadDelegate) #undef DEFINE_EMPTY_PROTOCOL -#endif // BASE_COCOA_PROTOCOLS_MAC_H_ +#endif // BASE_MAC_COCOA_PROTOCOLS_H_ diff --git a/base/mac/libdispatch_task_runner.h b/base/mac/libdispatch_task_runner.h index f5fd866..b479bc7 100644 --- a/base/mac/libdispatch_task_runner.h +++ b/base/mac/libdispatch_task_runner.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_MAC_LIBDISPATCH_SEQUENCED_TASK_RUNNER_H_ -#define BASE_MAC_LIBDISPATCH_SEQUENCED_TASK_RUNNER_H_ +#ifndef BASE_MAC_LIBDISPATCH_TASK_RUNNER_H_ +#define BASE_MAC_LIBDISPATCH_TASK_RUNNER_H_ #include <dispatch/dispatch.h> @@ -77,4 +77,4 @@ class BASE_EXPORT LibDispatchTaskRunner : public base::SingleThreadTaskRunner { } // namespace mac } // namespace base -#endif // BASE_MAC_LIBDISPATCH_SEQUENCED_TASK_RUNNER_H_ +#endif // BASE_MAC_LIBDISPATCH_TASK_RUNNER_H_ diff --git a/base/memory/memory_pressure_listener.h b/base/memory/memory_pressure_listener.h index f159fb0..6adaeee 100644 --- a/base/memory/memory_pressure_listener.h +++ b/base/memory/memory_pressure_listener.h @@ -7,8 +7,8 @@ // The app will try to discard buffers that aren't deemed essential (individual // modules will implement their own policy). -#ifndef BASE_MEMORY_PRESSURE_LISTENER_H_ -#define BASE_MEMORY_PRESSURE_LISTENER_H_ +#ifndef BASE_MEMORY_MEMORY_PRESSURE_LISTENER_H_ +#define BASE_MEMORY_MEMORY_PRESSURE_LISTENER_H_ #include "base/base_export.h" #include "base/basictypes.h" @@ -82,4 +82,4 @@ class BASE_EXPORT MemoryPressureListener { } // namespace base -#endif // BASE_MEMORY_PRESSURE_LISTENER_H_ +#endif // BASE_MEMORY_MEMORY_PRESSURE_LISTENER_H_ diff --git a/base/message_loop/message_pump_default.h b/base/message_loop/message_pump_default.h index d63e8101..8aeaa62 100644 --- a/base/message_loop/message_pump_default.h +++ b/base/message_loop/message_pump_default.h @@ -38,4 +38,4 @@ class BASE_EXPORT MessagePumpDefault : public MessagePump { } // namespace base -#endif // BASE__MESSAGE_LOOPMESSAGE_PUMP_DEFAULT_H_ +#endif // BASE_MESSAGE_LOOP_MESSAGE_PUMP_DEFAULT_H_ diff --git a/base/message_loop/message_pump_dispatcher.h b/base/message_loop/message_pump_dispatcher.h index 0dea226..5b1bd55 100644 --- a/base/message_loop/message_pump_dispatcher.h +++ b/base/message_loop/message_pump_dispatcher.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_MESSAGE_LOOP_MESSAGE_PUMP_DISPATCHER_H -#define BASE_MESSAGE_LOOP_MESSAGE_PUMP_DISPATCHER_H +#ifndef BASE_MESSAGE_LOOP_MESSAGE_PUMP_DISPATCHER_H_ +#define BASE_MESSAGE_LOOP_MESSAGE_PUMP_DISPATCHER_H_ #include <stdint.h> @@ -40,4 +40,4 @@ class BASE_EXPORT MessagePumpDispatcher { } // namespace base -#endif // BASE_MESSAGE_LOOP_MESSAGE_PUMP_DISPATCHER_H +#endif // BASE_MESSAGE_LOOP_MESSAGE_PUMP_DISPATCHER_H_ diff --git a/base/numerics/safe_conversions.h b/base/numerics/safe_conversions.h index fe85fc6..d9b77f7 100644 --- a/base/numerics/safe_conversions.h +++ b/base/numerics/safe_conversions.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_SAFE_CONVERSIONS_H_ -#define BASE_SAFE_CONVERSIONS_H_ +#ifndef BASE_NUMERICS_SAFE_CONVERSIONS_H_ +#define BASE_NUMERICS_SAFE_CONVERSIONS_H_ #include <limits> @@ -60,5 +60,4 @@ inline Dst saturated_cast(Src value) { } // namespace base -#endif // BASE_SAFE_CONVERSIONS_H_ - +#endif // BASE_NUMERICS_SAFE_CONVERSIONS_H_ diff --git a/base/numerics/safe_conversions_impl.h b/base/numerics/safe_conversions_impl.h index c26757a..504ce7e 100644 --- a/base/numerics/safe_conversions_impl.h +++ b/base/numerics/safe_conversions_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_SAFE_CONVERSIONS_IMPL_H_ -#define BASE_SAFE_CONVERSIONS_IMPL_H_ +#ifndef BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_ +#define BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_ #include <limits> @@ -212,5 +212,4 @@ inline RangeConstraint DstRangeRelationToSrcRange(Src value) { } // namespace internal } // namespace base -#endif // BASE_SAFE_CONVERSIONS_IMPL_H_ - +#endif // BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_ diff --git a/base/numerics/safe_math.h b/base/numerics/safe_math.h index ccda1c8..1309446 100644 --- a/base/numerics/safe_math.h +++ b/base/numerics/safe_math.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_SAFE_MATH_H_ -#define BASE_SAFE_MATH_H_ +#ifndef BASE_NUMERICS_SAFE_MATH_H_ +#define BASE_NUMERICS_SAFE_MATH_H_ #include "base/numerics/safe_math_impl.h" @@ -269,4 +269,4 @@ using internal::CheckedNumeric; } // namespace base -#endif // BASE_SAFE_MATH_H_ +#endif // BASE_NUMERICS_SAFE_MATH_H_ diff --git a/base/numerics/safe_math_impl.h b/base/numerics/safe_math_impl.h index 663f393..c845189 100644 --- a/base/numerics/safe_math_impl.h +++ b/base/numerics/safe_math_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SAFE_MATH_IMPL_H_ -#define SAFE_MATH_IMPL_H_ +#ifndef BASE_NUMERICS_SAFE_MATH_IMPL_H_ +#define BASE_NUMERICS_SAFE_MATH_IMPL_H_ #include <stdint.h> @@ -498,4 +498,4 @@ struct IsIntegerArithmeticSafe { } // namespace internal } // namespace base -#endif // SAFE_MATH_IMPL_H_ +#endif // BASE_NUMERICS_SAFE_MATH_IMPL_H_ diff --git a/base/pending_task.h b/base/pending_task.h index a2edc69..fddfc86 100644 --- a/base/pending_task.h +++ b/base/pending_task.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef PENDING_TASK_H_ -#define PENDING_TASK_H_ +#ifndef BASE_PENDING_TASK_H_ +#define BASE_PENDING_TASK_H_ #include <queue> @@ -57,4 +57,4 @@ typedef std::priority_queue<base::PendingTask> DelayedTaskQueue; } // namespace base -#endif // PENDING_TASK_H_ +#endif // BASE_PENDING_TASK_H_ diff --git a/base/process/internal_linux.h b/base/process/internal_linux.h index 5fc3356..1837f94 100644 --- a/base/process/internal_linux.h +++ b/base/process/internal_linux.h @@ -5,8 +5,8 @@ // This file contains internal routines that are called by other files in // base/process/. -#ifndef BASE_PROCESS_LINUX_INTERNAL_H_ -#define BASE_PROCESS_LINUX_INTERNAL_H_ +#ifndef BASE_PROCESS_INTERNAL_LINUX_H_ +#define BASE_PROCESS_INTERNAL_LINUX_H_ #include <unistd.h> @@ -87,4 +87,4 @@ TimeDelta ClockTicksToTimeDelta(int clock_ticks); } // namespace internal } // namespace base -#endif // BASE_PROCESS_LINUX_INTERNAL_H_ +#endif // BASE_PROCESS_INTERNAL_LINUX_H_ diff --git a/base/process/process.h b/base/process/process.h index 5ef5e9a..41eef10 100644 --- a/base/process/process.h +++ b/base/process/process.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_PROCESS_PROCESS_PROCESS_H_ -#define BASE_PROCESS_PROCESS_PROCESS_H_ +#ifndef BASE_PROCESS_PROCESS_H_ +#define BASE_PROCESS_PROCESS_H_ #include "base/base_export.h" #include "base/basictypes.h" @@ -132,4 +132,4 @@ class BASE_EXPORT Process { } // namespace base -#endif // BASE_PROCESS_PROCESS_PROCESS_H_ +#endif // BASE_PROCESS_PROCESS_H_ diff --git a/base/scoped_native_library.h b/base/scoped_native_library.h index e9923f4..c0e93f3 100644 --- a/base/scoped_native_library.h +++ b/base/scoped_native_library.h @@ -49,4 +49,4 @@ class BASE_EXPORT ScopedNativeLibrary { } // namespace base -#endif // BASE_MEMORY_NATIVE_LIBRARY_H_ +#endif // BASE_SCOPED_NATIVE_LIBRARY_H_ diff --git a/base/sequenced_task_runner.h b/base/sequenced_task_runner.h index 71dcf05..6bb3f2b 100644 --- a/base/sequenced_task_runner.h +++ b/base/sequenced_task_runner.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_SEQUENCED_TASKRUNNER_H_ -#define BASE_SEQUENCED_TASKRUNNER_H_ +#ifndef BASE_SEQUENCED_TASK_RUNNER_H_ +#define BASE_SEQUENCED_TASK_RUNNER_H_ #include "base/base_export.h" #include "base/sequenced_task_runner_helpers.h" @@ -156,4 +156,4 @@ class BASE_EXPORT SequencedTaskRunner : public TaskRunner { } // namespace base -#endif // BASE_SEQUENCED_TASKRUNNER_H_ +#endif // BASE_SEQUENCED_TASK_RUNNER_H_ diff --git a/base/test/null_task_runner.h b/base/test/null_task_runner.h index a6471f5..0f447513 100644 --- a/base/test/null_task_runner.h +++ b/base/test/null_task_runner.h @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#ifndef BASE_TEST_NULL_TASK_RUNNER_H_ +#define BASE_TEST_NULL_TASK_RUNNER_H_ + #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/single_thread_task_runner.h" @@ -31,3 +34,5 @@ class NullTaskRunner : public base::SingleThreadTaskRunner { }; } // namespace base + +#endif // BASE_TEST_NULL_TASK_RUNNER_H_ diff --git a/base/test/sequenced_task_runner_test_template.h b/base/test/sequenced_task_runner_test_template.h index 48f5354..c208d3c 100644 --- a/base/test/sequenced_task_runner_test_template.h +++ b/base/test/sequenced_task_runner_test_template.h @@ -6,8 +6,8 @@ // pass in order to be conformant. See task_runner_test_template.h for a // description of how to use the constructs in this file; these work the same. -#ifndef BASE_SEQUENCED_TASK_RUNNER_TEST_TEMPLATE_H_ -#define BASE_SEQUENCED_TASK_RUNNER_TEST_TEMPLATE_H_ +#ifndef BASE_TEST_SEQUENCED_TASK_RUNNER_TEST_TEMPLATE_H_ +#define BASE_TEST_SEQUENCED_TASK_RUNNER_TEST_TEMPLATE_H_ #include <cstddef> #include <iosfwd> @@ -338,4 +338,4 @@ REGISTER_TYPED_TEST_CASE_P(SequencedTaskRunnerTest, } // namespace base -#endif // BASE_TASK_RUNNER_TEST_TEMPLATE_H_ +#endif // BASE_TEST_SEQUENCED_TASK_RUNNER_TEST_TEMPLATE_H_ diff --git a/base/test/sequenced_worker_pool_owner.h b/base/test/sequenced_worker_pool_owner.h index b52dd67..bf5f2f7 100644 --- a/base/test/sequenced_worker_pool_owner.h +++ b/base/test/sequenced_worker_pool_owner.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_THREADING_SEQUENCED_WORKER_POOL_UNITTEST_H_ -#define BASE_THREADING_SEQUENCED_WORKER_POOL_UNITTEST_H_ +#ifndef BASE_TEST_SEQUENCED_WORKER_POOL_OWNER_H_ +#define BASE_TEST_SEQUENCED_WORKER_POOL_OWNER_H_ #include <cstddef> #include <string> @@ -58,4 +58,4 @@ class SequencedWorkerPoolOwner : public SequencedWorkerPool::TestingObserver { } // namespace base -#endif // BASE_THREADING_SEQUENCED_WORKER_POOL_UNITTEST_H_ +#endif // BASE_TEST_SEQUENCED_WORKER_POOL_OWNER_H_ diff --git a/base/test/simple_test_clock.h b/base/test/simple_test_clock.h index e8a79c5..a70f99c 100644 --- a/base/test/simple_test_clock.h +++ b/base/test/simple_test_clock.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_SIMPLE_TEST_CLOCK_H_ -#define BASE_SIMPLE_TEST_CLOCK_H_ +#ifndef BASE_TEST_SIMPLE_TEST_CLOCK_H_ +#define BASE_TEST_SIMPLE_TEST_CLOCK_H_ #include "base/compiler_specific.h" #include "base/synchronization/lock.h" @@ -38,4 +38,4 @@ class SimpleTestClock : public Clock { } // namespace base -#endif // BASE_SIMPLE_TEST_CLOCK_H_ +#endif // BASE_TEST_SIMPLE_TEST_CLOCK_H_ diff --git a/base/test/simple_test_tick_clock.h b/base/test/simple_test_tick_clock.h index a637543..aebdebc 100644 --- a/base/test/simple_test_tick_clock.h +++ b/base/test/simple_test_tick_clock.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_SIMPLE_TEST_TICK_CLOCK_H_ -#define BASE_SIMPLE_TEST_TICK_CLOCK_H_ +#ifndef BASE_TEST_SIMPLE_TEST_TICK_CLOCK_H_ +#define BASE_TEST_SIMPLE_TEST_TICK_CLOCK_H_ #include "base/compiler_specific.h" #include "base/synchronization/lock.h" @@ -35,4 +35,4 @@ class SimpleTestTickClock : public TickClock { } // namespace base -#endif // BASE_SIMPLE_TEST_TICK_CLOCK_H_ +#endif // BASE_TEST_SIMPLE_TEST_TICK_CLOCK_H_ diff --git a/base/test/task_runner_test_template.h b/base/test/task_runner_test_template.h index 73aa1f4..9bcf70b 100644 --- a/base/test/task_runner_test_template.h +++ b/base/test/task_runner_test_template.h @@ -212,4 +212,4 @@ REGISTER_TYPED_TEST_CASE_P( } // namespace base -#endif //#define BASE_TEST_TASK_RUNNER_TEST_TEMPLATE_H_ +#endif // BASE_TEST_TASK_RUNNER_TEST_TEMPLATE_H_ diff --git a/base/test/test_reg_util_win.h b/base/test/test_reg_util_win.h index db71838..5f23b7f 100644 --- a/base/test/test_reg_util_win.h +++ b/base/test/test_reg_util_win.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_TEST_TEST_REG_UTIL_H_ -#define BASE_TEST_TEST_REG_UTIL_H_ +#ifndef BASE_TEST_TEST_REG_UTIL_WIN_H_ +#define BASE_TEST_TEST_REG_UTIL_WIN_H_ // Registry utility functions used only by tests. @@ -74,4 +74,4 @@ base::string16 GenerateTempKeyPath(); } // namespace registry_util -#endif // BASE_TEST_TEST_REG_UTIL_H_ +#endif // BASE_TEST_TEST_REG_UTIL_WIN_H_ diff --git a/base/time/clock.h b/base/time/clock.h index be389be..507a850 100644 --- a/base/time/clock.h +++ b/base/time/clock.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_CLOCK_H_ -#define BASE_CLOCK_H_ +#ifndef BASE_TIME_CLOCK_H_ +#define BASE_TIME_CLOCK_H_ #include "base/base_export.h" #include "base/time/time.h" @@ -37,4 +37,4 @@ class BASE_EXPORT Clock { } // namespace base -#endif // BASE_CLOCK_H_ +#endif // BASE_TIME_CLOCK_H_ diff --git a/base/time/default_clock.h b/base/time/default_clock.h index 3d2e947..0b8250e 100644 --- a/base/time/default_clock.h +++ b/base/time/default_clock.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_DEFAULT_CLOCK_H_ -#define BASE_DEFAULT_CLOCK_H_ +#ifndef BASE_TIME_DEFAULT_CLOCK_H_ +#define BASE_TIME_DEFAULT_CLOCK_H_ #include "base/base_export.h" #include "base/compiler_specific.h" @@ -22,4 +22,4 @@ class BASE_EXPORT DefaultClock : public Clock { } // namespace base -#endif // BASE_DEFAULT_CLOCK_H_ +#endif // BASE_TIME_DEFAULT_CLOCK_H_ diff --git a/base/time/default_tick_clock.h b/base/time/default_tick_clock.h index a6d6b15..cb041e6 100644 --- a/base/time/default_tick_clock.h +++ b/base/time/default_tick_clock.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_DEFAULT_TICK_CLOCK_H_ -#define BASE_DEFAULT_TICK_CLOCK_H_ +#ifndef BASE_TIME_DEFAULT_TICK_CLOCK_H_ +#define BASE_TIME_DEFAULT_TICK_CLOCK_H_ #include "base/base_export.h" #include "base/compiler_specific.h" @@ -22,4 +22,4 @@ class BASE_EXPORT DefaultTickClock : public TickClock { } // namespace base -#endif // BASE_DEFAULT_CLOCK_H_ +#endif // BASE_TIME_DEFAULT_TICK_CLOCK_H_ diff --git a/base/time/tick_clock.h b/base/time/tick_clock.h index 2b8691f..f7aba53 100644 --- a/base/time/tick_clock.h +++ b/base/time/tick_clock.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_TICK_CLOCK_H_ -#define BASE_TICK_CLOCK_H_ +#ifndef BASE_TIME_TICK_CLOCK_H_ +#define BASE_TIME_TICK_CLOCK_H_ #include "base/base_export.h" #include "base/time/time.h" @@ -37,4 +37,4 @@ class BASE_EXPORT TickClock { } // namespace base -#endif // BASE_TICK_CLOCK_H_ +#endif // BASE_TIME_TICK_CLOCK_H_ diff --git a/base/timer/mock_timer.h b/base/timer/mock_timer.h index b07c9c0..e18a5c0 100644 --- a/base/timer/mock_timer.h +++ b/base/timer/mock_timer.h @@ -38,4 +38,4 @@ class BASE_EXPORT MockTimer : public Timer { } // namespace base -#endif // !BASE_TIMER_MOCK_TIMER_H_ +#endif // BASE_TIMER_MOCK_TIMER_H_ diff --git a/base/trace_event/trace_event.h b/base/trace_event/trace_event.h index c30a84a..b90a3ea 100644 --- a/base/trace_event/trace_event.h +++ b/base/trace_event/trace_event.h @@ -1607,4 +1607,4 @@ template<typename IDType> class TraceScopedTrackableObject { } // namespace trace_event } // namespace base -#endif /* BASE_TRACE_EVENT_TRACE_EVENT_H_ */ +#endif // BASE_TRACE_EVENT_TRACE_EVENT_H_ diff --git a/base/trace_event/trace_event_synthetic_delay.h b/base/trace_event/trace_event_synthetic_delay.h index 14801be..0df794b 100644 --- a/base/trace_event/trace_event_synthetic_delay.h +++ b/base/trace_event/trace_event_synthetic_delay.h @@ -163,4 +163,4 @@ TRACE_EVENT_API_CLASS_EXPORT base::trace_event::TraceEventSyntheticDelay* } // namespace trace_event_internal -#endif /* BASE_TRACE_EVENT_TRACE_EVENT_SYNTHETIC_DELAY_H_ */ +#endif // BASE_TRACE_EVENT_TRACE_EVENT_SYNTHETIC_DELAY_H_ diff --git a/base/win/object_watcher.h b/base/win/object_watcher.h index ecd0415..0ae2532 100644 --- a/base/win/object_watcher.h +++ b/base/win/object_watcher.h @@ -103,4 +103,4 @@ class BASE_EXPORT ObjectWatcher : public MessageLoop::DestructionObserver { } // namespace win } // namespace base -#endif // BASE_OBJECT_WATCHER_H_ +#endif // BASE_WIN_OBJECT_WATCHER_H_ diff --git a/base/win/scoped_bstr.h b/base/win/scoped_bstr.h index d703f62..7c9f5df 100644 --- a/base/win/scoped_bstr.h +++ b/base/win/scoped_bstr.h @@ -94,4 +94,4 @@ class BASE_EXPORT ScopedBstr { } // namespace win } // namespace base -#endif // BASE_SCOPED_BSTR_H_ +#endif // BASE_WIN_SCOPED_BSTR_H_ diff --git a/base/win/scoped_handle.h b/base/win/scoped_handle.h index db24f4b..97fd7a5 100644 --- a/base/win/scoped_handle.h +++ b/base/win/scoped_handle.h @@ -174,4 +174,4 @@ void BASE_EXPORT OnHandleBeingClosed(HANDLE handle); } // namespace win } // namespace base -#endif // BASE_SCOPED_HANDLE_WIN_H_ +#endif // BASE_WIN_SCOPED_HANDLE_H_ diff --git a/base/win/startup_information.h b/base/win/startup_information.h index 7cef81f..e7e21cb 100644 --- a/base/win/startup_information.h +++ b/base/win/startup_information.h @@ -45,5 +45,4 @@ class BASE_EXPORT StartupInformation { } // namespace win } // namespace base -#endif // BASE_WIN_SCOPED_STARTUP_INFO_EX_H_ - +#endif // BASE_WIN_STARTUP_INFORMATION_H__ |