diff --git chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc index 39752c1bed2ba..3d3a9349be280 100644 --- chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc +++ chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc @@ -10,6 +10,7 @@ #include #include "base/bind.h" +#include "base/command_line.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" #include "base/path_service.h" @@ -22,6 +23,7 @@ #include "build/branding_buildflags.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.h" #include "chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings_factory.h" @@ -29,6 +31,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/sync/sync_service_factory.h" #include "chrome/common/channel_info.h" +#include "chrome/common/chrome_switches.h" #include "components/prefs/pref_service.h" #include "components/sync/driver/sync_internals_util.h" #include "components/sync/driver/sync_service.h" @@ -334,7 +337,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) { response->emplace(kOsVersionTag, os_version); #endif - PopulateSyncLogs(response.get()); + if (!cef::IsAlloyRuntimeEnabled()) { + // Avoid loading ProfileSyncServiceFactory which depends on a lot of + // unnecessary Chrome-specific factories. + PopulateSyncLogs(response.get()); + } PopulateExtensionInfoLogs(response.get()); PopulatePowerApiLogs(response.get()); PopulateDataReductionProxyLogs(response.get()); @@ -408,6 +415,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs( if (!profile) return; + // CEF should avoid accessing ExtensionRegistry when extensions are disabled. + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableExtensions)) { + return; + } + extensions::ExtensionRegistry* extension_registry = extensions::ExtensionRegistry::Get(profile); std::string extensions_list; @@ -515,6 +528,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime( #if defined(OS_WIN) void ChromeInternalLogSource::PopulateUsbKeyboardDetected( SystemLogsResponse* response) { + // The below call may result in some DLLs being loaded. + base::ScopedAllowBlockingForTesting allow_blocking; std::string reason; bool result = base::win::IsKeyboardPresentOnSlate(ui::GetHiddenWindow(), &reason); diff --git chrome/browser/memory_details.cc chrome/browser/memory_details.cc index b732247e53b72..b7969350923a9 100644 --- chrome/browser/memory_details.cc +++ chrome/browser/memory_details.cc @@ -8,6 +8,7 @@ #include #include "base/bind.h" +#include "base/command_line.h" #include "base/containers/cxx20_erase.h" #include "base/file_version_info.h" #include "base/metrics/histogram_macros.h" @@ -17,6 +18,7 @@ #include "base/task/thread_pool.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/common/chrome_switches.h" #include "components/nacl/common/nacl_process_type.h" #include "components/strings/grit/components_strings.h" #include "content/public/browser/browser_child_process_host_iterator.h" @@ -287,7 +289,9 @@ void MemoryDetails::CollectChildInfoOnUIThread() { // Determine if this is an extension process. bool process_is_for_extensions = false; const extensions::ExtensionSet* extension_set = nullptr; - if (render_process_host) { + if (render_process_host && + !base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableExtensions)) { content::BrowserContext* context = render_process_host->GetBrowserContext(); extensions::ExtensionRegistry* extension_registry =