Fix header guards in ios/.

Generated mechanically as follows:

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

Bug: 1200694
Change-Id: I527e1d601613bee8cab8543ca75bbf47d1dc35b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2838546
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#874769}
GitOrigin-RevId: 392d5bf34ce94c879ceba94d7aec79fe42239dc7
diff --git a/chrome/browser/language/url_language_histogram_factory.h b/chrome/browser/language/url_language_histogram_factory.h
index 25083ef..daf97da 100644
--- a/chrome/browser/language/url_language_histogram_factory.h
+++ b/chrome/browser/language/url_language_histogram_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 IOS_CHROME_BROWSER_LANGUAGE_URL_LANGUAGE_HISTOGRAM_FACTORY_H
-#define IOS_CHROME_BROWSER_LANGUAGE_URL_LANGUAGE_HISTOGRAM_FACTORY_H
+#ifndef IOS_CHROME_BROWSER_LANGUAGE_URL_LANGUAGE_HISTOGRAM_FACTORY_H_
+#define IOS_CHROME_BROWSER_LANGUAGE_URL_LANGUAGE_HISTOGRAM_FACTORY_H_
 
 #include <memory>
 
@@ -43,4 +43,4 @@
   DISALLOW_COPY_AND_ASSIGN(UrlLanguageHistogramFactory);
 };
 
-#endif  // IOS_CHROME_BROWSER_LANGUAGE_URL_LANGUAGE_HISTOGRAM_FACTORY_H
+#endif  // IOS_CHROME_BROWSER_LANGUAGE_URL_LANGUAGE_HISTOGRAM_FACTORY_H_
diff --git a/chrome/browser/passwords/credentials_cleaner_runner_factory.h b/chrome/browser/passwords/credentials_cleaner_runner_factory.h
index 64f2271..7068593 100644
--- a/chrome/browser/passwords/credentials_cleaner_runner_factory.h
+++ b/chrome/browser/passwords/credentials_cleaner_runner_factory.h
@@ -29,4 +29,4 @@
       web::BrowserState* browser_state) const override;
 };
 
-#endif  // IOS_CHROME_BROWSER_PASSWORDSCREDENTIALS_CLEANER_RUNNER_FACTORY_H_
+#endif  // IOS_CHROME_BROWSER_PASSWORDS_CREDENTIALS_CLEANER_RUNNER_FACTORY_H_
diff --git a/chrome/browser/passwords/save_passwords_consumer.h b/chrome/browser/passwords/save_passwords_consumer.h
index b40827e..b897814 100644
--- a/chrome/browser/passwords/save_passwords_consumer.h
+++ b/chrome/browser/passwords/save_passwords_consumer.h
@@ -37,4 +37,4 @@
 
 }  // namespace ios
 
-#endif  // IOS_CHROME_BROWSER_PASSWORDS_IOS_CHROME_PASSWORD_STORE_FACTORY_H_
+#endif  // IOS_CHROME_BROWSER_PASSWORDS_SAVE_PASSWORDS_CONSUMER_H_
diff --git a/chrome/browser/policy/policy_watcher_browser_agent.h b/chrome/browser/policy/policy_watcher_browser_agent.h
index 5963938..cff8372 100644
--- a/chrome/browser/policy/policy_watcher_browser_agent.h
+++ b/chrome/browser/policy/policy_watcher_browser_agent.h
@@ -46,4 +46,4 @@
   std::unique_ptr<PrefChangeRegistrar> prefs_change_observer_;
 };
 
-#endif  // IOS_CHROME_BROWSER_SEND_TAB_TO_SELF_SEND_TAB_TO_SELF_BROWSER_AGENT_H_
+#endif  // IOS_CHROME_BROWSER_POLICY_POLICY_WATCHER_BROWSER_AGENT_H_
diff --git a/chrome/browser/ui/authentication/unified_consent/identity_chooser/identity_chooser_view_controller_presentation_delegate.h b/chrome/browser/ui/authentication/unified_consent/identity_chooser/identity_chooser_view_controller_presentation_delegate.h
index c9b03ce..4ad705c 100644
--- a/chrome/browser/ui/authentication/unified_consent/identity_chooser/identity_chooser_view_controller_presentation_delegate.h
+++ b/chrome/browser/ui/authentication/unified_consent/identity_chooser/identity_chooser_view_controller_presentation_delegate.h
@@ -27,4 +27,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_IDENTITY_CHOOSER_IDENTITY_CHOOSER_VIEW_CONTROLLER_COORDINATOR_DELEGATE_H_
+#endif  // IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_IDENTITY_CHOOSER_IDENTITY_CHOOSER_VIEW_CONTROLLER_PRESENTATION_DELEGATE_H_
diff --git a/chrome/browser/ui/autofill/autofill_ui_type_util.h b/chrome/browser/ui/autofill/autofill_ui_type_util.h
index 719e9ad..c370309 100644
--- a/chrome/browser/ui/autofill/autofill_ui_type_util.h
+++ b/chrome/browser/ui/autofill/autofill_ui_type_util.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_CHROME_BROWSER_UI_AUTOFILL_TYPE_UTIL_H_
-#define IOS_CHROME_BROWSER_UI_AUTOFILL_TYPE_UTIL_H_
+#ifndef IOS_CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_UI_TYPE_UTIL_H_
+#define IOS_CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_UI_TYPE_UTIL_H_
 
 #include "components/autofill/core/browser/field_types.h"
 #import "ios/chrome/browser/ui/autofill/autofill_ui_type.h"
@@ -14,4 +14,4 @@
 // Returns the autofill::ServerFieldType equivalent to |type|.
 autofill::ServerFieldType AutofillTypeFromAutofillUIType(AutofillUIType type);
 
-#endif  // IOS_CHROME_BROWSER_UI_AUTOFILL_TYPE_UTIL_H_
+#endif  // IOS_CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_UI_TYPE_UTIL_H_
diff --git a/chrome/browser/ui/dialogs/java_script_dialog_blocking_state.h b/chrome/browser/ui/dialogs/java_script_dialog_blocking_state.h
index bc2a1ba..155faa5 100644
--- a/chrome/browser/ui/dialogs/java_script_dialog_blocking_state.h
+++ b/chrome/browser/ui/dialogs/java_script_dialog_blocking_state.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_CLEAN_CHROME_BROWSER_UI_DIALOGS_JAVA_SCRIPT_DIALOGS_DIALOG_BLOCKING_JAVA_SCRIPT_DIALOG_BLOCKING_STATE_H_
-#define IOS_CLEAN_CHROME_BROWSER_UI_DIALOGS_JAVA_SCRIPT_DIALOGS_DIALOG_BLOCKING_JAVA_SCRIPT_DIALOG_BLOCKING_STATE_H_
+#ifndef IOS_CHROME_BROWSER_UI_DIALOGS_JAVA_SCRIPT_DIALOG_BLOCKING_STATE_H_
+#define IOS_CHROME_BROWSER_UI_DIALOGS_JAVA_SCRIPT_DIALOG_BLOCKING_STATE_H_
 
 #import <Foundation/Foundation.h>
 
@@ -61,4 +61,4 @@
   DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogBlockingState);
 };
 
-#endif  // IOS_CLEAN_CHROME_BROWSER_UI_DIALOGS_JAVA_SCRIPT_DIALOGS_DIALOG_BLOCKING_JAVA_SCRIPT_DIALOG_BLOCKING_STATE_H_
+#endif  // IOS_CHROME_BROWSER_UI_DIALOGS_JAVA_SCRIPT_DIALOG_BLOCKING_STATE_H_
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_observer.h b/chrome/browser/ui/fullscreen/fullscreen_controller_observer.h
index c907145..fd33de5 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_observer.h
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_observer.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_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_OBSERVER_H_
-#define IOS_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_OBSERVER_H_
+#ifndef IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_OBSERVER_H_
+#define IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_OBSERVER_H_
 
 #import <UIKit/UIKit.h>
 
@@ -55,4 +55,4 @@
   DISALLOW_COPY_AND_ASSIGN(FullscreenControllerObserver);
 };
 
-#endif  // IOS_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_OBSERVER_H_
+#endif  // IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_OBSERVER_H_
diff --git a/chrome/browser/ui/fullscreen/fullscreen_model.h b/chrome/browser/ui/fullscreen/fullscreen_model.h
index cd4ee0e..c3b7e09 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_model.h
+++ b/chrome/browser/ui/fullscreen/fullscreen_model.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_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_MODEL_H_
-#define IOS_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_MODEL_H_
+#ifndef IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_MODEL_H_
+#define IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_MODEL_H_
 
 #import <CoreGraphics/CoreGraphics.h>
 #include <cmath>
@@ -242,4 +242,4 @@
   DISALLOW_COPY_AND_ASSIGN(FullscreenModel);
 };
 
-#endif  // IOS_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_MODEL_H_
+#endif  // IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_MODEL_H_
diff --git a/chrome/browser/ui/fullscreen/fullscreen_ui_element.h b/chrome/browser/ui/fullscreen/fullscreen_ui_element.h
index 924e65b..bffdbb0 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_ui_element.h
+++ b/chrome/browser/ui/fullscreen/fullscreen_ui_element.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_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_UI_ELEMENT_H_
-#define IOS_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_UI_ELEMENT_H_
+#ifndef IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_UI_ELEMENT_H_
+#define IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_UI_ELEMENT_H_
 
 #import <Foundation/Foundation.h>
 
@@ -53,4 +53,4 @@
 
 @end
 
-#endif  // IOS_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_UI_ELEMENT_H_
+#endif  // IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_UI_ELEMENT_H_
diff --git a/chrome/browser/ui/fullscreen/fullscreen_ui_updater.h b/chrome/browser/ui/fullscreen/fullscreen_ui_updater.h
index 4068542..dddbaa7 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_ui_updater.h
+++ b/chrome/browser/ui/fullscreen/fullscreen_ui_updater.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_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_UI_UPDATER_H_
-#define IOS_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_UI_UPDATER_H_
+#ifndef IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_UI_UPDATER_H_
+#define IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_UI_UPDATER_H_
 
 #include "base/scoped_observer.h"
 #import "ios/chrome/browser/ui/fullscreen/fullscreen_controller.h"
@@ -63,4 +63,4 @@
   ScopedObserver<FullscreenController, FullscreenControllerObserver> observer_;
 };
 
-#endif  // IOS_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_UI_UPDATER_H_
+#endif  // IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_UI_UPDATER_H_
diff --git a/chrome/browser/ui/fullscreen/fullscreen_web_state_list_observer.h b/chrome/browser/ui/fullscreen/fullscreen_web_state_list_observer.h
index 72112f2..0d4dee5 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_web_state_list_observer.h
+++ b/chrome/browser/ui/fullscreen/fullscreen_web_state_list_observer.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_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WEB_STATE_LIST_OBSERVER_H_
-#define IOS_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WEB_STATE_LIST_OBSERVER_H_
+#ifndef IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WEB_STATE_LIST_OBSERVER_H_
+#define IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WEB_STATE_LIST_OBSERVER_H_
 
 #include <set>
 
@@ -79,4 +79,4 @@
   std::set<web::WebState*> activated_web_states_;
 };
 
-#endif  // IOS_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WEB_STATE_LIST_OBSERVER_H_
+#endif  // IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WEB_STATE_LIST_OBSERVER_H_
diff --git a/chrome/browser/ui/fullscreen/fullscreen_web_state_observer.h b/chrome/browser/ui/fullscreen/fullscreen_web_state_observer.h
index 597b3ff..3d00f62 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_web_state_observer.h
+++ b/chrome/browser/ui/fullscreen/fullscreen_web_state_observer.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_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WEB_STATE_OBSERVER_H_
-#define IOS_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WEB_STATE_OBSERVER_H_
+#ifndef IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WEB_STATE_OBSERVER_H_
+#define IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WEB_STATE_OBSERVER_H_
 
 #include "ios/web/public/web_state_observer.h"
 #include "url/gurl.h"
@@ -47,4 +47,4 @@
   GURL last_navigation_url_;
 };
 
-#endif  // IOS_CLEAN_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WEB_STATE_OBSERVER_H_
+#endif  // IOS_CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WEB_STATE_OBSERVER_H_
diff --git a/chrome/browser/ui/history/history_entry_item.h b/chrome/browser/ui/history/history_entry_item.h
index 131b021..9cd175d 100644
--- a/chrome/browser/ui/history/history_entry_item.h
+++ b/chrome/browser/ui/history/history_entry_item.h
@@ -29,4 +29,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_HISTORY_LEGACY_HISTORY_ENTRY_ITEM_H_
+#endif  // IOS_CHROME_BROWSER_UI_HISTORY_HISTORY_ENTRY_ITEM_H_
diff --git a/chrome/browser/ui/location_bar/location_bar_url_loader.h b/chrome/browser/ui/location_bar/location_bar_url_loader.h
index c7cbeea..6b0ccd9 100644
--- a/chrome/browser/ui/location_bar/location_bar_url_loader.h
+++ b/chrome/browser/ui/location_bar/location_bar_url_loader.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_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_URL_LOADER_H_
-#define IOS_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_URL_LOADER_H_
+#ifndef IOS_CHROME_BROWSER_UI_LOCATION_BAR_LOCATION_BAR_URL_LOADER_H_
+#define IOS_CHROME_BROWSER_UI_LOCATION_BAR_LOCATION_BAR_URL_LOADER_H_
 
 #import <Foundation/Foundation.h>
 
@@ -21,4 +21,4 @@
                     disposition:(WindowOpenDisposition)disposition;
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_URL_LOADER_H_
+#endif  // IOS_CHROME_BROWSER_UI_LOCATION_BAR_LOCATION_BAR_URL_LOADER_H_
diff --git a/chrome/browser/ui/ntp/new_tab_page_controller_delegate.h b/chrome/browser/ui/ntp/new_tab_page_controller_delegate.h
index 9e9cf32..c4d3da8 100644
--- a/chrome/browser/ui/ntp/new_tab_page_controller_delegate.h
+++ b/chrome/browser/ui/ntp/new_tab_page_controller_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_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_CONTROLLER_PROTOCOL_H_
-#define IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_CONTROLLER_PROTOCOL_H_
+#ifndef IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_CONTROLLER_DELEGATE_H_
+#define IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_CONTROLLER_DELEGATE_H_
 
 // Delete for NTP and it's subclasses to communicate with the toolbar.
 @protocol NewTabPageControllerDelegate
@@ -15,4 +15,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_CONTROLLER_PROTOCOL_H_
+#endif  // IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_CONTROLLER_DELEGATE_H_
diff --git a/chrome/browser/ui/omnibox/location_bar_delegate.h b/chrome/browser/ui/omnibox/location_bar_delegate.h
index 3a57655..76978ef 100644
--- a/chrome/browser/ui/omnibox/location_bar_delegate.h
+++ b/chrome/browser/ui/omnibox/location_bar_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_SHARED_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_DELEGATE_H_
-#define IOS_SHARED_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_DELEGATE_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_DELEGATE_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_DELEGATE_H_
 
 #import <Foundation/Foundation.h>
 
@@ -21,4 +21,4 @@
 - (LocationBarModel*)locationBarModel;
 @end
 
-#endif  // IOS_SHARED_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_DELEGATE_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_DELEGATE_H_
diff --git a/chrome/browser/ui/omnibox/popup/omnibox_popup_mediator.h b/chrome/browser/ui/omnibox/popup/omnibox_popup_mediator.h
index 71dcc76..b24d948 100644
--- a/chrome/browser/ui/omnibox/popup/omnibox_popup_mediator.h
+++ b/chrome/browser/ui/omnibox/popup/omnibox_popup_mediator.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_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_MEDIATOR_H_
-#define IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_MEDIATOR_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_MEDIATOR_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_MEDIATOR_H_
 
 #import <UIKit/UIKit.h>
 #include "components/omnibox/browser/autocomplete_result.h"
@@ -91,4 +91,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_MEDIATOR_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_MEDIATOR_H_
diff --git a/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.h b/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.h
index 62a55c1..0393698 100644
--- a/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.h
+++ b/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.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_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_PRESENTER_H_
-#define IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_PRESENTER_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_PRESENTER_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_PRESENTER_H_
 
 #import <UIKit/UIKit.h>
 
@@ -45,4 +45,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_PRESENTER_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_PRESENTER_H_
diff --git a/chrome/browser/ui/omnibox/popup/omnibox_popup_provider.h b/chrome/browser/ui/omnibox/popup/omnibox_popup_provider.h
index 3a4a690..83a526d 100644
--- a/chrome/browser/ui/omnibox/popup/omnibox_popup_provider.h
+++ b/chrome/browser/ui/omnibox/popup/omnibox_popup_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 IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_PROVIDER_H_
-#define IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_PROVIDER_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_PROVIDER_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_PROVIDER_H_
 
 #import <UIKit/UIKit.h>
 
@@ -17,4 +17,4 @@
       UISemanticContentAttribute semanticContentAttrbute) = 0;
 };
 
-#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_PROVIDER_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_PROVIDER_H_
diff --git a/chrome/browser/ui/omnibox/popup/omnibox_popup_view_ios.h b/chrome/browser/ui/omnibox/popup/omnibox_popup_view_ios.h
index 7a9683d..a594002 100644
--- a/chrome/browser/ui/omnibox/popup/omnibox_popup_view_ios.h
+++ b/chrome/browser/ui/omnibox/popup/omnibox_popup_view_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 IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_VIEW_IOS_H_
-#define IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_VIEW_IOS_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_VIEW_IOS_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_VIEW_IOS_H_
 
 #import <UIKit/UIKit.h>
 
@@ -68,4 +68,4 @@
   OmniboxPopupMediator* mediator_;
 };
 
-#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_VIEW_IOS_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_VIEW_IOS_H_
diff --git a/chrome/browser/ui/omnibox/popup/omnibox_popup_view_suggestions_delegate.h b/chrome/browser/ui/omnibox/popup/omnibox_popup_view_suggestions_delegate.h
index c11367b..f559848 100644
--- a/chrome/browser/ui/omnibox/popup/omnibox_popup_view_suggestions_delegate.h
+++ b/chrome/browser/ui/omnibox/popup/omnibox_popup_view_suggestions_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_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_VIEW_SUGGESTIONS_DELEGATE_H_
-#define IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_VIEW_SUGGESTIONS_DELEGATE_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_VIEW_SUGGESTIONS_DELEGATE_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_VIEW_SUGGESTIONS_DELEGATE_H_
 
 #include "base/optional.h"
 #include "components/omnibox/browser/suggestion_answer.h"
@@ -42,4 +42,4 @@
                                          size_t index) = 0;
 };
 
-#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_VIEW_SUGGESTIONS_DELEGATE_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_VIEW_SUGGESTIONS_DELEGATE_H_
diff --git a/chrome/browser/ui/omnibox/web_omnibox_edit_controller.h b/chrome/browser/ui/omnibox/web_omnibox_edit_controller.h
index d7f8de5..3c549f9 100644
--- a/chrome/browser/ui/omnibox/web_omnibox_edit_controller.h
+++ b/chrome/browser/ui/omnibox/web_omnibox_edit_controller.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_SHARED_CHROME_BROWSER_UI_OMNIBOX_WEB_OMNIBOX_EDIT_CONTROLLER_H_
-#define IOS_SHARED_CHROME_BROWSER_UI_OMNIBOX_WEB_OMNIBOX_EDIT_CONTROLLER_H_
+#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_WEB_OMNIBOX_EDIT_CONTROLLER_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_WEB_OMNIBOX_EDIT_CONTROLLER_H_
 
 #include "base/macros.h"
 #include "components/omnibox/browser/omnibox_edit_controller.h"
@@ -33,4 +33,4 @@
   DISALLOW_COPY_AND_ASSIGN(WebOmniboxEditController);
 };
 
