Skip to content

Commit

Permalink
[AUTO][FILECONTROL] - version 134.0.6998.24
Browse files Browse the repository at this point in the history
  • Loading branch information
@uazo @github-actions
uazo authored and github-actions[bot] committed Feb 26, 2025
1 parent 3269abe commit 09ca523
Show file tree
Hide file tree
Showing 176 changed files with 4,123 additions and 2,688 deletions.
2 changes: 1 addition & 1 deletion tools/under-control/src/RELEASE
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
133.0.6943.127
134.0.6998.24
18 changes: 11 additions & 7 deletions tools/under-control/src/android_webview/browser/aw_content_browser_client.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,6 @@ class XrwNavigationThrottle : public content::NavigationThrottle {
base::WeakPtr<AsyncCheckTracker> GetAsyncCheckTracker(
const base::RepeatingCallback<content::WebContents*()>& wc_getter,
content::FrameTreeNodeId frame_tree_node_id) {
if (!base::FeatureList::IsEnabled(
safe_browsing::kSafeBrowsingAsyncRealTimeCheck)) {
return nullptr;
}
content::WebContents* web_contents = wc_getter.Run();
// Check whether current frame is a pre-rendered frame. WebView does not
// support NoStatePrefetch, so we do not check for that.
Expand Down Expand Up @@ -582,8 +578,9 @@ void AwContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
}
}

