Fix header guards in components/.

Mostly generated mechanically as follows: git ls-files '*.h' | grep '^components/' | \ xargs parallel cpplint.py --filter=-,+build/header_guard -- 2>&1 | \ grep build/header_guard | tools/apply_cpplint_header_guard.py Except for files in components/policy/core/common/management/, which were sufficiently wrong that they required manual fixing. Bug: 1200694 Change-Id: I019b0d5cd2dfc9ca54d09b7085824b0ea9a7f579 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2839703 Reviewed-by: Ted Choc <tedchoc@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org> Cr-Commit-Position: refs/heads/master@{#874980}
Denger-Network · Apr 22, 2021 · 2fdfa89 · 2fdfa89
1 parent ed33911
commit 2fdfa89
Show file tree

Hide file tree

Showing 141 changed files with 291 additions and 295 deletions.
diff --git a/components/autofill/core/browser/autofill_driver_factory.h b/components/autofill/core/browser/autofill_driver_factory.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 AUTOFILL_CORE_BROWSER_AUTOFILL_DRIVER_FACTORY_H_
-#define AUTOFILL_CORE_BROWSER_AUTOFILL_DRIVER_FACTORY_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DRIVER_FACTORY_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DRIVER_FACTORY_H_
 
 #include <memory>
 #include <unordered_map>
@@ -61,4 +61,4 @@ class AutofillDriverFactory {
 
 }  // namespace autofill
 
-#endif  // AUTOFILL_CORE_BROWSER_AUTOFILL_DRIVER_FACTORY_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_DRIVER_FACTORY_H_
diff --git a/components/autofill/core/browser/form_parsing/autofill_parsing_utils.h b/components/autofill/core/browser/form_parsing/autofill_parsing_utils.h
@@ -63,4 +63,4 @@ struct MatchingPattern {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_DATA_MODEL_AUTOFILL_PARSING_UTILS_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_PARSING_AUTOFILL_PARSING_UTILS_H_
diff --git a/components/autofill/core/browser/pattern_provider/pattern_configuration_parser.h b/components/autofill/core/browser/pattern_provider/pattern_configuration_parser.h
@@ -58,4 +58,4 @@ GetPatternsFromResourceBundleSynchronously();
 
 }  // namespace autofill
 
-#endif
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PATTERN_PROVIDER_PATTERN_CONFIGURATION_PARSER_H_
diff --git a/components/autofill/core/common/dense_set.h b/components/autofill/core/common/dense_set.h
@@ -296,4 +296,4 @@ class DenseSet {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_CORE_COMMON_BITSET_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_COMMON_DENSE_SET_H_
diff --git a/components/autofill/ios/browser/autofill_agent.h b/components/autofill/ios/browser/autofill_agent.h
@@ -1,8 +1,8 @@
 // Copyright 2013 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.
-#ifndef COMPONENTS_AUTOFILL_IOS_BROWSER_AUTOFILL_AGENT_H
-#define COMPONENTS_AUTOFILL_IOS_BROWSER_AUTOFILL_AGENT_H
+#ifndef COMPONENTS_AUTOFILL_IOS_BROWSER_AUTOFILL_AGENT_H_
+#define COMPONENTS_AUTOFILL_IOS_BROWSER_AUTOFILL_AGENT_H_
 
 #import <Foundation/Foundation.h>
 
@@ -34,4 +34,4 @@ class WebState;
 
 @end
 
-#endif  // COMPONENTS_AUTOFILL_IOS_BROWSER_AUTOFILL_AGENT_H
+#endif  // COMPONENTS_AUTOFILL_IOS_BROWSER_AUTOFILL_AGENT_H_
diff --git a/components/autofill/ios/browser/autofill_driver_ios.h b/components/autofill/ios/browser/autofill_driver_ios.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 COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOFILL_DRIVER_IOS_H_
-#define COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOFILL_DRIVER_IOS_H_
+#ifndef COMPONENTS_AUTOFILL_IOS_BROWSER_AUTOFILL_DRIVER_IOS_H_
+#define COMPONENTS_AUTOFILL_IOS_BROWSER_AUTOFILL_DRIVER_IOS_H_
 
 #include <string>
 
@@ -107,4 +107,4 @@ class AutofillDriverIOS : public AutofillDriver {
 
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOFILL_DRIVER_IOS_H_
+#endif  // COMPONENTS_AUTOFILL_IOS_BROWSER_AUTOFILL_DRIVER_IOS_H_
diff --git a/components/autofill/ios/browser/autofill_driver_ios_webframe.h b/components/autofill/ios/browser/autofill_driver_ios_webframe.h
@@ -111,4 +111,4 @@ class AutofillDriverIOSWebFrame
 };
 }  // namespace autofill
 
-#endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_AUTOFILL_DRIVER_IOS_WEBSTATE_H_
+#endif  // COMPONENTS_AUTOFILL_IOS_BROWSER_AUTOFILL_DRIVER_IOS_WEBFRAME_H_
diff --git a/components/autofill_assistant/browser/actions/action_test_utils.h b/components/autofill_assistant/browser/actions/action_test_utils.h
@@ -46,4 +46,4 @@ ElementFinder::Result MockFindElement(MockWebController& web_controller,
 }  // namespace test_util
 }  // namespace autofill_assistant
 