-#endif  // IOS_SHARED_CHROME_BROWSER_UI_OMNIBOX_WEB_OMNIBOX_EDIT_CONTROLLER_H_
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_WEB_OMNIBOX_EDIT_CONTROLLER_H_
diff --git a/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_table_view_controller.h b/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_table_view_controller.h
index b0cc4ea..5f23717 100644
--- a/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_table_view_controller.h
+++ b/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_table_view_controller.h
@@ -34,4 +34,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_HISTORY_CLEAR_BROWSING_DATA_TABLE_VIEW_CONTROLLER_H_
+#endif  // IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_CLEAR_BROWSING_DATA_TABLE_VIEW_CONTROLLER_H_
diff --git a/chrome/browser/ui/settings/clear_browsing_data/fake_browsing_data_counter_wrapper_producer.h b/chrome/browser/ui/settings/clear_browsing_data/fake_browsing_data_counter_wrapper_producer.h
index d85fa0f..0ff0faa 100644
--- a/chrome/browser/ui/settings/clear_browsing_data/fake_browsing_data_counter_wrapper_producer.h
+++ b/chrome/browser/ui/settings/clear_browsing_data/fake_browsing_data_counter_wrapper_producer.h
@@ -11,4 +11,4 @@
     : BrowsingDataCounterWrapperProducer
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_BROWSING_DATA_COUNTER_WRAPPER_PRODUCER_H_
+#endif  // IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_FAKE_BROWSING_DATA_COUNTER_WRAPPER_PRODUCER_H_
diff --git a/chrome/browser/url_loading/test_scene_url_loading_service.h b/chrome/browser/url_loading/test_scene_url_loading_service.h
index 5498016..5fb56f6 100644
--- a/chrome/browser/url_loading/test_scene_url_loading_service.h
+++ b/chrome/browser/url_loading/test_scene_url_loading_service.h
@@ -30,4 +30,4 @@
   Browser* current_browser_;
 };
 
-#endif  // IOS_CHROME_BROWSER_URL_LOADING_APP_URL_LOADING_SERVICE_H_
+#endif  // IOS_CHROME_BROWSER_URL_LOADING_TEST_SCENE_URL_LOADING_SERVICE_H_
diff --git a/chrome/common/app_group/app_group_field_trial_version.h b/chrome/common/app_group/app_group_field_trial_version.h
index 464ae05..4c47935 100644
--- a/chrome/common/app_group/app_group_field_trial_version.h
+++ b/chrome/common/app_group/app_group_field_trial_version.h
@@ -17,4 +17,4 @@
 // The dictionary key for the trial version.
 extern NSString* const kFieldTrialVersionKey;
 
-#endif /* IOS_CHROME_COMMON_APP_GROUP_APP_GROUP_FIELD_TRIAL_VERSION_H_ */
+#endif  // IOS_CHROME_COMMON_APP_GROUP_APP_GROUP_FIELD_TRIAL_VERSION_H_
diff --git a/chrome/common/app_group/app_group_utils.h b/chrome/common/app_group/app_group_utils.h
index 5c9d79f..bf5b5c3 100644
--- a/chrome/common/app_group/app_group_utils.h
+++ b/chrome/common/app_group/app_group_utils.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_CHROME_COMMON_APP_GROUP_APP_GROUP_UTILSS_H_
-#define IOS_CHROME_COMMON_APP_GROUP_APP_GROUP_UTILSS_H_
+#ifndef IOS_CHROME_COMMON_APP_GROUP_APP_GROUP_UTILS_H_
+#define IOS_CHROME_COMMON_APP_GROUP_APP_GROUP_UTILS_H_
 
 namespace app_group {
 
@@ -18,4 +18,4 @@
 
 }  // namespace app_group
 
-#endif  // IOS_CHROME_COMMON_APP_GROUP_APP_GROUP_UTILSS_H_
+#endif  // IOS_CHROME_COMMON_APP_GROUP_APP_GROUP_UTILS_H_
diff --git a/chrome/test/app/window_test_util.h b/chrome/test/app/window_test_util.h
index 0253e92..0ae9a13 100644
--- a/chrome/test/app/window_test_util.h
+++ b/chrome/test/app/window_test_util.h
@@ -30,4 +30,4 @@
 
 }  // namespace chrome_test_util
 
-#endif
+#endif  // IOS_CHROME_TEST_APP_WINDOW_TEST_UTIL_H_
diff --git a/components/io_thread/ios_io_thread.h b/components/io_thread/ios_io_thread.h
index 9149393..cf8f78c 100644
--- a/components/io_thread/ios_io_thread.h
+++ b/components/io_thread/ios_io_thread.h
@@ -214,4 +214,4 @@
 
 }  // namespace io_thread
 
-#endif  // IOS_COMPONENTS_IO_THREAD_IO_THREAD_H_
+#endif  // IOS_COMPONENTS_IO_THREAD_IOS_IO_THREAD_H_
diff --git a/net/cookies/system_cookie_store_unittest_template.h b/net/cookies/system_cookie_store_unittest_template.h
index 0c81ce1..fe7b256 100644
--- a/net/cookies/system_cookie_store_unittest_template.h
+++ b/net/cookies/system_cookie_store_unittest_template.h
@@ -287,4 +287,4 @@
 
 }  // namespace net
 
