Skip to content

Commit

Permalink
Fix header guards in various dirs.
Browse files Browse the repository at this point in the history
Generated mechanically as follows:

git ls-files '*.h' | grep "^$DIR" | \
    xargs parallel cpplint.py --filter=-,+build/header_guard -- 2>&1 | \
    grep build/header_guard | tools/apply_cpplint_header_guard.py

Bug: 1200694
Change-Id: I128daa6b322b6d1c2bf7748b7bb03d1d68cfc2d9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2848538
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Owners-Override: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#876278}
  • Loading branch information
leizleiz authored and Chromium LUCI CQ committed Apr 26, 2021
1 parent d7544c4 commit 02f91da
Show file tree
Hide file tree
Showing 26 changed files with 70 additions and 70 deletions.
2 changes: 1 addition & 1 deletion android_webview/browser/aw_render_process.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ class AwRenderProcess : public content::RenderProcessHostObserver,

} // namespace android_webview

#endif
#endif // ANDROID_WEBVIEW_BROWSER_AW_RENDER_PROCESS_H_
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ class RendererProcessMetricsProvider : public metrics::MetricsProvider {

} // namespace android_webview

#endif // ANDROID_WEBVIEW_BROWSER_METRICS_RENDERER_PROCESS_PROVIDER_H_
#endif // ANDROID_WEBVIEW_BROWSER_METRICS_RENDERER_PROCESS_METRICS_PROVIDER_H_
6 changes: 3 additions & 3 deletions cloud_print/common/win/cloud_print_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 CLOUD_PRINT_COMMON_CLOUD_PRINT_UTILS_H_
#define CLOUD_PRINT_COMMON_CLOUD_PRINT_UTILS_H_
#ifndef CLOUD_PRINT_COMMON_WIN_CLOUD_PRINT_UTILS_H_
#define CLOUD_PRINT_COMMON_WIN_CLOUD_PRINT_UTILS_H_

#include <wtypes.h>

Expand All @@ -27,4 +27,4 @@ void SetGoogleUpdateUsage(const std::wstring& product_id);

} // namespace cloud_print

#endif // CLOUD_PRINT_COMMON_CLOUD_PRINT_UTILS_H_
#endif // CLOUD_PRINT_COMMON_WIN_CLOUD_PRINT_UTILS_H_
6 changes: 3 additions & 3 deletions cloud_print/common/win/install_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 CLOUD_PRINT_COMMON_INSTALL_UTILS_H_
#define CLOUD_PRINT_COMMON_INSTALL_UTILS_H_
#ifndef CLOUD_PRINT_COMMON_WIN_INSTALL_UTILS_H_
#define CLOUD_PRINT_COMMON_WIN_INSTALL_UTILS_H_

#include <wtypes.h>
#include <string>
Expand Down Expand Up @@ -45,4 +45,4 @@ bool IsProgramsFilesParent(const base::FilePath& path);

} // namespace cloud_print

#endif // CLOUD_PRINT_COMMON_INSTALL_UTILS_H_
#endif // CLOUD_PRINT_COMMON_WIN_INSTALL_UTILS_H_
6 changes: 3 additions & 3 deletions courgette/types_elf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 COURGETTE_ELF_TYPES_H_
#define COURGETTE_ELF_TYPES_H_
#ifndef COURGETTE_TYPES_ELF_H_
#define COURGETTE_TYPES_ELF_H_

#include <stdint.h>

Expand Down Expand Up @@ -173,4 +173,4 @@ enum elf32_rel_386_type_values {
R_386_TLS_TPOFF = 14,
};

#endif // COURGETTE_ELF_TYPES_H_
#endif // COURGETTE_TYPES_ELF_H_
2 changes: 1 addition & 1 deletion fuchsia/engine/renderer/cast_streaming_demuxer.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ class CastStreamingDemuxer : public media::Demuxer {
CastStreamingReceiver* const receiver_;
};

#endif // FUCHSIA_ENGINE_RENDERER_LIBCAST_STREAMING_DEMUXER_H_
#endif // FUCHSIA_ENGINE_RENDERER_CAST_STREAMING_DEMUXER_H_
2 changes: 1 addition & 1 deletion fuchsia/runners/cast/fake_api_bindings.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ class FakeApiBindingsImpl : public chromium::cast::ApiBindings {
base::OnceClosure on_expected_port_received_;
};

#endif // FUCHSIA_RUNNERS_CAST_TEST_API_BINDINGS_H_
#endif // FUCHSIA_RUNNERS_CAST_FAKE_API_BINDINGS_H_
6 changes: 3 additions & 3 deletions gin/debug_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 GIN_PUBLIC_DEBUG_IMPL_H_
#define GIN_PUBLIC_DEBUG_IMPL_H_
#ifndef GIN_DEBUG_IMPL_H_
#define GIN_DEBUG_IMPL_H_