-#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_ACTIONS_ACTION_UNITTEST_HELPER_H_
+#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_ACTIONS_ACTION_TEST_UTILS_H_
diff --git a/components/autofill_assistant/browser/actions/release_elements_action.h b/components/autofill_assistant/browser/actions/release_elements_action.h
@@ -34,4 +34,4 @@ class ReleaseElementsAction : public Action {
 };
 
 }  // namespace autofill_assistant
-#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_ACTIONS_RELEASE_ELEMEMENTS_ACTION_H_
+#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_ACTIONS_RELEASE_ELEMENTS_ACTION_H_
diff --git a/components/autofill_assistant/browser/actions/stopwatch.h b/components/autofill_assistant/browser/actions/stopwatch.h
@@ -91,4 +91,4 @@ class ActionStopwatch {
 };
 
 }  // namespace autofill_assistant
-#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_ACTIONS_ACTION_TIMER_H_
+#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_ACTIONS_STOPWATCH_H_
diff --git a/components/autofill_assistant/browser/actions/use_address_action.h b/components/autofill_assistant/browser/actions/use_address_action.h
@@ -56,4 +56,4 @@ class UseAddressAction : public Action {
 };
 
 }  // namespace autofill_assistant
-#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_ACTIONS_AUTOFILL_ACTION_H_
+#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_ACTIONS_USE_ADDRESS_ACTION_H_
diff --git a/components/autofill_assistant/browser/actions/use_credit_card_action.h b/components/autofill_assistant/browser/actions/use_credit_card_action.h
@@ -61,4 +61,4 @@ class UseCreditCardAction : public Action {
 };
 
 }  // namespace autofill_assistant
-#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_ACTIONS_AUTOFILL_ACTION_H_
+#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_ACTIONS_USE_CREDIT_CARD_ACTION_H_
diff --git a/components/autofill_assistant/browser/intent_strings.h b/components/autofill_assistant/browser/intent_strings.h
@@ -24,4 +24,4 @@ extern const char kShoppingAssistedCheckout[];
 extern const char kTeleport[];
 }  // namespace autofill_assistant
 
-#endif
+#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_INTENT_STRINGS_H_
diff --git a/components/autofill_assistant/browser/public/mock_runtime_manager.h b/components/autofill_assistant/browser/public/mock_runtime_manager.h
@@ -23,4 +23,4 @@ class MockRuntimeManager : public RuntimeManagerImpl {
 
 }  // namespace autofill_assistant
 
-#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_MOCK_CLIENT_H_
+#endif  // COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_PUBLIC_MOCK_RUNTIME_MANAGER_H_
diff --git a/components/blocked_content/pref_names.h b/components/blocked_content/pref_names.h
@@ -13,4 +13,4 @@ extern const char kAbusiveExperienceInterventionEnforce[];
 }  // namespace prefs
 }  // namespace blocked_content
 
-#endif  // COMPONENTS_BLOCKED_CONTENT_PREF_NAMES_H
+#endif  // COMPONENTS_BLOCKED_CONTENT_PREF_NAMES_H_
diff --git a/components/browsing_data/content/conditional_cache_counting_helper.h b/components/browsing_data/content/conditional_cache_counting_helper.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 COMPONENTS_BROWSING_DATA_CONTENT_CONTENT_CONDITIONAL_CACHE_COUNTING_HELPER_H_
-#define COMPONENTS_BROWSING_DATA_CONTENT_CONTENT_CONDITIONAL_CACHE_COUNTING_HELPER_H_
+#ifndef COMPONENTS_BROWSING_DATA_CONTENT_CONDITIONAL_CACHE_COUNTING_HELPER_H_
+#define COMPONENTS_BROWSING_DATA_CONTENT_CONDITIONAL_CACHE_COUNTING_HELPER_H_
 
 #include <memory>
 
@@ -40,4 +40,4 @@ class ConditionalCacheCountingHelper {
 
 }  // namespace browsing_data
 
-#endif  // COMPONENTS_BROWSING_DATA_CONTENT_CONTENT_CONDITIONAL_CACHE_COUNTING_HELPER_H_
+#endif  // COMPONENTS_BROWSING_DATA_CONTENT_CONDITIONAL_CACHE_COUNTING_HELPER_H_
diff --git a/components/browsing_data/content/local_storage_helper.h b/components/browsing_data/content/local_storage_helper.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 COMPONENTS_BROWSING_DATA_CONTENT_CONTENT_LOCAL_STORAGE_HELPER_H_
-#define COMPONENTS_BROWSING_DATA_CONTENT_CONTENT_LOCAL_STORAGE_HELPER_H_
+#ifndef COMPONENTS_BROWSING_DATA_CONTENT_LOCAL_STORAGE_HELPER_H_
+#define COMPONENTS_BROWSING_DATA_CONTENT_LOCAL_STORAGE_HELPER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -94,4 +94,4 @@ class CannedLocalStorageHelper : public LocalStorageHelper {
 
 }  // namespace browsing_data
 
-#endif  // COMPONENTS_BROWSING_DATA_CONTENT_CONTENT_LOCAL_STORAGE_HELPER_H_
+#endif  // COMPONENTS_BROWSING_DATA_CONTENT_LOCAL_STORAGE_HELPER_H_
diff --git a/components/cast_channel/cast_socket_service.h b/components/cast_channel/cast_socket_service.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 COMPONENTS_CAST_CHANNEL_CAST_CHANNEL_SERVICE_H_
-#define COMPONENTS_CAST_CHANNEL_CAST_CHANNEL_SERVICE_H_
+#ifndef COMPONENTS_CAST_CHANNEL_CAST_SOCKET_SERVICE_H_
+#define COMPONENTS_CAST_CHANNEL_CAST_SOCKET_SERVICE_H_
 
 #include <map>
 #include <memory>
@@ -129,4 +129,4 @@ class CastSocketServiceImpl : public CastSocketService {
 
 }  // namespace cast_channel
 
-#endif  // COMPONENTS_CAST_CHANNEL_CAST_CHANNEL_SERVICE_H_
+#endif  // COMPONENTS_CAST_CHANNEL_CAST_SOCKET_SERVICE_H_
diff --git a/components/cdm/common/cdm_manifest.h b/components/cdm/common/cdm_manifest.h
@@ -39,4 +39,4 @@ bool ParseCdmManifestFromPath(const base::FilePath& manifest_path,
                               base::Version* version,
                               content::CdmCapability* capability);
 
-#endif  // CHROME_COMMON_MEDIA_CDM_MANIFEST_H_
+#endif  // COMPONENTS_CDM_COMMON_CDM_MANIFEST_H_
diff --git a/components/cloud_devices/common/cloud_device_description_consts.h b/components/cloud_devices/common/cloud_device_description_consts.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 COMPONENTS_CLOUD_DEVICESCLOUD_DEVICE_DESCRIPTION_CONSTS_H_
-#define COMPONENTS_CLOUD_DEVICESCLOUD_DEVICE_DESCRIPTION_CONSTS_H_
+#ifndef COMPONENTS_CLOUD_DEVICES_COMMON_CLOUD_DEVICE_DESCRIPTION_CONSTS_H_
+#define COMPONENTS_CLOUD_DEVICES_COMMON_CLOUD_DEVICE_DESCRIPTION_CONSTS_H_
 
 // Constants for common parts of JSON representation of CDD/CJT.
 
@@ -22,4 +22,4 @@ extern const char kKeyOption[];
 
 }  // namespace cloud_devices
 
-#endif  // COMPONENTS_CLOUD_DEVICESCLOUD_DEVICE_DESCRIPTION_CONSTS_H_
+#endif  // COMPONENTS_CLOUD_DEVICES_COMMON_CLOUD_DEVICE_DESCRIPTION_CONSTS_H_
diff --git a/components/component_updater/installer_policies/on_device_head_suggest_component_installer.h b/components/component_updater/installer_policies/on_device_head_suggest_component_installer.h
@@ -56,4 +56,4 @@ void RegisterOnDeviceHeadSuggestComponent(ComponentUpdateService* cus,
 
 }  // namespace component_updater
 
-#endif  // CHROME_BROWSER_COMPONENT_UPDATER_ON_DEVICE_HEAD_SUGGEST_COMPONENT_INSTALLER_H_
+#endif  // COMPONENTS_COMPONENT_UPDATER_INSTALLER_POLICIES_ON_DEVICE_HEAD_SUGGEST_COMPONENT_INSTALLER_H_
diff --git a/components/content_settings/core/test/content_settings_mock_provider.h b/components/content_settings/core/test/content_settings_mock_provider.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 COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_MOCK_PROVIDER_H_
-#define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_MOCK_PROVIDER_H_
+#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_TEST_CONTENT_SETTINGS_MOCK_PROVIDER_H_
+#define COMPONENTS_CONTENT_SETTINGS_CORE_TEST_CONTENT_SETTINGS_MOCK_PROVIDER_H_
 
 #include <vector>
 
@@ -51,4 +51,4 @@ class MockProvider : public ObservableProvider {
 
 }  // namespace content_settings
 
-#endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_MOCK_PROVIDER_H_
+#endif  // COMPONENTS_CONTENT_SETTINGS_CORE_TEST_CONTENT_SETTINGS_MOCK_PROVIDER_H_
diff --git a/components/cronet/ios/cronet_consumer/cronet_consumer_app_delegate.h b/components/cronet/ios/cronet_consumer/cronet_consumer_app_delegate.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 IOS_CRONET_CRONET_CONSUMER_CRONET_CONSUMER_APP_DELEGATE_H_
-#define IOS_CRONET_CRONET_CONSUMER_CRONET_CONSUMER_APP_DELEGATE_H_
+#ifndef COMPONENTS_CRONET_IOS_CRONET_CONSUMER_CRONET_CONSUMER_APP_DELEGATE_H_
+#define COMPONENTS_CRONET_IOS_CRONET_CONSUMER_CRONET_CONSUMER_APP_DELEGATE_H_
 
 #import <UIKit/UIKit.h>
 
@@ -17,4 +17,4 @@
 
 @end
 
-#endif  // IOS_CRONET_CRONET_CONSUMER_CRONET_CONSUMER_APP_DELEGATE_H_
+#endif  // COMPONENTS_CRONET_IOS_CRONET_CONSUMER_CRONET_CONSUMER_APP_DELEGATE_H_
diff --git a/components/cronet/ios/cronet_consumer/cronet_consumer_view_controller.h b/components/cronet/ios/cronet_consumer/cronet_consumer_view_controller.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CRONET_CRONET_CONSUMER_CRONET_CONSUMER_VIEW_CONTROLLER_H_
-#define IOS_CRONET_CRONET_CONSUMER_CRONET_CONSUMER_VIEW_CONTROLLER_H_
+#ifndef COMPONENTS_CRONET_IOS_CRONET_CONSUMER_CRONET_CONSUMER_VIEW_CONTROLLER_H_
+#define COMPONENTS_CRONET_IOS_CRONET_CONSUMER_CRONET_CONSUMER_VIEW_CONTROLLER_H_
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
 @interface CronetConsumerViewController : UIViewController
 @end
 
