From bbc3e7d7f7ef3718110569ea79910460f130a2ec Mon Sep 17 00:00:00 2001
From: bridiver <github@brianjohnson.cc>
Date: Tue, 14 May 2019 18:09:10 -0700
Subject: [PATCH] lint fixes

---
 .../brave_rewards/browser/publisher_info_database.cc     | 1 +
 .../browser/publisher_info_database_unittest.cc          | 1 +
 .../browser/rewards_service_private_observer.h           | 9 +++++----
 .../confirmations/internal/confirmations_client_mock.h   | 2 +-
 .../include/bat/ledger/publisher_info.h                  | 2 --
 .../src/bat/ledger/internal/bat_publishers_unittest.cc   | 2 ++
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/components/brave_rewards/browser/publisher_info_database.cc b/components/brave_rewards/browser/publisher_info_database.cc
index 8f52015c37b2..ed53d8315705 100644
--- a/components/brave_rewards/browser/publisher_info_database.cc
+++ b/components/brave_rewards/browser/publisher_info_database.cc
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include <string>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
diff --git a/components/brave_rewards/browser/publisher_info_database_unittest.cc b/components/brave_rewards/browser/publisher_info_database_unittest.cc
index fb69584d55b9..61f52b9d391a 100644
--- a/components/brave_rewards/browser/publisher_info_database_unittest.cc
+++ b/components/brave_rewards/browser/publisher_info_database_unittest.cc
@@ -6,6 +6,7 @@
 #include <fstream>
 #include <streambuf>
 #include <string>
+#include <utility>
 
 #include "brave/components/brave_rewards/browser/publisher_info_database.h"
 
diff --git a/components/brave_rewards/browser/rewards_service_private_observer.h b/components/brave_rewards/browser/rewards_service_private_observer.h
index d6ca48d662c9..75e531aecda6 100644
--- a/components/brave_rewards/browser/rewards_service_private_observer.h
+++ b/components/brave_rewards/browser/rewards_service_private_observer.h
@@ -1,9 +1,10 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * 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/. */
 
-#ifndef BRAVE_BROWSER_PAYMENTS_PAYMENTS_SERVICE_PRIVATE_OBSERVER_H_
-#define BRAVE_BROWSER_PAYMENTS_PAYMENTS_SERVICE_PRIVATE_OBSERVER_H_
+#ifndef BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_REWARDS_SERVICE_PRIVATE_OBSERVER_H_
+#define BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_REWARDS_SERVICE_PRIVATE_OBSERVER_H_
 
 #include "base/observer_list_types.h"
 #include "bat/ledger/publisher_info.h"
@@ -31,4 +32,4 @@ class RewardsServicePrivateObserver : public base::CheckedObserver {
 
 }  // namespace brave_rewards
 
-#endif  // BRAVE_BROWSER_PAYMENTS_PAYMENTS_SERVICE_PRIVATE_OBSERVER_H_
+#endif  // BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_REWARDS_SERVICE_PRIVATE_OBSERVER_H_
diff --git a/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h b/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h
index f4f6a13769d7..d7c8c06e596c 100644
--- a/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h
+++ b/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h
@@ -238,7 +238,7 @@ class MockConfirmationsClient : public ConfirmationsClient {
       ledger::OnRestoreCallback callback));
 
   MOCK_METHOD1(SaveNormalizedPublisherList, void(
-      ledger::PublisherInfoListStruct normalized_list));
+      ledger::PublisherInfoList normalized_list));
 
   MOCK_METHOD1(SetConfirmationsIsReady, void(
       const bool is_ready));
diff --git a/vendor/bat-native-ledger/include/bat/ledger/publisher_info.h b/vendor/bat-native-ledger/include/bat/ledger/publisher_info.h
index d2c26b21a23e..5dda34682fd6 100644
--- a/vendor/bat-native-ledger/include/bat/ledger/publisher_info.h
+++ b/vendor/bat-native-ledger/include/bat/ledger/publisher_info.h
@@ -19,8 +19,6 @@ namespace ledger {
 using PublisherInfo = mojom::PublisherInfo;
 using PublisherInfoPtr = mojom::PublisherInfoPtr;
 using PublisherInfoList = std::vector<PublisherInfoPtr>;
-// TODO - remove this
-using PublisherInfoListStruct = PublisherInfoList;
 
 const char _clear_favicon[] = "clear";
 
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/bat_publishers_unittest.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/bat_publishers_unittest.cc
index 30259af2d3db..c4377a5f9c85 100644
--- a/vendor/bat-native-ledger/src/bat/ledger/internal/bat_publishers_unittest.cc
+++ b/vendor/bat-native-ledger/src/bat/ledger/internal/bat_publishers_unittest.cc
@@ -3,6 +3,8 @@
  * 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 <utility>
+
 #include "bat/ledger/internal/bat_publishers.h"
 #include "bat/ledger/ledger.h"
 #include "testing/gtest/include/gtest/gtest.h"