#include "gin/public/debug.h"
#include "v8/include/v8.h"
Expand All @@ -17,4 +17,4 @@ class DebugImpl {

} // namespace gin

#endif // GIN_PUBLIC_DEBUG_IMPL_H_
#endif // GIN_DEBUG_IMPL_H_
6 changes: 3 additions & 3 deletions gin/v8_foreground_task_runner.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 V8_FOREGROUND_TASK_RUNNER_H
#define V8_FOREGROUND_TASK_RUNNER_H
#ifndef GIN_V8_FOREGROUND_TASK_RUNNER_H_
#define GIN_V8_FOREGROUND_TASK_RUNNER_H_

#include "base/memory/ref_counted.h"
#include "gin/v8_foreground_task_runner_base.h"
Expand Down Expand Up @@ -43,4 +43,4 @@ class V8ForegroundTaskRunner : public V8ForegroundTaskRunnerBase {

} // namespace gin

#endif // V8_FOREGROUND_TASK_RUNNER_H
#endif // GIN_V8_FOREGROUND_TASK_RUNNER_H_
6 changes: 3 additions & 3 deletions gin/v8_foreground_task_runner_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 V8_FOREGROUND_TASK_RUNNER_BASE_H
#define V8_FOREGROUND_TASK_RUNNER_BASE_H
#ifndef GIN_V8_FOREGROUND_TASK_RUNNER_BASE_H_
#define GIN_V8_FOREGROUND_TASK_RUNNER_BASE_H_

#include "v8/include/v8-platform.h"

Expand Down Expand Up @@ -33,4 +33,4 @@ class V8ForegroundTaskRunnerBase : public v8::TaskRunner {

} // namespace gin

#endif /* !V8_FOREGROUND_TASK_RUNNER_BASE_H */
#endif // GIN_V8_FOREGROUND_TASK_RUNNER_BASE_H_
6 changes: 3 additions & 3 deletions gin/v8_foreground_task_runner_with_locker.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 V8_FOREGROUND_TASK_RUNNER_WITH_LOCKER_H
#define V8_FOREGROUND_TASK_RUNNER_WITH_LOCKER_H
#ifndef GIN_V8_FOREGROUND_TASK_RUNNER_WITH_LOCKER_H_
#define GIN_V8_FOREGROUND_TASK_RUNNER_WITH_LOCKER_H_

#include "base/memory/ref_counted.h"
#include "gin/v8_foreground_task_runner_base.h"
Expand Down Expand Up @@ -41,4 +41,4 @@ class V8ForegroundTaskRunnerWithLocker : public V8ForegroundTaskRunnerBase {

} // namespace gin

#endif // V8_FOREGROUND_TASK_RUNNER_WITH_LOCKER_H
#endif // GIN_V8_FOREGROUND_TASK_RUNNER_WITH_LOCKER_H_
6 changes: 3 additions & 3 deletions google_apis/gcm/base/encryptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 GOOGLE_APIS_GCM_ENCRYPTOR_H_
#define GOOGLE_APIS_GCM_ENCRYPTOR_H_
#ifndef GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
#define GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_

#include <string>
#include "google_apis/gcm/base/gcm_export.h"
Expand All @@ -24,4 +24,4 @@ class GCM_EXPORT Encryptor {

} // namespace gcm

#endif // GOOGLE_APIS_GCM_ENCRYPTOR_H_
#endif // GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
6 changes: 3 additions & 3 deletions google_apis/gcm/base/fake_encryptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
#define GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
#ifndef GOOGLE_APIS_GCM_BASE_FAKE_ENCRYPTOR_H_
#define GOOGLE_APIS_GCM_BASE_FAKE_ENCRYPTOR_H_

#include "base/compiler_specific.h"
#include "google_apis/gcm/base/encryptor.h"
Expand All @@ -25,4 +25,4 @@ class FakeEncryptor : public Encryptor {

} // namespace gcm

#endif // GOOGLE_APIS_GCM_BASE_ENCRYPTOR_H_
#endif // GOOGLE_APIS_GCM_BASE_FAKE_ENCRYPTOR_H_
6 changes: 3 additions & 3 deletions google_apis/gcm/base/gcm_export.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 GOOGLE_APIS_GCM_GCM_EXPORT_H_
#define GOOGLE_APIS_GCM_GCM_EXPORT_H_
#ifndef GOOGLE_APIS_GCM_BASE_GCM_EXPORT_H_
#define GOOGLE_APIS_GCM_BASE_GCM_EXPORT_H_

#if defined(COMPONENT_BUILD)
#if defined(WIN32)
Expand All @@ -26,4 +26,4 @@
#define GCM_EXPORT
#endif