-#endif  // IOS_CRONET_CRONET_CONSUMER_CRONET_CONSUMER_VIEW_CONTROLLER_H_
+#endif  // COMPONENTS_CRONET_IOS_CRONET_CONSUMER_CRONET_CONSUMER_VIEW_CONTROLLER_H_
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.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 COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_AUTH_REQUEST_HANDLER_H_
-#define COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_AUTH_REQUEST_HANDLER_H_
+#ifndef COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_REQUEST_OPTIONS_H_
+#define COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_REQUEST_OPTIONS_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -158,4 +158,4 @@ class DataReductionProxyRequestOptions {
 };
 
 }  // namespace data_reduction_proxy
-#endif  // COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_AUTH_REQUEST_HANDLER_H_
+#endif  // COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DATA_REDUCTION_PROXY_REQUEST_OPTIONS_H_
diff --git a/components/data_reduction_proxy/core/browser/db_data_owner.h b/components/data_reduction_proxy/core/browser/db_data_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 COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DB_SERVICE_H_
-#define COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DB_SERVICE_H_
+#ifndef COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DB_DATA_OWNER_H_
+#define COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DB_DATA_OWNER_H_
 
 #include <memory>
 #include <vector>
@@ -64,4 +64,4 @@ class DBDataOwner {
 };
 
 }  // namespace data_reduction_proxy
-#endif  // COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DB_SERVICE_H_
+#endif  // COMPONENTS_DATA_REDUCTION_PROXY_CORE_BROWSER_DB_DATA_OWNER_H_
diff --git a/components/data_use_measurement/core/data_use_measurement.h b/components/data_use_measurement/core/data_use_measurement.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 COMPONENTS_DATA_USE_MEASUREMENT_CONTENT_DATA_USE_MEASUREMENT_H_
-#define COMPONENTS_DATA_USE_MEASUREMENT_CONTENT_DATA_USE_MEASUREMENT_H_
+#ifndef COMPONENTS_DATA_USE_MEASUREMENT_CORE_DATA_USE_MEASUREMENT_H_
+#define COMPONENTS_DATA_USE_MEASUREMENT_CORE_DATA_USE_MEASUREMENT_H_
 
 #include <stdint.h>
 
@@ -198,4 +198,4 @@ class DataUseMeasurement
 
 }  // namespace data_use_measurement
 
-#endif  // COMPONENTS_DATA_USE_MEASUREMENT_CONTENT_DATA_USE_MEASUREMENT_H_
+#endif  // COMPONENTS_DATA_USE_MEASUREMENT_CORE_DATA_USE_MEASUREMENT_H_
diff --git a/components/device_event_log/device_event_log.h b/components/device_event_log/device_event_log.h
@@ -278,4 +278,4 @@ class DEVICE_EVENT_LOG_EXPORT ScopedDeviceLogIfSlow {
 
 }  // namespace device_event_log
 
-#endif  // DEVICE_EVENT_LOG_DEVICE_EVENT_LOG_H_
+#endif  // COMPONENTS_DEVICE_EVENT_LOG_DEVICE_EVENT_LOG_H_
diff --git a/components/dom_distiller/content/browser/distillability_driver.h b/components/dom_distiller/content/browser/distillability_driver.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 COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLIBILITY_DRIVER_H_
-#define COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLIBILITY_DRIVER_H_
+#ifndef COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLABILITY_DRIVER_H_
+#define COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLABILITY_DRIVER_H_
 
 #include <string>
 
@@ -77,4 +77,4 @@ class DistillabilityDriver
 
 }  // namespace dom_distiller
 
-#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLIBILITY_DRIVER_H_
+#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLABILITY_DRIVER_H_
diff --git a/components/dom_distiller/core/distilled_content_store.h b/components/dom_distiller/core/distilled_content_store.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 COMPONENTS_DOM_DISTILLER_CORE_DOM_DISTILLER_CONTENT_STORE_H_
-#define COMPONENTS_DOM_DISTILLER_CORE_DOM_DISTILLER_CONTENT_STORE_H_
+#ifndef COMPONENTS_DOM_DISTILLER_CORE_DISTILLED_CONTENT_STORE_H_
+#define COMPONENTS_DOM_DISTILLER_CORE_DISTILLED_CONTENT_STORE_H_
 
 #include <memory>
 #include <string>
@@ -87,4 +87,4 @@ class InMemoryContentStore : public DistilledContentStore {
 
 }  // namespace dom_distiller
 
