Commit 0a44860e authored by danakj's avatar danakj Committed by Commit bot

base: Fix/add header #ifndef guards.

Header guards should be defined based on the path and file name of the
header file. Some headers have it wrong, some are missing the guards,
and some just have the matching comment wrong.

R=Nico
BUG=464816

Committed: https://crrev.com/301b392761fd8f66f3a701ab1dd011c6e7a55e19
Cr-Commit-Position: refs/heads/master@{#319722}

Review URL: https://codereview.chromium.org/985003004

Cr-Commit-Position: refs/heads/master@{#319793}
parent a0258781
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -14,4 +14,4 @@ typedef Callback<void(void)> Closure;
} // namespace base
#endif // BASE_CALLBACK_FORWARD_H
#endif // BASE_CALLBACK_FORWARD_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_
......@@ -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__
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -18,4 +18,4 @@ BASE_I18N_EXPORT std::string CountryCodeForCurrentTimezone();
} // namespace base
#endif // BASE_TIME_TIMEZONE_H_
#endif // BASE_I18N_TIMEZONE_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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -49,4 +49,4 @@ class BASE_EXPORT ScopedNativeLibrary {
} // namespace base
#endif // BASE_MEMORY_NATIVE_LIBRARY_H_
#endif // BASE_SCOPED_NATIVE_LIBRARY_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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -38,4 +38,4 @@ class BASE_EXPORT MockTimer : public Timer {
} // namespace base
#endif // !BASE_TIMER_MOCK_TIMER_H_
#endif // BASE_TIMER_MOCK_TIMER_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_
......@@ -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_
......@@ -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_
......@@ -94,4 +94,4 @@ class BASE_EXPORT ScopedBstr {
} // namespace win
} // namespace base
#endif // BASE_SCOPED_BSTR_H_
#endif // BASE_WIN_SCOPED_BSTR_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_
......@@ -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__
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment