From ad3bc6fc9f76acc0e8e2b0398f7a27c002d17ed4 Mon Sep 17 00:00:00 2001
From: petemill <miller.pete+commit@gmail.com>
Date: Fri, 17 May 2019 10:09:35 -0700
Subject: [PATCH] Lint fixes from #2384

---
 browser/ui/webui/navigation_bar_data_provider.h    | 14 +++++++-------
 .../browser/ui/webui/bookmarks/bookmarks_ui.cc     |  2 +-
 chromium_src/chrome/browser/ui/webui/history_ui.cc |  2 +-
 chromium_src/ui/base/webui/web_ui_util.cc          |  7 ++++++-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/browser/ui/webui/navigation_bar_data_provider.h b/browser/ui/webui/navigation_bar_data_provider.h
index db431bbc23df..8736ecc07182 100644
--- a/browser/ui/webui/navigation_bar_data_provider.h
+++ b/browser/ui/webui/navigation_bar_data_provider.h
@@ -3,18 +3,18 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // you can obtain one at http://mozilla.org/MPL/2.0/.
 
-#ifndef BRAVE_BROWSER_UI_WEBUI_NAVIGATION_BAR_DATA_PROVIDER_H
-#define BRAVE_BROWSER_UI_WEBUI_NAVIGATION_BAR_DATA_PROVIDER_H
+#ifndef BRAVE_BROWSER_UI_WEBUI_NAVIGATION_BAR_DATA_PROVIDER_H_
+#define BRAVE_BROWSER_UI_WEBUI_NAVIGATION_BAR_DATA_PROVIDER_H_
 
 namespace content {
 class WebUIDataSource;
 }
 
 class NavigationBarDataProvider {
-  public:
-    // Sets load-time constants on |source|. This handles a flicker-free initial
-    // page load (i.e. loadTimeData.getString('brToolbarSettingsTitle')).
-    static void Initialize(content::WebUIDataSource* source);
+ public:
+  // Sets load-time constants on |source|. This handles a flicker-free initial
+  // page load (i.e. loadTimeData.getString('brToolbarSettingsTitle')).
+  static void Initialize(content::WebUIDataSource* source);
 };
 
-#endif
+#endif  // BRAVE_BROWSER_UI_WEBUI_NAVIGATION_BAR_DATA_PROVIDER_H_
diff --git a/chromium_src/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc b/chromium_src/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
index ee3a704ee741..f9f07dab0a91 100644
--- a/chromium_src/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
+++ b/chromium_src/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc
@@ -13,5 +13,5 @@ void BraveCustomizeBookmarksDataSource(content::WebUIDataSource* source) {
 
 }  // namespace
 
-#include "../../../../../../chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc"
+#include "../../../../../../chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc"  // NOLINT
 
diff --git a/chromium_src/chrome/browser/ui/webui/history_ui.cc b/chromium_src/chrome/browser/ui/webui/history_ui.cc
index e24e6f19e7fa..19b6cc25cc3b 100644
--- a/chromium_src/chrome/browser/ui/webui/history_ui.cc
+++ b/chromium_src/chrome/browser/ui/webui/history_ui.cc
@@ -13,5 +13,5 @@ void BraveCustomizeHistoryDataSource(content::WebUIDataSource* source) {
 
 }  // namespace
 
-#include "../../../../../chrome/browser/ui/webui/history_ui.cc"
+#include "../../../../../chrome/browser/ui/webui/history_ui.cc"  // NOLINT
 
diff --git a/chromium_src/ui/base/webui/web_ui_util.cc b/chromium_src/ui/base/webui/web_ui_util.cc
index 4f8bb7f0e875..4d44d431f3a7 100644
--- a/chromium_src/ui/base/webui/web_ui_util.cc
+++ b/chromium_src/ui/base/webui/web_ui_util.cc
@@ -1,3 +1,8 @@
+// Copyright (c) 2019 The Brave Authors
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// you can obtain one at http://mozilla.org/MPL/2.0/.
+
 #include "ui/base/webui/web_ui_util.h"
 
 #include "brave/ui/webui/resources/grit/brave_webui_resources.h"
@@ -8,7 +13,7 @@
 #define IDR_WEBUI_CSS_TEXT_DEFAULTS_MD_PREVIOUS IDR_WEBUI_CSS_TEXT_DEFAULTS_MD
 #undef IDR_WEBUI_CSS_TEXT_DEFAULTS_MD
 #define IDR_WEBUI_CSS_TEXT_DEFAULTS_MD IDR_BRAVE_WEBUI_CSS_TEXT_DEFAULTS
-#include "../../../../../ui/base/webui/web_ui_util.cc"
+#include "../../../../../ui/base/webui/web_ui_util.cc"  // NOLINT
 #undef IDR_WEBUI_CSS_TEXT_DEFAULTS_MD
 #define IDR_WEBUI_CSS_TEXT_DEFAULTS_MD IDR_WEBUI_CSS_TEXT_DEFAULTS_MD_PREVIOUS