-#endif  // COMPONENTS_DOM_DISTILLER_CORE_DOM_DISTILLER_CONTENT_CACHE_H_
+#endif  // COMPONENTS_DOM_DISTILLER_CORE_DISTILLED_CONTENT_STORE_H_
diff --git a/components/dom_distiller/core/dom_distiller_service_android.h b/components/dom_distiller/core/dom_distiller_service_android.h
@@ -37,4 +37,4 @@ class DomDistillerServiceAndroid {
 }  // namespace android
 }  // namespace dom_distiller
 
-#endif  // COMPONENTS_DOM_DISTILLER_CORE_DOM_DISTILLER_SERVICE_ANDROID_H
+#endif  // COMPONENTS_DOM_DISTILLER_CORE_DOM_DISTILLER_SERVICE_ANDROID_H_
diff --git a/components/domain_reliability/dispatcher.h b/components/domain_reliability/dispatcher.h
@@ -67,4 +67,4 @@ class DOMAIN_RELIABILITY_EXPORT DomainReliabilityDispatcher {
 
 }  // namespace domain_reliability
 
-#endif
+#endif  // COMPONENTS_DOMAIN_RELIABILITY_DISPATCHER_H_
diff --git a/components/download/database/download_db_impl.h b/components/download/database/download_db_impl.h
@@ -90,4 +90,4 @@ class DownloadDBImpl : public DownloadDB {
 
 }  // namespace download
 
-#endif  // COMPONENTS_DOWNLOAD_DATABASE_IN_PROGRESS_DOWNLOAD_DB_IMPL_H_
+#endif  // COMPONENTS_DOWNLOAD_DATABASE_DOWNLOAD_DB_IMPL_H_
diff --git a/components/download/internal/background_service/test/test_download_driver.h b/components/download/internal/background_service/test/test_download_driver.h
@@ -64,4 +64,4 @@ class TestDownloadDriver : public DownloadDriver {
 }  // namespace test
 }  // namespace download
 
-#endif  // COMPONENTS_DOWNLOAD_CONTENT_BACKGROUND_SERVICE_TEST_TEST_DOWNLOAD_DRIVER_H_
+#endif  // COMPONENTS_DOWNLOAD_INTERNAL_BACKGROUND_SERVICE_TEST_TEST_DOWNLOAD_DRIVER_H_
diff --git a/components/download/internal/common/download_worker.h b/components/download/internal/common/download_worker.h
@@ -84,4 +84,4 @@ class COMPONENTS_DOWNLOAD_EXPORT DownloadWorker
 
 }  // namespace download
 
-#endif  // COMPONENTS_DOWNLOAD_PUBLIC_COMMON_DOWNLOAD_WORKER_H_
+#endif  // COMPONENTS_DOWNLOAD_INTERNAL_COMMON_DOWNLOAD_WORKER_H_
diff --git a/components/download/public/background_service/basic_task_scheduler.h b/components/download/public/background_service/basic_task_scheduler.h
@@ -51,4 +51,4 @@ class BasicTaskScheduler : public download::TaskScheduler {
 
 }  // namespace download
 
-#endif  // COMPONENTS_DOWNLOAD_PUBLIC_TASK_TASK_SCHEDULER_H_
+#endif  // COMPONENTS_DOWNLOAD_PUBLIC_BACKGROUND_SERVICE_BASIC_TASK_SCHEDULER_H_
diff --git a/components/download/public/common/download_content.h b/components/download/public/common/download_content.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 COMPONENTS_DOWNLOAD_DOWNLOAD_CONTENT_H_
-#define COMPONENTS_DOWNLOAD_DOWNLOAD_CONTENT_H_
+#ifndef COMPONENTS_DOWNLOAD_PUBLIC_COMMON_DOWNLOAD_CONTENT_H_
+#define COMPONENTS_DOWNLOAD_PUBLIC_COMMON_DOWNLOAD_CONTENT_H_
 
 // The type of download based on mimetype.
 // This is used by UMA and UKM metrics.
@@ -35,4 +35,4 @@ enum class DownloadContent {
 
 }  // namespace download
 
-#endif  // COMPONENTS_DOWNLOAD_DOWNLOAD_CONTENT_H_
+#endif  // COMPONENTS_DOWNLOAD_PUBLIC_COMMON_DOWNLOAD_CONTENT_H_