chore: bump chromium to 113.0.5653.0 (main) (#37587)

* chore: bump chromium in DEPS to 113.0.5653.0

* chore: update patches

* [Extensions c2s] Move HasActiveTabAndCanAccess() to //extensions

4305558

* [Privacy Hub] Respecting ChromeOS geoloc setting

4171824

* Add runtime DLLs to win_clang_x64 when needed

4336228

* chore: fix lint

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>

shell/browser/browser_process_impl.cc

@@ -31,6 +31,7 @@
 #include "net/proxy_resolution/proxy_config.h"
 #include "net/proxy_resolution/proxy_config_service.h"
 #include "net/proxy_resolution/proxy_config_with_annotation.h"
+#include "services/device/public/cpp/geolocation/geolocation_manager.h"
 #include "services/network/public/cpp/network_switches.h"
 #include "shell/common/electron_paths.h"
 #include "shell/common/thread_restrictions.h"
@@ -318,3 +319,12 @@ printing::PrintJobManager* BrowserProcessImpl::print_job_manager() {
 StartupData* BrowserProcessImpl::startup_data() {
   return nullptr;
 }
+
+device::GeolocationManager* BrowserProcessImpl::geolocation_manager() {
+  return geolocation_manager_.get();
+}
+
+void BrowserProcessImpl::SetGeolocationManager(
+    std::unique_ptr<device::GeolocationManager> geolocation_manager) {
+  geolocation_manager_ = std::move(geolocation_manager);
+}

shell/browser/browser_process_impl.h

@@ -105,12 +105,16 @@ class BrowserProcessImpl : public BrowserProcess {
   const std::string& GetApplicationLocale() override;
   printing::PrintJobManager* print_job_manager() override;
   StartupData* startup_data() override;
+  device::GeolocationManager* geolocation_manager() override;
+  void SetGeolocationManager(
+      std::unique_ptr<device::GeolocationManager> geolocation_manager) override;
 
  private:
 #if BUILDFLAG(ENABLE_PRINTING)
   std::unique_ptr<printing::PrintJobManager> print_job_manager_;
 #endif
   std::unique_ptr<PrefService> local_state_;
+  std::unique_ptr<device::GeolocationManager> geolocation_manager_;
   std::string locale_;
   std::string system_locale_;
 };

shell/browser/electron_browser_client.cc

@@ -249,7 +249,7 @@ enum class RenderProcessHostPrivilege {
 bool AllowFileAccess(const std::string& extension_id,
                      content::BrowserContext* context) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
-             ::switches::kDisableExtensionsFileAccessCheck) ||
+             extensions::switches::kDisableExtensionsFileAccessCheck) ||
          extensions::ExtensionPrefs::Get(context)->AllowFileAccess(
              extension_id);
 }
@@ -1715,13 +1715,11 @@ void ElectronBrowserClient::RegisterBrowserInterfaceBindersForServiceWorker(
       base::BindRepeating(&BindBadgeServiceForServiceWorker));
 }
 
-device::GeolocationManager* ElectronBrowserClient::GetGeolocationManager() {
 #if BUILDFLAG(IS_MAC)
-  return browser_main_parts_->GetGeolocationManager();
-#else
-  return nullptr;
-#endif
+device::GeolocationManager* ElectronBrowserClient::GetGeolocationManager() {
+  return g_browser_process->geolocation_manager();
 }
+#endif
 
 content::HidDelegate* ElectronBrowserClient::GetHidDelegate() {
   if (!hid_delegate_)

shell/browser/electron_browser_client.h

@@ -107,7 +107,9 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
 
   content::WebAuthenticationDelegate* GetWebAuthenticationDelegate() override;
 
+#if BUILDFLAG(IS_MAC)
   device::GeolocationManager* GetGeolocationManager() override;
+#endif
 
   content::PlatformNotificationService* GetPlatformNotificationService();
 

shell/browser/electron_browser_main_parts.cc

@@ -99,7 +99,6 @@
 
 #if BUILDFLAG(IS_MAC)
 #include "components/os_crypt/keychain_password_mac.h"
-#include "services/device/public/cpp/geolocation/geolocation_manager.h"
 #include "shell/browser/ui/cocoa/views_delegate_mac.h"
 #else
 #include "shell/browser/ui/views/electron_views_delegate.h"
@@ -674,12 +673,6 @@ ElectronBrowserMainParts::GetGeolocationControl() {
   return geolocation_control_.get();
 }
 
-#if BUILDFLAG(IS_MAC)
-device::GeolocationManager* ElectronBrowserMainParts::GetGeolocationManager() {
-  return geolocation_manager_.get();
-}
-#endif
-
 IconManager* ElectronBrowserMainParts::GetIconManager() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!icon_manager_.get())

shell/browser/electron_browser_main_parts.h

@@ -37,10 +37,6 @@ class Screen;
 }
 #endif
 
-namespace device {
-class GeolocationManager;
-}
-
 namespace ui {
 class LinuxUiGetter;
 }
@@ -91,10 +87,6 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
   // used to enable the location services once per client.
   device::mojom::GeolocationControl* GetGeolocationControl();
 
-#if BUILDFLAG(IS_MAC)
-  device::GeolocationManager* GetGeolocationManager();
-#endif
-
   // Returns handle to the class responsible for extracting file icons.
   IconManager* GetIconManager();
 
@@ -181,7 +173,6 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
   mojo::Remote<device::mojom::GeolocationControl> geolocation_control_;
 
 #if BUILDFLAG(IS_MAC)
-  std::unique_ptr<device::GeolocationManager> geolocation_manager_;
   std::unique_ptr<display::ScopedNativeScreen> screen_;
 #endif
 

shell/browser/electron_browser_main_parts_mac.mm

@@ -10,6 +10,7 @@
 #include "base/mac/foundation_util.h"
 #include "base/path_service.h"
 #include "services/device/public/cpp/geolocation/system_geolocation_source_mac.h"
+#include "shell/browser/browser_process_impl.h"
 #import "shell/browser/mac/electron_application.h"
 #include "shell/browser/mac/electron_application_delegate.h"
 #include "shell/common/electron_paths.h"
@@ -31,8 +32,10 @@ void ElectronBrowserMainParts::PreCreateMainMessageLoop() {
       setObject:@"NO"
          forKey:@"NSTreatUnknownArgumentsAsOpen"];
 
-  geolocation_manager_ =
-      device::SystemGeolocationSourceMac::CreateGeolocationManagerOnMac();
+  if (!g_browser_process->geolocation_manager()) {
+    g_browser_process->SetGeolocationManager(
+        device::SystemGeolocationSourceMac::CreateGeolocationManagerOnMac());
+  }
 }
 
 void ElectronBrowserMainParts::FreeAppDelegate() {