From 0a404b389e6b05dbe9ff68c2ccb200f1d6623d7c Mon Sep 17 00:00:00 2001
From: bridiver <github@brianjohnson.cc>
Date: Tue, 5 May 2020 16:41:11 -0700
Subject: [PATCH] formatting

---
 .../core/common/cookie_settings_base.cc            |  5 ++---
 .../core/common/cookie_settings_base.h             | 14 +++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc
index 659bb021d64b..981b66fb55f1 100644
--- a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc
+++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc
@@ -5,7 +5,6 @@
 
 #include "components/content_settings/core/common/cookie_settings_base.h"
 
-#include "base/containers/flat_map.h"
 #include "base/no_destructor.h"
 #include "base/optional.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
@@ -84,13 +83,13 @@ bool CookieSettingsBase::IsCookieAccessAllowed(
     const GURL& site_for_cookies,
     const base::Optional<url::Origin>& top_frame_origin) const {
 
-  // get content settings only - do not consider default 3rd-party blocking
+  // Get content settings only - do not consider default 3rd-party blocking.
   ContentSetting setting;
   GetCookieSettingInternal(
       url, top_frame_origin ? top_frame_origin->GetURL() : site_for_cookies,
       false, nullptr, &setting);
 
-  // content settings should always override any defaults
+  // Content settings should always override any defaults.
   if (!IsAllowed(setting))
     return false;
 
diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.h b/chromium_src/components/content_settings/core/common/cookie_settings_base.h
index 0d384515c5ce..1ba8ef436568 100644
--- a/chromium_src/components/content_settings/core/common/cookie_settings_base.h
+++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.h
@@ -6,13 +6,13 @@
 #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_COOKIE_SETTINGS_BASE_H_
 #define BRAVE_CHROMIUM_SRC_COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_COOKIE_SETTINGS_BASE_H_
 
-#define BRAVE_COOKIE_SETTINGS_BASE_H                              \
- private:                                                         \
-  bool IsChromiumCookieAccessAllowed(const GURL& url,             \
-                             const GURL& first_party_url) const;  \
-  bool IsChromiumCookieAccessAllowed(                             \
-      const GURL& url,                                            \
-      const GURL& site_for_cookies,                               \
+#define BRAVE_COOKIE_SETTINGS_BASE_H                                      \
+ private:                                                                 \
+  bool IsChromiumCookieAccessAllowed(const GURL& url,                     \
+                                     const GURL& first_party_url) const;  \
+  bool IsChromiumCookieAccessAllowed(                                     \
+      const GURL& url,                                                    \
+      const GURL& site_for_cookies,                                       \
       const base::Optional<url::Origin>& top_frame_origin) const;
 
 #include "../../../../../../components/content_settings/core/common/cookie_settings_base.h"