cef/patch/patches/chrome_browser_content_sett...

diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc
index 3e2d1221d91e..b0572e99c613 100644
--- chrome/browser/content_settings/host_content_settings_map_factory.cc
+++ chrome/browser/content_settings/host_content_settings_map_factory.cc
@@ -8,6 +8,7 @@
 
 #include "base/feature_list.h"
 #include "build/buildflag.h"
+#include "cef/libcef/features/features.h"
 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ -20,6 +21,10 @@
 #include "extensions/buildflags/buildflags.h"
 #include "ui/webui/webui_allowlist_provider.h"
 
+#if BUILDFLAG(ENABLE_CEF)
+#include "cef/libcef/common/extensions/extensions_util.h"
+#endif
+
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/extension_service.h"
 #include "extensions/browser/extension_system.h"
@@ -48,8 +53,14 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory()
   DependsOn(SupervisedUserSettingsServiceFactory::GetInstance());
 #endif
 #if BUILDFLAG(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_CEF)
+  if (extensions::ExtensionsEnabled()) {
+#endif
   DependsOn(
       extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
+#if BUILDFLAG(ENABLE_CEF)
+  }
+#endif
 #endif
 }
 
@@ -98,10 +109,16 @@ scoped_refptr<RefcountedKeyedService>
       std::move(allowlist_provider));
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_CEF)
+  if (extensions::ExtensionsEnabled()) {
+#endif
   // These must be registered before before the HostSettings are passed over to
   // the IOThread.  Simplest to do this on construction.
   extensions::ExtensionService::RegisterContentSettings(settings_map.get(),
                                                         profile);
+#if BUILDFLAG(ENABLE_CEF)
+  }
+#endif
 #endif // BUILDFLAG(ENABLE_EXTENSIONS)
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   SupervisedUserSettingsService* supervised_service =
Initialize required KeyedServiceFactories when extensions are disabled (issue #2359) 2018-02-02 23:43:33 +01:00			`diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc`
Update to Chromium version 86.0.4240.0 (#800218) - CefURLRequest::Create is no longer supported in the renderer process (see https://crbug.com/891872). Use CefFrame::CreateURLRequest instead. - Mac platform definitions have been changed from `MACOSX` to `MAC` (see https://crbug.com/1105907) and related CMake macro names have been updated. The old `OS_MACOSX` define is still set in code and CMake for backwards compatibility. - Linux ARM build is currently broken (see https://crbug.com/1123214). 2020-08-29 00:39:23 +02:00			`index 3e2d1221d91e..b0572e99c613 100644`
Initialize required KeyedServiceFactories when extensions are disabled (issue #2359) 2018-02-02 23:43:33 +01:00			`--- chrome/browser/content_settings/host_content_settings_map_factory.cc`
			`+++ chrome/browser/content_settings/host_content_settings_map_factory.cc`
Update to Chromium version 82.0.4085.0 (#749737) - Building on macOS now requires the 10.15 SDK. Xcode 11.3 is recommended as Xcode 11.4 is not currently supported (see https://crbug.com/1065146). - Jumbo build configuration is no longer supported. Chromium is skipping the M82 release and consequently no CEF 4085 branch will be created. For details on the Chromium decision see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/Vn7uzglqLz0/JItlSrZxBAAJ 2020-03-30 22:13:42 +02:00			`@@ -8,6 +8,7 @@`
Initialize required KeyedServiceFactories when extensions are disabled (issue #2359) 2018-02-02 23:43:33 +01:00
			`#include "base/feature_list.h"`
Update to Chromium version 82.0.4085.0 (#749737) - Building on macOS now requires the 10.15 SDK. Xcode 11.3 is recommended as Xcode 11.4 is not currently supported (see https://crbug.com/1065146). - Jumbo build configuration is no longer supported. Chromium is skipping the M82 release and consequently no CEF 4085 branch will be created. For details on the Chromium decision see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/Vn7uzglqLz0/JItlSrZxBAAJ 2020-03-30 22:13:42 +02:00			`#include "build/buildflag.h"`
Initialize required KeyedServiceFactories when extensions are disabled (issue #2359) 2018-02-02 23:43:33 +01:00			`+#include "cef/libcef/features/features.h"`
			`#include "chrome/browser/profiles/off_the_record_profile_impl.h"`
			`#include "chrome/browser/profiles/profile.h"`
Update to Chromium version 68.0.3425.0 (#557062) Known issues: - Surface synchronization is now enabled for OSR, see issue #2447. - Jumbo build is broken, fixed in https://crrev.com/868717ce. 2018-05-20 15:51:42 +02:00			`#include "chrome/browser/search_engines/template_url_service_factory.h"`
Update to Chromium version 84.0.4147.0 (#768962) 2020-06-09 19:48:00 +02:00			`@@ -20,6 +21,10 @@`
Update to Chromium revision 9ef2aa86 (#550428) 2018-04-19 17:44:42 +02:00			`#include "extensions/buildflags/buildflags.h"`
Update to Chromium version 84.0.4147.0 (#768962) 2020-06-09 19:48:00 +02:00			`#include "ui/webui/webui_allowlist_provider.h"`
Initialize required KeyedServiceFactories when extensions are disabled (issue #2359) 2018-02-02 23:43:33 +01:00
			`+#if BUILDFLAG(ENABLE_CEF)`
			`+#include "cef/libcef/common/extensions/extensions_util.h"`
			`+#endif`
			`+`
			`#if BUILDFLAG(ENABLE_EXTENSIONS)`
			`#include "chrome/browser/extensions/extension_service.h"`
			`#include "extensions/browser/extension_system.h"`
Update to Chromium version 84.0.4147.0 (#768962) 2020-06-09 19:48:00 +02:00			`@@ -48,8 +53,14 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory()`
Initialize required KeyedServiceFactories when extensions are disabled (issue #2359) 2018-02-02 23:43:33 +01:00			`DependsOn(SupervisedUserSettingsServiceFactory::GetInstance());`
			`#endif`
			`#if BUILDFLAG(ENABLE_EXTENSIONS)`
			`+#if BUILDFLAG(ENABLE_CEF)`
			`+ if (extensions::ExtensionsEnabled()) {`
			`+#endif`
			`DependsOn(`
			`extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());`
			`+#if BUILDFLAG(ENABLE_CEF)`
			`+ }`
			`+#endif`
			`#endif`
			`}`

Update to Chromium version 86.0.4240.0 (#800218) - CefURLRequest::Create is no longer supported in the renderer process (see https://crbug.com/891872). Use CefFrame::CreateURLRequest instead. - Mac platform definitions have been changed from `MACOSX` to `MAC` (see https://crbug.com/1105907) and related CMake macro names have been updated. The old `OS_MACOSX` define is still set in code and CMake for backwards compatibility. - Linux ARM build is currently broken (see https://crbug.com/1123214). 2020-08-29 00:39:23 +02:00			`@@ -98,10 +109,16 @@ scoped_refptr<RefcountedKeyedService>`
Update to Chromium version 84.0.4147.0 (#768962) 2020-06-09 19:48:00 +02:00			`std::move(allowlist_provider));`
Initialize required KeyedServiceFactories when extensions are disabled (issue #2359) 2018-02-02 23:43:33 +01:00
			`#if BUILDFLAG(ENABLE_EXTENSIONS)`
			`+#if BUILDFLAG(ENABLE_CEF)`
			`+ if (extensions::ExtensionsEnabled()) {`
			`+#endif`
			`// These must be registered before before the HostSettings are passed over to`
			`// the IOThread. Simplest to do this on construction.`
Update to Chromium version 69.0.3453.0 (#565531) 2018-06-08 18:53:10 +02:00			`extensions::ExtensionService::RegisterContentSettings(settings_map.get(),`
			`profile);`
Initialize required KeyedServiceFactories when extensions are disabled (issue #2359) 2018-02-02 23:43:33 +01:00			`+#if BUILDFLAG(ENABLE_CEF)`
			`+ }`
			`+#endif`
			`#endif // BUILDFLAG(ENABLE_EXTENSIONS)`
			`#if BUILDFLAG(ENABLE_SUPERVISED_USERS)`
			`SupervisedUserSettingsService* supervised_service =`