-#endif  // IOS_NET_COOKIES_SYSTEM_COOKIE_STORE_UNITTEST_TEMPLATE_H
+#endif  // IOS_NET_COOKIES_SYSTEM_COOKIE_STORE_UNITTEST_TEMPLATE_H_
diff --git a/showcase/bubble/sc_bubble_coordinator.h b/showcase/bubble/sc_bubble_coordinator.h
index c99ac4c..cdc7bf1 100644
--- a/showcase/bubble/sc_bubble_coordinator.h
+++ b/showcase/bubble/sc_bubble_coordinator.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_SHOWCASE_TOOLBAR_SC_BUBBLE_COORDINATOR_H_
-#define IOS_SHOWCASE_TOOLBAR_SC_BUBBLE_COORDINATOR_H_
+#ifndef IOS_SHOWCASE_BUBBLE_SC_BUBBLE_COORDINATOR_H_
+#define IOS_SHOWCASE_BUBBLE_SC_BUBBLE_COORDINATOR_H_
 
 #import "ios/showcase/common/navigation_coordinator.h"
 
 @interface SCBubbleCoordinator : NSObject<NavigationCoordinator>
 @end
 
-#endif  // IOS_SHOWCASE_TOOLBAR_SC_BUBBLE_COORDINATOR_H_
+#endif  // IOS_SHOWCASE_BUBBLE_SC_BUBBLE_COORDINATOR_H_
diff --git a/showcase/content_suggestions/sc_content_suggestions_item.h b/showcase/content_suggestions/sc_content_suggestions_item.h
index 24f4fcf..e060ef2 100644
--- a/showcase/content_suggestions/sc_content_suggestions_item.h
+++ b/showcase/content_suggestions/sc_content_suggestions_item.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_SHOWCASE_CONTENT_SUGGESTIONS_SC_CONTENT_SUGGESTIONS_ITEMS_H_
-#define IOS_SHOWCASE_CONTENT_SUGGESTIONS_SC_CONTENT_SUGGESTIONS_ITEMS_H_
+#ifndef IOS_SHOWCASE_CONTENT_SUGGESTIONS_SC_CONTENT_SUGGESTIONS_ITEM_H_
+#define IOS_SHOWCASE_CONTENT_SUGGESTIONS_SC_CONTENT_SUGGESTIONS_ITEM_H_
 
 #import <UIKit/UIKit.h>
 
@@ -25,4 +25,4 @@
 
 @end
 
-#endif  // IOS_SHOWCASE_CONTENT_SUGGESTIONS_SC_CONTENT_SUGGESTIONS_ITEMS_H_
+#endif  // IOS_SHOWCASE_CONTENT_SUGGESTIONS_SC_CONTENT_SUGGESTIONS_ITEM_H_
diff --git a/showcase/widget/sc_content_widget_coordinator.h b/showcase/widget/sc_content_widget_coordinator.h
index 501d08b..52b11c6 100644
--- a/showcase/widget/sc_content_widget_coordinator.h
+++ b/showcase/widget/sc_content_widget_coordinator.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_SHOWCASE_TOOLBAR_SC_CONTENT_WIDGET_COORDINATOR_H_
-#define IOS_SHOWCASE_TOOLBAR_SC_CONTENT_WIDGET_COORDINATOR_H_
+#ifndef IOS_SHOWCASE_WIDGET_SC_CONTENT_WIDGET_COORDINATOR_H_
+#define IOS_SHOWCASE_WIDGET_SC_CONTENT_WIDGET_COORDINATOR_H_
 
 #import <UIKit/UIKit.h>
 
@@ -12,4 +12,4 @@
 @interface SCContentWidgetCoordinator : NSObject<NavigationCoordinator>
 @end
 
-#endif  // IOS_SHOWCASE_TOOLBAR_SC_CONTENT_WIDGET_COORDINATOR_H_
+#endif  // IOS_SHOWCASE_WIDGET_SC_CONTENT_WIDGET_COORDINATOR_H_
diff --git a/showcase/widget/sc_search_widget_coordinator.h b/showcase/widget/sc_search_widget_coordinator.h
index dea87b2..77154ce 100644
--- a/showcase/widget/sc_search_widget_coordinator.h
+++ b/showcase/widget/sc_search_widget_coordinator.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_SHOWCASE_TOOLBAR_SC_SEARCH_WIDGET_COORDINATOR_H_
-#define IOS_SHOWCASE_TOOLBAR_SC_SEARCH_WIDGET_COORDINATOR_H_
+#ifndef IOS_SHOWCASE_WIDGET_SC_SEARCH_WIDGET_COORDINATOR_H_
+#define IOS_SHOWCASE_WIDGET_SC_SEARCH_WIDGET_COORDINATOR_H_
 
 #import <UIKit/UIKit.h>
 
@@ -12,4 +12,4 @@
 @interface SCSearchWidgetCoordinator : NSObject<NavigationCoordinator>
 @end
 
