[AUTO][FILECONTROL] - version 133.0.6943.60 (#1780)

[AUTO][FILECONTROL] - version 133.0.6943.60

Author: uazo

tools/under-control/src/RELEASE

@@ -1 +1 @@
-132.0.6834.163
+133.0.6943.60

tools/under-control/src/android_webview/browser/aw_content_browser_client.cc

@@ -22,7 +22,6 @@
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/aw_cookie_access_policy.h"
 #include "android_webview/browser/aw_devtools_manager_delegate.h"
-#include "android_webview/browser/aw_enterprise_helper.h"
 #include "android_webview/browser/aw_feature_list_creator.h"
 #include "android_webview/browser/aw_http_auth_handler.h"
 #include "android_webview/browser/aw_settings.h"
@@ -112,7 +111,6 @@
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "net/android/network_library.h"
 #include "net/cookies/site_for_cookies.h"
-#include "net/dns/public/secure_dns_mode.h"
 #include "net/http/http_util.h"
 #include "net/net_buildflags.h"
 #include "net/ssl/ssl_cert_request_info.h"
@@ -286,29 +284,6 @@ void AwContentBrowserClient::OnNetworkServiceCreated(
   network_service->SetUpHttpAuth(network::mojom::HttpAuthStaticParams::New());
   network_service->ConfigureHttpAuthPrefs(
       AwBrowserProcess::GetInstance()->CreateHttpAuthDynamicParams());
-
-  if (base::FeatureList::IsEnabled(features::kWebViewAsyncDns)) {
-    enterprise::GetEnterpriseState(
-        base::BindOnce([](enterprise::EnterpriseState state) {
-          switch (state) {
-            case enterprise::EnterpriseState::kUnknown:
-              // If we cannot be certain about the enterprise state, we should
-              // not enable the AsyncDNS resolver, but fall back on the system
-              // resolver.
-            case enterprise::EnterpriseState::kEnterpriseOwned:
-              // On enterprise owned devices, we should use the system resolver
-              // to make sure that we respect any network settings implemented
-              // by the device owner.
-              return;
-            case enterprise::EnterpriseState::kNotOwned:
-              content::GetNetworkService()->ConfigureStubHostResolver(
-                  /*insecure_dns_client_enabled=*/true,
-                  net::SecureDnsMode::kAutomatic, net::DnsOverHttpsConfig(),
-                  /*additional_dns_types_enabled=*/true);
-              break;
-          }
-        }));
-  }
 }
 
 void AwContentBrowserClient::ConfigureNetworkContextParams(
@@ -364,7 +339,7 @@ void AwContentBrowserClient::RenderProcessWillLaunch(
   // per-view access checks, and access is granted by default (see
   // AwSettings.mAllowContentUrlAccess).
   content::ChildProcessSecurityPolicy::GetInstance()->GrantRequestScheme(
-      host->GetID(), url::kContentScheme);
+      host->GetDeprecatedID(), url::kContentScheme);
 }
 
 bool AwContentBrowserClient::IsExplicitNavigation(
@@ -724,7 +699,8 @@ AwContentBrowserClient::CreateURLLoaderThrottles(
       /* hash_realtime_service */ nullptr,
       /* hash_realtime_selection */
       hash_real_time_selection,
-      /* async_check_tracker */ async_check_tracker));
+      /* async_check_tracker */ async_check_tracker,
+      /*referring_app_info=*/std::nullopt));
 
   if (request.destination == network::mojom::RequestDestination::kDocument) {
     const bool is_load_url =
@@ -772,7 +748,7 @@ AwContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive(
       /* hash_realtime_service */ nullptr,
       /* hash_realtime_selection */
       hash_real_time_selection,
-      /* async_check_tracker */ nullptr));
+      /* async_check_tracker */ nullptr, /*referring_app_info=*/std::nullopt));
 
   return result;
 }