void AwContentBrowserClient::OverrideWebkitPrefs(
void AwContentBrowserClient::OverrideWebPreferences(
content::WebContents* web_contents,
content::SiteInstance& main_frame_site,
blink::web_pref::WebPreferences* web_prefs) {
AwSettings* aw_settings = AwSettings::FromWebContents(web_contents);
if (aw_settings) {
Expand Down Expand Up @@ -1017,6 +1014,14 @@ bool AwContentBrowserClient::ShouldDisableSiteIsolation(
return true;
}

bool AwContentBrowserClient::ShouldDisableOriginIsolation() {
// Since AW does not yet support OOPIFs, we must return true here to disable
// features that may trigger OOPIFs, such as origin isolation.
//
// Adding OOPIF support for AW is tracked by https://crbug.com/806404.
return true;
}

bool AwContentBrowserClient::ShouldLockProcessToSite(
content::BrowserContext* browser_context,
const GURL& effective_url) {
Expand Down Expand Up @@ -1266,8 +1271,7 @@ bool AwContentBrowserClient::HasErrorPage(int http_status_code) {

bool AwContentBrowserClient::SuppressDifferentOriginSubframeJSDialogs(
content::BrowserContext* browser_context) {
return base::FeatureList::IsEnabled(
features::kWebViewSuppressDifferentOriginSubframeJSDialogs);
return false;
}

bool AwContentBrowserClient::ShouldPreconnectNavigation(
Expand Down
18 changes: 14 additions & 4 deletions tools/under-control/src/android_webview/browser/aw_field_trials.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "third_party/blink/public/common/features_generated.h"
#include "ui/android/ui_android_features.h"
#include "ui/gl/gl_features.h"
#include "ui/gl/gl_switches.h"

namespace internal {

Expand Down Expand Up @@ -101,9 +102,11 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
aw_feature_overrides.DisableFeature(
net::features::kThirdPartyStoragePartitioning);

#if BUILDFLAG(ENABLE_VALIDATING_COMMAND_DECODER)
// Disable the passthrough on WebView.
aw_feature_overrides.DisableFeature(
::features::kDefaultPassthroughCommandDecoder);
#endif

// HDR does not support webview yet. See crbug.com/1493153 for an explanation.
aw_feature_overrides.DisableFeature(ui::kAndroidHDR);
Expand Down Expand Up @@ -239,6 +242,10 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
aw_feature_overrides.DisableFeature(
::features::kFocusRenderWidgetHostViewAndroidOnActionDown);

// Disabling the permission element as it needs embedder support in order to
// function and the webview permission manager cannot support it.
aw_feature_overrides.DisableFeature(blink::features::kPermissionElement);

if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kDebugBsa)) {
// Feature parameters can only be set via a field trial.
const char kTrialName[] = "StudyDebugBsa";
Expand All @@ -259,7 +266,7 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {

// Feature parameters can only be set via a field trial.
// Note: Performing a field trial here means we cannot include
// |kDIPSTtl| in the testing config json.
// |kBtmTtl| in the testing config json.
{
const char kDipsWebViewExperiment[] = "DipsWebViewExperiment";
const char kDipsWebViewGroup[] = "DipsWebViewGroup";
Expand All @@ -268,18 +275,18 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
CHECK(dips_field_trial) << "Unexpected name conflict.";
base::FieldTrialParams params;
const std::string ttl_time_delta_30_days = "30d";
params.emplace(features::kDIPSInteractionTtl.name, ttl_time_delta_30_days);
params.emplace(features::kBtmInteractionTtl.name, ttl_time_delta_30_days);
base::AssociateFieldTrialParams(kDipsWebViewExperiment, kDipsWebViewGroup,
params);
aw_feature_overrides.OverrideFeatureWithFieldTrial(
features::kDIPSTtl,
features::kBtmTtl,
base::FeatureList::OverrideState::OVERRIDE_ENABLE_FEATURE,
dips_field_trial);
}

// Delete Incidental Party State (DIPS) feature is not yet supported on
// WebView.
aw_feature_overrides.DisableFeature(::features::kDIPS);
aw_feature_overrides.DisableFeature(::features::kBtm);

// These features have shown performance improvements in WebView but not some
// other platforms.
Expand All @@ -301,6 +308,9 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
// Disable Topics on WebView.
aw_feature_overrides.DisableFeature(blink::features::kBrowsingTopics);

// Sharing ANGLE's Vulkan queue is not supported on WebView.
aw_feature_overrides.DisableFeature(::features::kVulkanFromANGLE);

// Temporarily turn off kFileSystemAccessDirectoryIterationBlocklistCheck for
// a kill switch. https://crbug.com/393606977
aw_feature_overrides.DisableFeature(
Expand Down
32 changes: 29 additions & 3 deletions tools/under-control/src/chrome/android/java/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ by a child template that "extends" this file.
<uses-feature android:name="android.hardware.sensor.gyroscope" android:required="false"/>
<uses-feature android:name="android.hardware.sensor.accelerometer" android:required="false"/>

<uses-permission-sdk-23 android:name="android.permission.SCENE_UNDERSTANDING" />
<uses-permission-sdk-23 android:name="android.permission.SCENE_UNDERSTANDING_FINE" />
<uses-permission-sdk-23 android:name="android.permission.HAND_TRACKING" />
{% endif %}

Expand Down Expand Up @@ -446,6 +446,18 @@ by a child template that "extends" this file.
</intent-filter>
</activity>

<activity android:name="org.chromium.chrome.browser.AutofillOptionsLauncher"
android:theme="@style/Theme.BrowserUI.NoDisplay"
android:excludeFromRecents="true"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.APP_BROWSER" />
<category android:name="android.intent.category.PREFERENCE" />
</intent-filter>
</activity>

<activity android:name="org.chromium.chrome.browser.app.reengagement.ReengagementActivity"
android:theme="@style/Theme.BrowserUI.Translucent"
android:taskAffinity=""
Expand Down Expand Up @@ -984,11 +996,13 @@ by a child template that "extends" this file.
<receiver android:name="org.chromium.chrome.browser.notifications.NotificationServiceImpl$Receiver"
android:exported="false">
<intent-filter>
<action android:name="org.chromium.chrome.browser.notifications.ALWAYS_ALLOW" />
<action android:name="org.chromium.chrome.browser.notifications.CLICK_NOTIFICATION" />
<action android:name="org.chromium.chrome.browser.notifications.CLOSE_NOTIFICATION" />
<action android:name="org.chromium.chrome.browser.notifications.COMMIT_UNSUBSCRIBE" />
<action android:name="org.chromium.chrome.browser.notifications.PRE_UNSUBSCRIBE" />
<action android:name="org.chromium.chrome.browser.notifications.SHOW_ORIGINAL_NOTIFICATION" />
<action android:name="org.chromium.chrome.browser.notifications.UNDO_UNSUBSCRIBE" />
<action android:name="org.chromium.chrome.browser.notifications.COMMIT_UNSUBSCRIBE" />
</intent-filter>
</receiver>

Expand Down Expand Up @@ -1225,7 +1239,7 @@ by a child template that "extends" this file.
{% endif %} />
{% endfor %}

{% set num_privileged_services = 5 %}
{% set num_privileged_services = 10 %}
<meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
android:value="{{ num_privileged_services }}"/>

Expand Down Expand Up @@ -1275,6 +1289,11 @@ by a child template that "extends" this file.

{% endif %}

{% if enable_vr == "true" %}
<!-- TODO(https://crbug.com/393557658): Investigate removing this. -->
<uses-native-library android:name="libopenxr.google.so" android:required="false" />
{% endif %}

<!-- Cast support -->
<meta-data
android:name=
Expand Down Expand Up @@ -1349,6 +1368,13 @@ by a child template that "extends" this file.
android:grantUriPermissions="true">
</provider>

<!-- Provider for querying the Autofill third party mode state. -->
<provider android:name="org.chromium.chrome.browser.autofill.AutofillThirdPartyModeContentProvider"
android:authorities="{{ manifest_package }}.AutofillThirdPartyModeContentProvider"
android:exported="true"
tools:ignore="ExportedContentProvider">
</provider>

{% block base_application_definitions %}
{% endblock %}
{% block extra_application_definitions_for_test %}
Expand Down
46 changes: 35 additions & 11 deletions ...s/under-control/src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <stdint.h>

#include <algorithm>
#include <set>
#include <string>
#include <utility>
Expand All @@ -24,7 +25,6 @@
#include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h"
#include "base/not_fatal_until.h"
#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/task/bind_post_task.h"
#include "base/task/thread_pool.h"
Expand Down Expand Up @@ -70,7 +70,6 @@
#include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/reading_list/reading_list_model_factory.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
#include "chrome/browser/search_engine_choice/search_engine_choice_service_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
Expand Down Expand Up @@ -184,6 +183,8 @@


#if !BUILDFLAG(IS_ANDROID)
#include "chrome/browser/new_tab_page/microsoft_auth/microsoft_auth_service.h"
#include "chrome/browser/new_tab_page/microsoft_auth/microsoft_auth_service_factory.h"
#include "chrome/browser/user_annotations/user_annotations_service_factory.h"
#include "chrome/browser/user_education/browser_user_education_storage_service.h"
#include "chrome/browser/web_applications/web_app.h"
Expand Down Expand Up @@ -224,6 +225,10 @@
#include "chrome/browser/media/cdm_document_service_impl.h"
#endif // BUILDFLAG(IS_WIN)

#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#endif

using base::UserMetricsAction;
using content::BrowserContext;
using content::BrowserThread;
Expand Down Expand Up @@ -660,10 +665,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));

network::mojom::NetworkContext* safe_browsing_context = nullptr;
#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (sb_service)
safe_browsing_context = sb_service->GetNetworkContext(profile_);
#endif

// Cleared for DATA_TYPE_HISTORY, DATA_TYPE_COOKIES and DATA_TYPE_PASSWORDS.
browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_,
Expand Down Expand Up @@ -733,6 +740,21 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
delete_begin_, delete_end_, std::move(storage_key_matcher),
CreateTaskCompletionClosure(TracingDataType::kMediaDeviceSalts));
}

#if !BUILDFLAG(IS_ANDROID)
// Remove local storage data from New Tab page when whenever there's a
// Microsoft auth service and cookies and site data is cleared.
MicrosoftAuthService* microsoft_auth_service =
MicrosoftAuthServiceFactory::GetForProfile(profile_);
if (microsoft_auth_service) {
microsoft_auth_service->ClearAuthData();

profile_->GetDefaultStoragePartition()->ClearDataForOrigin(
content::StoragePartition::REMOVE_DATA_MASK_LOCAL_STORAGE,
/*quota_storage_remove_mask=*/0, GURL(chrome::kChromeUINewTabPageURL),
base::DoNothing());
}
#endif // !BUILDFLAG(IS_ANDROID)
}

//////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -900,6 +922,10 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
ContentSettingsType::NOTIFICATION_INTERACTIONS, delete_begin_,
delete_end_, website_settings_filter);

host_content_settings_map_->ClearSettingsForOneTypeWithPredicate(
ContentSettingsType::ARE_SUSPICIOUS_NOTIFICATIONS_ALLOWLISTED_BY_USER,
delete_begin_, delete_end_, website_settings_filter);

PermissionDecisionAutoBlockerFactory::GetForProfile(profile_)
->RemoveEmbargoAndResetCounts(filter);
}
Expand Down Expand Up @@ -1047,6 +1073,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
if (web_data_service.get()) {
web_data_service->RemoveFormElementsAddedBetween(delete_begin_,
delete_end_);
web_data_service->RemoveEntityInstancesModifiedBetween(delete_begin_,
delete_end_);
// Clear out the Autofill StrikeDatabase in its entirety.
// TODO(crbug.com/40594007): Respect |delete_begin_| and |delete_end_| and
// only clear out entries whose last strikes were created in that
Expand Down Expand Up @@ -1393,7 +1421,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
// StoragePartition of an IWA, and all Controlled Frame StoragePartitions if
// DATA_TYPE_CONTROLLED_FRAME is specified in `remove_mask`.
if (!filter_builder->GetStoragePartitionConfig().has_value() &&
content::IsolatedWebAppsPolicy::AreIsolatedWebAppsEnabled(profile_)) {
content::AreIsolatedWebAppsEnabled(profile_)) {
const web_app::WebAppRegistrar& web_app_registrar =
web_app::WebAppProvider::GetForLocalAppsUnchecked(profile_)
->registrar_unsafe();
Expand Down Expand Up @@ -1467,9 +1495,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
ContentSettingsType::TOP_LEVEL_STORAGE_ACCESS}) {
host_content_settings_map_->ClearSettingsForOneTypeWithPredicate(
type_to_clear, [&](const ContentSettingPatternSource& setting) {
return content_settings::IsGrantedByRelatedWebsiteSets(
type_to_clear, setting.metadata) &&
base::ranges::any_of(
return setting.metadata.decided_by_related_website_sets() &&
std::ranges::any_of(
filter_builder->GetOrigins(),
[&](const url::Origin& origin) -> bool {
return setting.primary_pattern.Matches(
Expand Down Expand Up @@ -1576,8 +1603,6 @@ void ChromeBrowsingDataRemoverDelegate::OnTaskComplete(
sync_service->GetUserSettings()->KeepAccountSettingsPrefsOnlyForUsers(
base::ToVector(gaia_ids, &signin::GaiaIdHash::FromGaiaId));
}
password_manager::features_util::KeepAccountStorageSettingsOnlyForUsers(
profile_->GetPrefs(), std::move(gaia_ids).extract());
}
#endif // !BUILDFLAG(IS_ANDROID)

Expand Down Expand Up @@ -1760,9 +1785,8 @@ void ChromeBrowsingDataRemoverDelegate::DisablePasswordsAutoSignin(
CreateTaskCompletionClosure(
TracingDataType::kDisableAutoSigninForProfilePasswords));
}
if (account_store &&
password_manager::features_util::IsOptedInForAccountStorage(
profile_->GetPrefs(), sync_service)) {
if (account_store && password_manager::features_util::IsAccountStorageEnabled(
profile_->GetPrefs(), sync_service)) {
account_store->DisableAutoSignInForOrigins(
url_filter,
CreateTaskCompletionClosure(
Expand Down
Loading

0 comments on commit 09ca523

Please sign in to comment.