#endif // GOOGLE_APIS_GCM_GCM_EXPORT_H_
#endif // GOOGLE_APIS_GCM_BASE_GCM_EXPORT_H_
6 changes: 3 additions & 3 deletions google_apis/gcm/engine/gservices_switches.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 GOOGLE_APIS_GCM_ENGINE_GSERVICSE_SWITCHES_H_
#define GOOGLE_APIS_GCM_ENGINE_GSERVICSE_SWITCHES_H_
#ifndef GOOGLE_APIS_GCM_ENGINE_GSERVICES_SWITCHES_H_
#define GOOGLE_APIS_GCM_ENGINE_GSERVICES_SWITCHES_H_

namespace switches {

Expand All @@ -13,4 +13,4 @@ extern const char kGCMRegistrationURL[];

} // namespace switches

#endif // GOOGLE_APIS_GCM_ENGINE_GSERVICSE_SWITCHES_H_
#endif // GOOGLE_APIS_GCM_ENGINE_GSERVICES_SWITCHES_H_
6 changes: 3 additions & 3 deletions google_apis/gcm/monitoring/fake_gcm_stats_recorder.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECODER_H_
#define GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECODER_H_
#ifndef GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECORDER_H_
#define GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECORDER_H_

#include <stdint.h>

Expand Down Expand Up @@ -73,4 +73,4 @@ class FakeGCMStatsRecorder : public GCMStatsRecorder {

} // namespace gcm

#endif // GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECODER_H_
#endif // GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECORDER_H_
6 changes: 3 additions & 3 deletions google_apis/google_api_keys_mac.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 GOOGLE_API_KEYS_MAC_H_
#define GOOGLE_API_KEYS_MAC_H_
#ifndef GOOGLE_APIS_GOOGLE_API_KEYS_MAC_H_
#define GOOGLE_APIS_GOOGLE_API_KEYS_MAC_H_

#include <string>

Expand All @@ -13,4 +13,4 @@ std::string GetAPIKeyFromInfoPlist(const std::string& key_name);

} // namespace google_apis

#endif // GOOGLE_API_KEYS_MAC_H_
#endif // GOOGLE_APIS_GOOGLE_API_KEYS_MAC_H_
6 changes: 3 additions & 3 deletions headless/lib/utility/headless_content_utility_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 HEADLESS_LIB_HEADLESS_CONTENT_UTILITY_CLIENT_H_
#define HEADLESS_LIB_HEADLESS_CONTENT_UTILITY_CLIENT_H_
#ifndef HEADLESS_LIB_UTILITY_HEADLESS_CONTENT_UTILITY_CLIENT_H_
#define HEADLESS_LIB_UTILITY_HEADLESS_CONTENT_UTILITY_CLIENT_H_

#include <string>

Expand Down Expand Up @@ -38,4 +38,4 @@ class HEADLESS_EXPORT HeadlessContentUtilityClient

} // namespace headless

#endif // HEADLESS_LIB_HEADLESS_CONTENT_UTILITY_CLIENT_H_
#endif // HEADLESS_LIB_UTILITY_HEADLESS_CONTENT_UTILITY_CLIENT_H_
6 changes: 3 additions & 3 deletions printing/print_settings_initializer_mac.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 PRINTING_PRINTING_SETTINGS_INITIALIZER_MAC_H_
#define PRINTING_PRINTING_SETTINGS_INITIALIZER_MAC_H_
#ifndef PRINTING_PRINT_SETTINGS_INITIALIZER_MAC_H_
#define PRINTING_PRINT_SETTINGS_INITIALIZER_MAC_H_

#import <ApplicationServices/ApplicationServices.h>

Expand All @@ -28,4 +28,4 @@ class PRINTING_EXPORT PrintSettingsInitializerMac {

} // namespace printing

#endif // PRINTING_PRINTING_SETTINGS_INITIALIZER_MAC_H_
#endif // PRINTING_PRINT_SETTINGS_INITIALIZER_MAC_H_
6 changes: 3 additions & 3 deletions printing/print_settings_initializer_win.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 PRINTING_PRINTING_SETTINGS_INITIALIZER_WIN_H_
#define PRINTING_PRINTING_SETTINGS_INITIALIZER_WIN_H_
#ifndef PRINTING_PRINT_SETTINGS_INITIALIZER_WIN_H_
#define PRINTING_PRINT_SETTINGS_INITIALIZER_WIN_H_

#include <string>

Expand Down Expand Up @@ -31,4 +31,4 @@ class PRINTING_EXPORT PrintSettingsInitializerWin {

} // namespace printing

#endif // PRINTING_PRINTING_SETTINGS_INITIALIZER_WIN_H_
#endif // PRINTING_PRINT_SETTINGS_INITIALIZER_WIN_H_
6 changes: 3 additions & 3 deletions rlz/lib/rlz_value_store.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 RLZ_VALUE_STORE_H_
#define RLZ_VALUE_STORE_H_
#ifndef RLZ_LIB_RLZ_VALUE_STORE_H_
#define RLZ_LIB_RLZ_VALUE_STORE_H_

