[pull] main from chromium:main

DEPS

@@ -239,15 +239,15 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': 'dc60ca197e0280fb2fe82e42321498a0443b408f',
+  'skia_revision': 'fec9a3027c9e54b6671769c8d04d07382214c557',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
   'v8_revision': 'ceb9223e1ab1df795d5f3e69f9fae92bb8328e92',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
-  'angle_revision': '26fa0fe68b928dcf037b0fbd8af07e88d4f91235',
+  'angle_revision': '6706799186683dd3733c4610de09d84721aa08c8',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
@@ -314,7 +314,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling devtools-frontend
   # and whatever else without interference from each other.
-  'devtools_frontend_revision': 'd692cac31ffea822377407e775750d9f6a042eba',
+  'devtools_frontend_revision': 'de5ebd0ec8b1cce77140041cd80a14d8ec28bdad',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libprotobuf-mutator
   # and whatever else without interference from each other.
@@ -799,7 +799,7 @@ deps = {
     'packages': [
       {
           'package': 'chromium/third_party/androidx',
-          'version': 'rjqESjGVnqj61OsILGz2zAx9aZu_63YrdoiwrUlJrHoC',
+          'version': 'JA8W6XUESiIusRecU6mz7G-zjV6Tk4hlDO5hwQf6i8YC',
       },
     ],
     'condition': 'checkout_android',
@@ -1038,7 +1038,7 @@ deps = {
   },
 
   'src/third_party/depot_tools':
-    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'fd41e488b72ece0125db83730f298a9e1393bc86',
+    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '168ca4d812a03fc41408c8eb8fdca34083a7a135',
 
   'src/third_party/devtools-frontend/src':
     Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),
@@ -1642,7 +1642,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'c843f8d63c8c17acfbb7d48e09059a581ba779b9',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + 'd525e2d9f71f02832a8c8d2d63d47b96c16a00fe',
+    Var('webrtc_git') + '/src.git' + '@' + 'f8e160e1c9f8e805e94be71e2f2da3259dd88b8f',
 
   'src/third_party/libgifcodec':
      Var('skia_git') + '/libgifcodec' + '@'+  Var('libgifcodec_revision'),
@@ -1700,7 +1700,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@cc4f8ef12d745384de360d967ac3f324fdeb8b67',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@6d21a3cb937a00f0212b50f7d0744ac830cc654d',
     'condition': 'checkout_src_internal',
   },
 

android_webview/browser/metrics/aw_metrics_service_client.cc

@@ -104,6 +104,25 @@ int AwMetricsServiceClient::GetSampleRatePerMille() const {
   return kBetaDevCanarySampledInRatePerMille;
 }
 