@@ -896,6 +872,7 @@ AwContentBrowserClient::CreateLoginDelegate(
     const GURL& url,
     scoped_refptr<net::HttpResponseHeaders> response_headers,
     bool first_auth_attempt,
+    content::GuestPageHolder* guest,
     LoginAuthRequiredCallback auth_required_callback) {
   return std::make_unique<AwHttpAuthHandler>(auth_info, web_contents,
                                              first_auth_attempt,

tools/under-control/src/android_webview/browser/aw_field_trials.cc

@@ -9,9 +9,6 @@
 #include "base/allocator/partition_alloc_features.h"
 #include "base/base_paths_android.h"
 #include "base/check.h"
-#include "base/feature_list.h"
-#include "base/memory/raw_ref.h"
-#include "base/metrics/field_trial.h"
 #include "base/metrics/field_trial_params.h"
 #include "base/metrics/persistent_histogram_allocator.h"
 #include "base/path_service.h"
@@ -32,66 +29,47 @@
 #include "ui/android/ui_android_features.h"
 #include "ui/gl/gl_features.h"
 
-namespace {
+namespace internal {
 
-class AwFeatureOverrides {
- public:
-  explicit AwFeatureOverrides(base::FeatureList& feature_list)
-      : feature_list_(feature_list) {}
+AwFeatureOverrides::AwFeatureOverrides(base::FeatureList& feature_list)
+    : feature_list_(feature_list) {}
 
-  AwFeatureOverrides(const AwFeatureOverrides& other) = delete;
-  AwFeatureOverrides& operator=(const AwFeatureOverrides& other) = delete;
-
-  ~AwFeatureOverrides() {
-    for (const auto& field_trial_override : field_trial_overrides_) {
-      feature_list_->RegisterFieldTrialOverride(
-          field_trial_override.feature->name,
-          field_trial_override.override_state,
-          field_trial_override.field_trial);
-    }
-    feature_list_->RegisterExtraFeatureOverrides(std::move(overrides_));
-  }
-
-  // Enable a feature with WebView-specific override.
-  void EnableFeature(const base::Feature& feature) {
-    overrides_.emplace_back(
-        std::cref(feature),
-        base::FeatureList::OverrideState::OVERRIDE_ENABLE_FEATURE);
-  }
-
-  // Disable a feature with WebView-specific override.
-  void DisableFeature(const base::Feature& feature) {
-    overrides_.emplace_back(
-        std::cref(feature),
-        base::FeatureList::OverrideState::OVERRIDE_DISABLE_FEATURE);
+AwFeatureOverrides::~AwFeatureOverrides() {
+  // TODO(crbug.com/379864779): This doesn't play well with potential server-
+  // side overrides.
+  for (const auto& field_trial_override : field_trial_overrides_) {
+    feature_list_->RegisterFieldTrialOverride(
+        field_trial_override.feature->name, field_trial_override.override_state,
+        field_trial_override.field_trial);
   }
+  feature_list_->RegisterExtraFeatureOverrides(
+      std::move(overrides_), /*replace_use_default_overrides=*/true);
+}
 
-  // Enable or disable a feature with a field trial. This can be used for
-  // setting feature parameters.
-  void OverrideFeatureWithFieldTrial(
-      const base::Feature& feature,
-      base::FeatureList::OverrideState override_state,
-      base::FieldTrial* field_trial) {
-    field_trial_overrides_.emplace_back(FieldTrialOverride{
-        .feature = raw_ref(feature),
-        .override_state = override_state,
-        .field_trial = field_trial,
-    });
-  }
+void AwFeatureOverrides::EnableFeature(const base::Feature& feature) {
+  overrides_.emplace_back(
+      std::cref(feature),
+      base::FeatureList::OverrideState::OVERRIDE_ENABLE_FEATURE);
+}
 
- private:
-  struct FieldTrialOverride {
-    raw_ref<const base::Feature> feature;
-    base::FeatureList::OverrideState override_state;
-    raw_ptr<base::FieldTrial> field_trial;
-  };
+void AwFeatureOverrides::DisableFeature(const base::Feature& feature) {
+  overrides_.emplace_back(
+      std::cref(feature),
+      base::FeatureList::OverrideState::OVERRIDE_DISABLE_FEATURE);
+}
 
-  base::raw_ref<base::FeatureList> feature_list_;
-  std::vector<base::FeatureList::FeatureOverrideInfo> overrides_;
-  std::vector<FieldTrialOverride> field_trial_overrides_;
-};
+void AwFeatureOverrides::OverrideFeatureWithFieldTrial(
+    const base::Feature& feature,
+    base::FeatureList::OverrideState override_state,
+    base::FieldTrial* field_trial) {
+  field_trial_overrides_.emplace_back(FieldTrialOverride{
+      .feature = raw_ref(feature),
+      .override_state = override_state,
+      .field_trial = field_trial,
+  });
+}
 
-}  // namespace
+}  // namespace internal
 
 void AwFieldTrials::OnVariationsSetupComplete() {
   // Persistent histograms must be enabled ASAP, but depends on Features.
@@ -109,7 +87,7 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
   if (!feature_list) {
     return;
   }
-  AwFeatureOverrides aw_feature_overrides(*feature_list);
+  internal::AwFeatureOverrides aw_feature_overrides(*feature_list);
 
   // Disable third-party storage partitioning on WebView.
   aw_feature_overrides.DisableFeature(
@@ -143,7 +121,6 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
 
   // Disable Shared Storage on WebView.
   aw_feature_overrides.DisableFeature(blink::features::kSharedStorageAPI);
-  aw_feature_overrides.DisableFeature(blink::features::kSharedStorageAPIM125);
 
   // Disable scrollbar-color on WebView.
   aw_feature_overrides.DisableFeature(blink::features::kScrollbarColor);
@@ -247,6 +224,13 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
   aw_feature_overrides.DisableFeature(
       blink::features::kIncrementLocalSurfaceIdForMainframeSameDocNavigation);
 
+  // Disabling this feature for WebView, since it can switch focus when scrolled
+  // in cases with multiple views which can trigger HTML focus changes that
+  // aren't intended. See crbug.com/378779896, crbug.com/373672168 for more
+  // details.
+  aw_feature_overrides.DisableFeature(
+      ::features::kFocusRenderWidgetHostViewAndroidOnActionDown);
+
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kDebugBsa)) {
     // Feature parameters can only be set via a field trial.
     const char kTrialName[] = "StudyDebugBsa";
@@ -289,10 +273,6 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
   // WebView.
   aw_feature_overrides.DisableFeature(::features::kDIPS);
 
-  // TODO(crbug.com/41492947): See crrev.com/c/5744034 for details, but I was
-  // unable to add this feature to fieldtrial_testing_config and pass all tests.
-  aw_feature_overrides.EnableFeature(blink::features::kElementGetInnerHTML);
-
   // These features have shown performance improvements in WebView but not some
   // other platforms.
   aw_feature_overrides.EnableFeature(features::kEnsureExistingRendererAlive);
@@ -309,4 +289,7 @@ void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
   // WebView.
   aw_feature_overrides.DisableFeature(
       base::features::kPartitionAllocMemoryTagging);
+
+  // Disable Topics on WebView.
+  aw_feature_overrides.DisableFeature(blink::features::kBrowsingTopics);
 }

tools/under-control/src/chrome/android/java/AndroidManifest.xml

@@ -948,7 +948,13 @@ by a child template that "extends" this file.
             android:excludeFromRecents="true"
             android:windowSoftInputMode="adjustResize"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
-            android:hardwareAccelerated="false" />
+            android:hardwareAccelerated="false">
+            <intent-filter>
+                <action android:name="android.intent.action.WEB_SEARCH" />
+                <!-- Permits Chrome to act as a default handler for WEB_SEARCH intents. -->
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+      </activity>
 
         <!-- GcmTaskService for registration for Invalidations. Not actually implemented anymore. -->
         <service android:name="com.google.ipc.invalidation.ticl.android2.channel.GcmRegistrationTaskService"
@@ -1088,9 +1094,10 @@ by a child template that "extends" this file.
 
         <!-- Activities for task manager. -->
         <activity
-            android:name="org.chromium.chrome.browser.task_manager.TaskManagerActivity"
+            android:name="org.chromium.chrome.browser.task_manager.ui.TaskManagerActivity"
             android:exported="false"
-            android:theme="@style/Theme.Chromium.Activity">
+            android:theme="@style/Theme.Chromium.Activity"
+            android:launchMode="singleInstance">
         </activity>
 
         <receiver android:name="org.chromium.chrome.browser.notifications.scheduler.DisplayAgent$Receiver"
@@ -1335,6 +1342,13 @@ by a child template that "extends" this file.
                   android:readPermission="android.permission.GLOBAL_SEARCH" />
       </provider>
 
+      <provider
+            android:name="org.chromium.chrome.browser.provider.PageContentProvider"
+            android:authorities="{{ manifest_package }}.PageContentProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+      </provider>
+
       {% block base_application_definitions %}
       {% endblock %}
       {% block extra_application_definitions_for_test %}