#include <stddef.h>
#include <stdint.h>
Expand Down Expand Up @@ -120,4 +120,4 @@ std::string RlzStoreFilenameStr();

} // namespace rlz_lib

#endif // RLZ_VALUE_STORE_H_
#endif // RLZ_LIB_RLZ_VALUE_STORE_H_
6 changes: 3 additions & 3 deletions rlz/test/rlz_test_helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
//
// Helper functions used by the tests.

#ifndef RLZ_TEST_RLZ_TEST_HELPERS_H
#define RLZ_TEST_RLZ_TEST_HELPERS_H
#ifndef RLZ_TEST_RLZ_TEST_HELPERS_H_
#define RLZ_TEST_RLZ_TEST_HELPERS_H_

#include "base/compiler_specific.h"
#include "build/build_config.h"
Expand Down Expand Up @@ -65,4 +65,4 @@ class RlzLibTestBase : public RlzLibTestNoMachineState {
#endif
};

#endif // RLZ_TEST_RLZ_TEST_HELPERS_H
#endif // RLZ_TEST_RLZ_TEST_HELPERS_H_
6 changes: 3 additions & 3 deletions sql/sql_memory_dump_provider.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 SQL_SQL_MEMORY_DUMP_PROVIDER_H
#define SQL_SQL_MEMORY_DUMP_PROVIDER_H
#ifndef SQL_SQL_MEMORY_DUMP_PROVIDER_H_
#define SQL_SQL_MEMORY_DUMP_PROVIDER_H_

#include "base/component_export.h"
#include "base/macros.h"
Expand Down Expand Up @@ -34,4 +34,4 @@ class COMPONENT_EXPORT(SQL) SqlMemoryDumpProvider

} // namespace sql

#endif // SQL_SQL_MEMORY_DUMP_PROVIDER_H
#endif // SQL_SQL_MEMORY_DUMP_PROVIDER_H_
6 changes: 3 additions & 3 deletions testing/android/native_test/native_test_launcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 TESTING_ANDROID_NATIVE_TEST_LAUNCHER_H_
#define TESTING_ANDROID_NATIVE_TEST_LAUNCHER_H_
#ifndef TESTING_ANDROID_NATIVE_TEST_NATIVE_TEST_LAUNCHER_H_
#define TESTING_ANDROID_NATIVE_TEST_NATIVE_TEST_LAUNCHER_H_

#include <jni.h>

Expand All @@ -15,4 +15,4 @@ void InstallHandlers();
} // namespace android
} // namespace testing

#endif // TESTING_ANDROID_NATIVE_TEST_LAUNCHER_H_
#endif // TESTING_ANDROID_NATIVE_TEST_NATIVE_TEST_LAUNCHER_H_
6 changes: 3 additions & 3 deletions testing/android/native_test/native_test_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 TESTING_ANDROID_NATIVE_TEST_UTIL_
#define TESTING_ANDROID_NATIVE_TEST_UTIL_
#ifndef TESTING_ANDROID_NATIVE_TEST_NATIVE_TEST_UTIL_H_
#define TESTING_ANDROID_NATIVE_TEST_NATIVE_TEST_UTIL_H_

#include <stdio.h>
#include <string>
Expand Down Expand Up @@ -36,4 +36,4 @@ int ArgsToArgv(const std::vector<std::string>& args, std::vector<char*>* argv);
} // namespace android
} // namespace testing

#endif // TESTING_ANDROID_NATIVE_TEST_UTIL_
#endif // TESTING_ANDROID_NATIVE_TEST_NATIVE_TEST_UTIL_H_
6 changes: 3 additions & 3 deletions weblayer/browser/content_view_render_view.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 COMPONENTS_EMBEDDER_SUPPORT_ANDROID_VIEW_CONTENT_VIEW_RENDER_VIEW_H_
#define COMPONENTS_EMBEDDER_SUPPORT_ANDROID_VIEW_CONTENT_VIEW_RENDER_VIEW_H_
#ifndef WEBLAYER_BROWSER_CONTENT_VIEW_RENDER_VIEW_H_
#define WEBLAYER_BROWSER_CONTENT_VIEW_RENDER_VIEW_H_

#include <memory>

Expand Down Expand Up @@ -96,4 +96,4 @@ class ContentViewRenderView : public content::CompositorClient {

} // namespace weblayer

#endif // COMPONENTS_EMBEDDER_SUPPORT_ANDROID_VIEW_CONTENT_VIEW_RENDER_VIEW_H_
#endif // WEBLAYER_BROWSER_CONTENT_VIEW_RENDER_VIEW_H_

0 comments on commit 02f91da

Please sign in to comment.