+std::string AwMetricsServiceClient::GetAppPackageNameIfLoggable() {
+  if (!base::FeatureList::IsEnabled(
+          android_webview::features::kWebViewAppsPackageNamesAllowlist)) {
+    // Revert to the default implementation.
+    return ::metrics::AndroidMetricsServiceClient::
+        GetAppPackageNameIfLoggable();
+  }
+  AndroidMetricsServiceClient::InstallerPackageType installer_type =
+      GetInstallerPackageType();
+  // Always record the app package name of system apps even if it's not in the
+  // allowlist.
+  if (installer_type == InstallerPackageType::SYSTEM_APP ||
+      (installer_type == InstallerPackageType::GOOGLE_PLAY_STORE &&
+       ShouldRecordPackageName())) {
+    return GetAppPackageName();
+  }
+  return std::string();
+}
+
 bool AwMetricsServiceClient::ShouldRecordPackageName() {
   if (!base::FeatureList::IsEnabled(
           android_webview::features::kWebViewAppsPackageNamesAllowlist)) {

android_webview/browser/metrics/aw_metrics_service_client.h

@@ -172,6 +172,10 @@ class AwMetricsServiceClient : public ::metrics::AndroidMetricsServiceClient,
   void RegisterAdditionalMetricsProviders(
       metrics::MetricsService* service) override;
 
+  // Gets the embedding app's package name if it's OK to log. Otherwise, this
+  // returns the empty string.
+  std::string GetAppPackageNameIfLoggable() override;
+
   // If `android_webview::features::kWebViewAppsPackageNamesAllowlist` is
   // enabled:
   // - It returns `true` if the app is in the list of allowed apps.

android_webview/browser/metrics/aw_metrics_service_client_unittest.cc

@@ -14,6 +14,7 @@
 #include "base/test/test_simple_task_runner.h"
 #include "base/time/time.h"
 #include "base/version.h"
+#include "components/embedder_support/android/metrics/android_metrics_service_client.h"
 #include "components/prefs/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -22,6 +23,9 @@ namespace android_webview {
 using AppPackageNameLoggingRuleStatus =
     AwMetricsServiceClient::AppPackageNameLoggingRuleStatus;
 
+using InstallerPackageType =
+    metrics::AndroidMetricsServiceClient::InstallerPackageType;
+
 namespace {
 
 constexpr char kTestAllowlistVersion[] = "123.456.789.10";
@@ -245,4 +249,64 @@ TEST_F(AwMetricsServiceClientTest, TestShouldRecordPackageName_SameAsCache) {
       "Android.WebView.Metrics.PackagesAllowList.RecordStatus", 1);
 }
 
+TEST_F(AwMetricsServiceClientTest, TestGetAppPackageNameIfLoggable) {
+  base::test::ScopedFeatureList scoped_list;
+  scoped_list.InitAndEnableFeature(
+      android_webview::features::kWebViewAppsPackageNamesAllowlist);
+
+  class TestClient : public AwMetricsServiceClient {
+   public:
+    TestClient()
+        : AwMetricsServiceClient(
+              std::make_unique<AwMetricsServiceClientTestDelegate>()) {}
+    ~TestClient() override = default;
+
+    bool ShouldRecordPackageName() override {
+      return should_record_package_name_;
+    }
+
+    void SetShouldRecordPackageName(bool value) {
+      should_record_package_name_ = value;
+    }
+
+    InstallerPackageType GetInstallerPackageType() override {
+      return installer_type_;
+    }
+
+    void SetInstallerPackageType(InstallerPackageType installer_type) {
+      installer_type_ = installer_type;
+    }
+
+   private:
+    bool should_record_package_name_;
+    InstallerPackageType installer_type_;
+  };
+
+  TestClient client;
+
+  // Package names of system apps are always loggable even if they are not in
+  // the allowlist of apps.
+  client.SetInstallerPackageType(InstallerPackageType::SYSTEM_APP);
+  client.SetShouldRecordPackageName(false);
+  EXPECT_FALSE(client.GetAppPackageNameIfLoggable().empty());
+  client.SetShouldRecordPackageName(true);
+  EXPECT_FALSE(client.GetAppPackageNameIfLoggable().empty());
+
+  // Package names of APPs that are installed by the Play Store are loggable if
+  // they are in the allowlist of apps.
+  client.SetInstallerPackageType(InstallerPackageType::GOOGLE_PLAY_STORE);
+  client.SetShouldRecordPackageName(false);
+  EXPECT_TRUE(client.GetAppPackageNameIfLoggable().empty());
+  client.SetShouldRecordPackageName(true);
+  EXPECT_FALSE(client.GetAppPackageNameIfLoggable().empty());
+
+  // Package names of APPs that are not system apps nor installed by the Play
+  // Store are not loggable.
+  client.SetInstallerPackageType(InstallerPackageType::OTHER);
+  client.SetShouldRecordPackageName(false);
+  EXPECT_TRUE(client.GetAppPackageNameIfLoggable().empty());
+  client.SetShouldRecordPackageName(true);
+  EXPECT_TRUE(client.GetAppPackageNameIfLoggable().empty());
+}
+
 }  // namespace android_webview

android_webview/common/crash_reporter/crash_keys.cc

@@ -128,6 +128,12 @@ const char* const kWebViewCrashKeyAllowList[] = {
 
     "VerifyDidCommit-has_si_url",
 
+    "NoNode-ftn_is_main_frame",
+    "NoNode-ftn_child_count",
+    "NoNode-bfs_depth",
+    "NoFTN-is_main_frame",
+    "NoFTN-children_size",
+
     // services/network
     "network_deserialization",
 

android_webview/javatests/src/org/chromium/android_webview/test/AwMetricsIntegrationTest.java

@@ -39,6 +39,7 @@
 import org.chromium.components.metrics.AndroidMetricsLogUploader;
 import org.chromium.components.metrics.AndroidMetricsServiceClient;
 import org.chromium.components.metrics.ChromeUserMetricsExtensionProtos.ChromeUserMetricsExtension;
+import org.chromium.components.metrics.InstallerPackageType;
 import org.chromium.components.metrics.MetricsSwitches;
 import org.chromium.components.metrics.StabilityEventType;
 import org.chromium.components.metrics.SystemProfileProtos.SystemProfileProto;
@@ -385,7 +386,8 @@ public void testMetadata_appPackageName() throws Throwable {
 
         mRule.runOnUiThread(() -> {
             AwBrowserProcess.setWebViewPackageName(appPackageName);
-            AndroidMetricsServiceClient.setCanRecordPackageNameForAppTypeForTesting(true);
+            AndroidMetricsServiceClient.setInstallerPackageTypeForTesting(
+                    InstallerPackageType.GOOGLE_PLAY_STORE);
             // A valid version string and non expired date means the app package name should be
             // recorded.
             AwMetricsServiceClient.setAppPackageNameLoggingRuleForTesting(

android_webview/test/BUILD.gn

@@ -532,6 +532,7 @@ test("android_webview_unittests") {
     "//components/component_updater",
     "//components/component_updater/android:embedded_component_loader",
     "//components/embedder_support/android:util",
+    "//components/embedder_support/android/metrics:metrics",
     "//components/flags_ui:flags_ui",
     "//components/metrics",
     "//components/metrics:component_metrics",

ash/BUILD.gn

@@ -2178,7 +2178,6 @@ component("ash") {
     # on it. TODO(stevenjb): Assert on //chromeos/dbus/cryptohome_client once it
     # is extracted from //chromeos/dbus. https://crbug.com/647367.
     "//chromeos/cryptohome",
-    "//chromeos/login/auth",
     "//chromeos/tpm",
 
     # Ash should not depend upon content at all.

ash/capture_mode/capture_mode_unittests.cc

@@ -41,6 +41,7 @@
 #include "ash/projector/test/mock_projector_client.h"
 #include "ash/public/cpp/capture_mode/capture_mode_test_api.h"
 #include "ash/public/cpp/holding_space/holding_space_test_api.h"
+#include "ash/public/cpp/projector/projector_new_screencast_precondition.h"
 #include "ash/public/cpp/projector/projector_session.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
@@ -5044,7 +5045,8 @@ TEST_F(ProjectorCaptureModeIntegrationTests,
   controller->StartVideoRecordingImmediatelyForTesting();
   EXPECT_TRUE(controller->is_recording_in_progress());
   EXPECT_FALSE(ProjectorSession::Get()->is_active());
-  EXPECT_FALSE(ProjectorController::Get()->CanStartNewSession());
+  EXPECT_NE(ProjectorController::Get()->GetNewScreencastPrecondition().state,
+            NewScreencastPreconditionState::kEnabled);
 }
 
 namespace {

ash/components/BUILD.gn

@@ -18,6 +18,7 @@ source_set("unit_tests") {
     "//ash/components/drivefs:unit_tests",
     "//ash/components/fwupd:unit_tests",
     "//ash/components/geolocation:unit_tests",
+    "//ash/components/login/auth:unit_tests",
     "//ash/components/login/session:unit_tests",
     "//ash/components/peripheral_notification:unit_tests",
     "//ash/components/phonehub:unit_tests",

chromeos/login/auth/BUILD.gn → ash/components/login/auth/BUILD.gn

@@ -2,13 +2,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chromeos/ui_mode.gni")
 import("//testing/test.gni")
 import("//third_party/protobuf/proto_library.gni")
 
-assert(is_chromeos, "Non-Chrome-OS builds must not depend on //chromeos")
+assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash")
 
 component("auth") {
-  defines = [ "IS_CHROMEOS_LOGIN_AUTH_IMPL" ]
+  defines = [ "IS_ASH_LOGIN_AUTH_IMPL" ]
   public_deps = [ ":challenge_response_key" ]
   deps = [
     "//ash/constants",
@@ -109,7 +110,7 @@ source_set("test_support") {
 # This is a separate targat to avoid a circular dependency with
 # chromeos/cryptohome.
 source_set("challenge_response_key") {
-  defines = [ "IS_CHROMEOS_LOGIN_AUTH_IMPL" ]
+  defines = [ "IS_ASH_LOGIN_AUTH_IMPL" ]
   deps = [ "//base" ]
   sources = [
     "challenge_response_key.cc",

chromeos/login/auth/auth_attempt_state.cc → ash/components/login/auth/auth_attempt_state.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/login/auth/auth_attempt_state.h"
+#include "ash/components/login/auth/auth_attempt_state.h"
 
 #include <utility>
 

chromeos/login/auth/auth_attempt_state.h → ash/components/login/auth/auth_attempt_state.h

@@ -2,24 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_LOGIN_AUTH_AUTH_ATTEMPT_STATE_H_
-#define CHROMEOS_LOGIN_AUTH_AUTH_ATTEMPT_STATE_H_
+#ifndef ASH_COMPONENTS_LOGIN_AUTH_AUTH_ATTEMPT_STATE_H_
+#define ASH_COMPONENTS_LOGIN_AUTH_AUTH_ATTEMPT_STATE_H_
 
 #include <memory>
 #include <string>
 
+#include "ash/components/login/auth/auth_status_consumer.h"
+#include "ash/components/login/auth/user_context.h"
 #include "base/component_export.h"
 #include "base/memory/weak_ptr.h"
-#include "chromeos/login/auth/auth_status_consumer.h"
-#include "chromeos/login/auth/user_context.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 // Tracks the state associated with a single attempt to log in to chromium OS.
 // Enforces that methods are only called on the UI thread.
-class COMPONENT_EXPORT(CHROMEOS_LOGIN_AUTH) AuthAttemptState
+class COMPONENT_EXPORT(ASH_LOGIN_AUTH) AuthAttemptState
     : public base::SupportsWeakPtr<AuthAttemptState> {
  public:
   // Used to initialize for a login attempt.
@@ -88,4 +88,4 @@ class COMPONENT_EXPORT(CHROMEOS_LOGIN_AUTH) AuthAttemptState
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_LOGIN_AUTH_AUTH_ATTEMPT_STATE_H_
+#endif  // ASH_COMPONENTS_LOGIN_AUTH_AUTH_ATTEMPT_STATE_H_

chromeos/login/auth/auth_session_authenticator.cc → ash/components/login/auth/auth_session_authenticator.cc

@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/login/auth/auth_session_authenticator.h"
+#include "ash/components/login/auth/auth_session_authenticator.h"
 
+#include "ash/components/login/auth/cryptohome_key_constants.h"
+#include "ash/components/login/auth/cryptohome_parameter_utils.h"
+#include "ash/components/login/auth/user_context.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ -14,9 +17,6 @@
 #include "chromeos/cryptohome/userdataauth_util.h"
 #include "chromeos/dbus/cryptohome/UserDataAuth.pb.h"
 #include "chromeos/dbus/userdataauth/userdataauth_client.h"
-#include "chromeos/login/auth/cryptohome_key_constants.h"
-#include "chromeos/login/auth/cryptohome_parameter_utils.h"
-#include "chromeos/login/auth/user_context.h"
 #include "components/device_event_log/device_event_log.h"
 #include "components/user_manager/user_names.h"
 

chromeos/login/auth/auth_session_authenticator.h → ash/components/login/auth/auth_session_authenticator.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_LOGIN_AUTH_AUTH_SESSION_AUTHENTICATOR_H_
-#define CHROMEOS_LOGIN_AUTH_AUTH_SESSION_AUTHENTICATOR_H_
+#ifndef ASH_COMPONENTS_LOGIN_AUTH_AUTH_SESSION_AUTHENTICATOR_H_
+#define ASH_COMPONENTS_LOGIN_AUTH_AUTH_SESSION_AUTHENTICATOR_H_
 
+#include "ash/components/login/auth/authenticator.h"
+#include "ash/components/login/auth/safe_mode_delegate.h"
 #include "base/component_export.h"
 #include "base/memory/weak_ptr.h"
 #include "chromeos/dbus/cryptohome/UserDataAuth.pb.h"
-#include "chromeos/login/auth/authenticator.h"
-#include "chromeos/login/auth/safe_mode_delegate.h"
 #include "components/account_id/account_id.h"
 #include "components/user_manager/user_type.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
@@ -45,7 +45,7 @@ class AuthStatusConsumer;
 //   * Different ways to hash plain text key
 //   * Different ways to create crytohome key from key in UserContext
 
-class COMPONENT_EXPORT(CHROMEOS_LOGIN_AUTH) AuthSessionAuthenticator
+class COMPONENT_EXPORT(ASH_LOGIN_AUTH) AuthSessionAuthenticator
     : public Authenticator {
  public:
   AuthSessionAuthenticator(
@@ -279,4 +279,4 @@ class COMPONENT_EXPORT(CHROMEOS_LOGIN_AUTH) AuthSessionAuthenticator
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_LOGIN_AUTH_AUTH_SESSION_AUTHENTICATOR_H_
+#endif  // ASH_COMPONENTS_LOGIN_AUTH_AUTH_SESSION_AUTHENTICATOR_H_

chromeos/login/auth/auth_status_consumer.cc → ash/components/login/auth/auth_status_consumer.cc

@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/login/auth/auth_status_consumer.h"
+#include "ash/components/login/auth/auth_status_consumer.h"
+
 #include "base/notreached.h"
 
 namespace chromeos {