-#endif  // IOS_SHOWCASE_TOOLBAR_SC_SEARCH_WIDGET_COORDINATOR_H_
+#endif  // IOS_SHOWCASE_WIDGET_SC_SEARCH_WIDGET_COORDINATOR_H_
diff --git a/web/js_messaging/web_frames_manager_impl.h b/web/js_messaging/web_frames_manager_impl.h
index 30dfcfd..b3223fa 100644
--- a/web/js_messaging/web_frames_manager_impl.h
+++ b/web/js_messaging/web_frames_manager_impl.h
@@ -94,4 +94,4 @@
 
 }  // namespace web
 
-#endif  // IOS_WEB_WEB_STATE_WEB_FRAMES_MANAGER_H_
+#endif  // IOS_WEB_JS_MESSAGING_WEB_FRAMES_MANAGER_IMPL_H_
diff --git a/web/navigation/session_storage_builder.h b/web/navigation/session_storage_builder.h
index 0caf846..a58eea4 100644
--- a/web/navigation/session_storage_builder.h
+++ b/web/navigation/session_storage_builder.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_WEB_NAVIGATION_SERIALIZED_NAVIGATION_MANAGER_BUILDER_H_
-#define IOS_WEB_NAVIGATION_SERIALIZED_NAVIGATION_MANAGER_BUILDER_H_
+#ifndef IOS_WEB_NAVIGATION_SESSION_STORAGE_BUILDER_H_
+#define IOS_WEB_NAVIGATION_SESSION_STORAGE_BUILDER_H_
 
 @class CRWSessionStorage;
 
@@ -27,4 +27,4 @@
 
 }  // namespace web
 
-#endif  // IOS_WEB_NAVIGATION_SERIALIZED_NAVIGATION_MANAGER_BUILDER_H_
+#endif  // IOS_WEB_NAVIGATION_SESSION_STORAGE_BUILDER_H_
diff --git a/web/public/test/fakes/fake_web_client.h b/web/public/test/fakes/fake_web_client.h
index 0e068d8..e1ac874 100644
--- a/web/public/test/fakes/fake_web_client.h
+++ b/web/public/test/fakes/fake_web_client.h
@@ -78,4 +78,4 @@
 
 }  // namespace web
 
-#endif  // IOS_WEB_PUBLIC_TEST_FAKES_TEST_WEB_CLIENT_H_
+#endif  // IOS_WEB_PUBLIC_TEST_FAKES_FAKE_WEB_CLIENT_H_
diff --git a/web/test/fakes/crw_fake_back_forward_list.h b/web/test/fakes/crw_fake_back_forward_list.h
index 3793394..17432fe 100644
--- a/web/test/fakes/crw_fake_back_forward_list.h
+++ b/web/test/fakes/crw_fake_back_forward_list.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_WEB_NAVIGATION_CRW_TEST_BACK_FORWARD_LIST_H_
-#define IOS_WEB_NAVIGATION_CRW_TEST_BACK_FORWARD_LIST_H_
+#ifndef IOS_WEB_TEST_FAKES_CRW_FAKE_BACK_FORWARD_LIST_H_
+#define IOS_WEB_TEST_FAKES_CRW_FAKE_BACK_FORWARD_LIST_H_
 
 #import <Foundation/Foundation.h>
 
@@ -50,4 +50,4 @@
 
 NS_ASSUME_NONNULL_END
 
-#endif  // IOS_WEB_NAVIGATION_CRW_TEST_BACK_FORWARD_LIST_H_
+#endif  // IOS_WEB_TEST_FAKES_CRW_FAKE_BACK_FORWARD_LIST_H_
diff --git a/web/web_state/ui/crw_web_view_navigation_proxy.h b/web/web_state/ui/crw_web_view_navigation_proxy.h
index b8231ab..c70c4ab 100644
--- a/web/web_state/ui/crw_web_view_navigation_proxy.h
+++ b/web/web_state/ui/crw_web_view_navigation_proxy.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_WEB_WEB_STATE_UI_WEB_VIEW_NAVIGATION_PROXY_H_
-#define IOS_WEB_WEB_STATE_UI_WEB_VIEW_NAVIGATION_PROXY_H_
+#ifndef IOS_WEB_WEB_STATE_UI_CRW_WEB_VIEW_NAVIGATION_PROXY_H_
+#define IOS_WEB_WEB_STATE_UI_CRW_WEB_VIEW_NAVIGATION_PROXY_H_
 
 #import <WebKit/WebKit.h>
 
@@ -18,4 +18,4 @@
 @end
 NS_ASSUME_NONNULL_END
 
-#endif  // IOS_WEB_WEB_STATE_UI_WEB_VIEW_NAVIGATION_PROXY_H_
+#endif  // IOS_WEB_WEB_STATE_UI_CRW_WEB_VIEW_NAVIGATION_PROXY_H_
diff --git a/web_view/internal/cwv_navigation_type_internal.h b/web_view/internal/cwv_navigation_type_internal.h
index 6df742d..14e85dd 100644
--- a/web_view/internal/cwv_navigation_type_internal.h
+++ b/web_view/internal/cwv_navigation_type_internal.h
@@ -1,8 +1,8 @@
 // Copyright 2017 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 IOS_WEB_VIEW_PUBLIC_CWV_PAGE_TRANSITION_INTERNAL_H_
-#define IOS_WEB_VIEW_PUBLIC_CWV_PAGE_TRANSITION_INTERNAL_H_
+#ifndef IOS_WEB_VIEW_INTERNAL_CWV_NAVIGATION_TYPE_INTERNAL_H_
+#define IOS_WEB_VIEW_INTERNAL_CWV_NAVIGATION_TYPE_INTERNAL_H_
 
 #include "ios/web_view/public/cwv_navigation_type.h"
 #include "ui/base/page_transition_types.h"
@@ -15,4 +15,4 @@
 
 NS_ASSUME_NONNULL_END
 
-#endif  // IOS_WEB_VIEW_PUBLIC_CWV_PAGE_TRANSITION_INTERNAL_H_
+#endif  // IOS_WEB_VIEW_INTERNAL_CWV_NAVIGATION_TYPE_INTERNAL_H_
diff --git a/web_view/internal/webdata_services/web_view_web_data_service_wrapper_factory.h b/web_view/internal/webdata_services/web_view_web_data_service_wrapper_factory.h
index 5ae487a..53ec7a5 100644
--- a/web_view/internal/webdata_services/web_view_web_data_service_wrapper_factory.h
+++ b/web_view/internal/webdata_services/web_view_web_data_service_wrapper_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 IOS_WEB_VIEW_INTERNAL_WEBDATA_SERVICES_WEB_VIEW_WEB_DATA_SERVICE_WRAPPER_FACTORY_H
-#define IOS_WEB_VIEW_INTERNAL_WEBDATA_SERVICES_WEB_VIEW_WEB_DATA_SERVICE_WRAPPER_FACTORY_H
+#ifndef IOS_WEB_VIEW_INTERNAL_WEBDATA_SERVICES_WEB_VIEW_WEB_DATA_SERVICE_WRAPPER_FACTORY_H_
+#define IOS_WEB_VIEW_INTERNAL_WEBDATA_SERVICES_WEB_VIEW_WEB_DATA_SERVICE_WRAPPER_FACTORY_H_
 
 #include <memory>
 
@@ -71,4 +71,4 @@
 
 }  // namespace ios_web_view
 
-#endif  // IOS_WEB_VIEW_INTERNAL_WEBDATA_SERVICES_WEB_VIEW_WEB_DATA_SERVICE_WRAPPER_FACTORY_H
+#endif  // IOS_WEB_VIEW_INTERNAL_WEBDATA_SERVICES_WEB_VIEW_WEB_DATA_SERVICE_WRAPPER_FACTORY_H_
diff --git a/web_view/public/cwv_navigation_type.h b/web_view/public/cwv_navigation_type.h
index 99cc701..da95b1a 100644
--- a/web_view/public/cwv_navigation_type.h
+++ b/web_view/public/cwv_navigation_type.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_WEB_VIEW_PUBLIC_CWV_PAGE_TRANSITION_H_
-#define IOS_WEB_VIEW_PUBLIC_CWV_PAGE_TRANSITION_H_
+#ifndef IOS_WEB_VIEW_PUBLIC_CWV_NAVIGATION_TYPE_H_
+#define IOS_WEB_VIEW_PUBLIC_CWV_NAVIGATION_TYPE_H_
 
 #import <Foundation/Foundation.h>
 
@@ -133,4 +133,4 @@
 
 NS_ASSUME_NONNULL_END
 
-#endif  // IOS_WEB_VIEW_PUBLIC_CWV_PAGE_TRANSITION_H_
+#endif  // IOS_WEB_VIEW_PUBLIC_CWV_NAVIGATION_TYPE_H_
diff --git a/web_view/public/cwv_translation_controller_delegate.h b/web_view/public/cwv_translation_controller_delegate.h
index 80b21fe..1216d8d 100644
--- a/web_view/public/cwv_translation_controller_delegate.h
+++ b/web_view/public/cwv_translation_controller_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_WEB_VIEW_PUBLIC_CWV_TRANSLATION_CONTROLLER_DELEGATE_H
-#define IOS_WEB_VIEW_PUBLIC_CWV_TRANSLATION_CONTROLLER_DELEGATE_H
+#ifndef IOS_WEB_VIEW_PUBLIC_CWV_TRANSLATION_CONTROLLER_DELEGATE_H_
+#define IOS_WEB_VIEW_PUBLIC_CWV_TRANSLATION_CONTROLLER_DELEGATE_H_
 
 #import <Foundation/Foundation.h>
 
@@ -46,4 +46,4 @@
 
 NS_ASSUME_NONNULL_END
 
-#endif  // IOS_WEB_VIEW_PUBLIC_CWV_TRANSLATION_CONTROLLER_DELEGATE_H
+#endif  // IOS_WEB_VIEW_PUBLIC_CWV_TRANSLATION_CONTROLLER_DELEGATE_H_