[pull] master from chromium:master

DEPS

@@ -209,7 +209,7 @@ 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': '9d11cbdef8547d33fa4d1dd8bd4a623df9475ecc',
+  'skia_revision': 'd8c2750cf607df6b765b1efe51dcb6d90e294cbf',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
@@ -280,7 +280,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': 'eb5af39fe4ebfa192ad1c4821c6de2bb998de2df',
+  'catapult_revision': '09248fe4327ccc493cd70a49f741d044bf33e1be',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.
@@ -504,7 +504,7 @@ deps = {
     'packages': [
       {
         'package': 'chromium/chrome/test/data/autofill/captured_sites',
-        'version': '-vI5CMccdvrghkWJqjvLu9QWqnAvidTWtzK46qs_rdcC',
+        'version': 'OokRFv9eH5WdCbodw09oxOP9JdN6GijYpkNbOZRr85UC',
       }
     ],
     'condition': 'checkout_chromium_autofill_test_dependencies',
@@ -1411,7 +1411,7 @@ deps = {
       'packages': [
           {
               'package': 'fuchsia/third_party/aemu/linux-amd64',
-              'version': 'cgsZ4Tlh31ekQv6m8-zELPLTF0s9SqAalvHGlmWrlQkC'
+              'version': 'I7MELvwpxgQpRokYTSnS20jdXqx9-i_4TFD9QFLyCbEC'
           },
       ],
       'condition': 'host_os == "linux" and checkout_fuchsia',

WATCHLISTS

@@ -645,9 +645,7 @@
                   '|components/test/data/cast_certificate/',
     },
     'cast_channel': {
-      'filepath':  'chrome/test/data/extensions/api_test/cast_channel/' \
-                   '|components/cast_channel/' \
-                   '|extensions/browser/api/cast_channel'
+      'filepath':  'components/cast_channel/'
     },
     'cast_streaming': {
       'filepath': 'media/cast/' \

chrome/app/chromeos_strings.grdp

@@ -1593,6 +1593,9 @@
   <message name="IDS_CHALLENGE_RESPONSE_AUTH_INVALID_CLIENT_CERT_ERROR" desc="Error message shown when client certificate attributes extraction failed during the challenge-response based authentication.">
     Invalid client certificate
   </message>
+  <message name="IDS_FAILED_TO_FETCH_SAML_REDIRECT" desc="Error message shown when SAML redirect URL failed to be fetched">
+    Failed to fetch the SAML redirect URL from the server
+  </message>
 
   <!-- Strings used in <network-list>, used in Settings and OOBE -->
   <message name="IDS_NETWORK_LIST_INITIALIZING" desc="Text in the network list element when a Cellular network is initiailizing.">

chrome/app/chromeos_strings_grdp/IDS_FAILED_TO_FETCH_SAML_REDIRECT.png.sha1

@@ -0,0 +1 @@
+77b71aa7942261bb0f87f6a8a88b5c3c7844437c

chrome/browser/ash/login/active_directory_login_browsertest.cc

@@ -13,9 +13,11 @@
 #include "chrome/browser/ash/login/test/active_directory_login_mixin.h"
 #include "chrome/browser/ash/login/test/device_state_mixin.h"
 #include "chrome/browser/ash/login/test/oobe_base_test.h"
+#include "chrome/browser/ash/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/ash/login/test/oobe_screens_utils.h"
 #include "chrome/browser/ash/login/test/session_manager_state_waiter.h"
 #include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ui/webui/chromeos/login/signin_fatal_error_screen_handler.h"
 #include "chromeos/dbus/authpolicy/fake_authpolicy_client.h"
 #include "components/user_manager/user_names.h"
 #include "content/public/browser/network_service_instance.h"
@@ -163,6 +165,10 @@ IN_PROC_BROWSER_TEST_F(ActiveDirectoryLoginTest, LoginErrors) {
   fake_authpolicy_client()->set_auth_error(authpolicy::ERROR_UNKNOWN);
   ad_login_.SubmitActiveDirectoryCredentials(test_user_, kPassword);
   ad_login_.WaitForAuthError();
+
+  OobeScreenWaiter(SignInFatalErrorView::kScreenId).Wait();
+  test::ClickSignInFatalScreenActionButton();
+
   // Inputs are not invalidated for the unknown error.
   ad_login_.TestNoError();
   ad_login_.TestDomainHidden();

chrome/browser/ash/login/login_browsertest.cc

@@ -25,6 +25,7 @@
 #include "chrome/browser/ash/login/test/offline_login_test_mixin.h"
 #include "chrome/browser/ash/login/test/oobe_base_test.h"
 #include "chrome/browser/ash/login/test/oobe_screen_waiter.h"
+#include "chrome/browser/ash/login/test/oobe_screens_utils.h"
 #include "chrome/browser/ash/login/test/session_manager_state_waiter.h"
 #include "chrome/browser/ash/login/test/test_predicate_waiter.h"
 #include "chrome/browser/ash/login/test/user_adding_screen_utils.h"
@@ -142,6 +143,8 @@ IN_PROC_BROWSER_TEST_F(LoginOnlineCryptohomeError, FatalScreenShown) {
                                 FakeGaiaMixin::kFakeUserPassword,
                                 FakeGaiaMixin::kEmptyUserServices);
   OobeScreenWaiter(SignInFatalErrorView::kScreenId).Wait();
+  test::ClickSignInFatalScreenActionButton();
+  OobeScreenWaiter(GaiaView::kScreenId).Wait();
 }
 
 class LoginOfflineManagedTest : public LoginManagerTest {

chrome/browser/ash/login/screens/active_directory_login_screen.cc

@@ -4,7 +4,9 @@
 
 #include "chrome/browser/ash/login/screens/active_directory_login_screen.h"
 
+#include "chrome/browser/ash/login/screens/signin_fatal_error_screen.h"
 #include "chrome/browser/ash/login/ui/login_display_host.h"
+#include "chrome/browser/ash/login/ui/signin_ui.h"
 #include "chrome/browser/ash/login/wizard_controller.h"
 #include "chrome/browser/ui/webui/chromeos/login/active_directory_login_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
@@ -21,15 +23,15 @@ namespace {
 
 constexpr char kUserActionCancel[] = "cancel";
 
-std::string GetErrorMessage(authpolicy::ErrorType error) {
+chromeos::SigninError GetSigninError(authpolicy::ErrorType error) {
   switch (error) {
     case authpolicy::ERROR_NETWORK_PROBLEM:
-      return l10n_util::GetStringUTF8(IDS_AD_AUTH_NETWORK_ERROR);
+      return chromeos::SigninError::kActiveDirectoryNetworkProblem;
     case authpolicy::ERROR_KDC_DOES_NOT_SUPPORT_ENCRYPTION_TYPE:
-      return l10n_util::GetStringUTF8(IDS_AD_AUTH_NOT_SUPPORTED_ENCRYPTION);
+      return chromeos::SigninError::kActiveDirectoryNotSupportedEncryption;
     default:
       DLOG(WARNING) << "Unhandled error code: " << error;
-      return l10n_util::GetStringUTF8(IDS_AD_AUTH_UNKNOWN_ERROR);
+      return chromeos::SigninError::kActiveDirectoryUnknownError;
   }
 }
 
@@ -165,7 +167,9 @@ void ActiveDirectoryLoginScreen::OnAdAuthResult(
     default:
       view_->SetErrorState(username,
                            static_cast<int>(ActiveDirectoryErrorState::NONE));
-      view_->ShowSignInError(GetErrorMessage(error));
+      LoginDisplayHost::default_host()->GetSigninUI()->ShowSigninError(
+          GetSigninError(error), /*details=*/std::string(),
+          /*login_attempts=*/1);
   }
 }
 

chrome/browser/ash/login/test/oobe_screens_utils.cc

@@ -176,6 +176,10 @@ void ExitScreenSyncConsent() {
   WaitForExit(SyncConsentScreenView::kScreenId);
 }
 
+void ClickSignInFatalScreenActionButton() {
+  test::OobeJS().ClickOnPath({"signin-fatal-error", "actionButton"});
+}
+
 bool IsScanningRequestedOnNetworkScreen() {
   return test::OobeJS().GetAttributeBool(
       "enableWifiScans",

chrome/browser/ash/login/test/oobe_screens_utils.h

@@ -32,6 +32,8 @@ void TapEulaAccept();
 void WaitForSyncConsentScreen();
 void ExitScreenSyncConsent();
 
+void ClickSignInFatalScreenActionButton();
+
 bool IsScanningRequestedOnNetworkScreen();
 bool IsScanningRequestedOnErrorScreen();
 

chrome/browser/ash/login/ui/login_display_host_common.cc

@@ -138,14 +138,29 @@ int ErrorToMessageId(SigninError error) {
       return IDS_LOGIN_ERROR_AUTHENTICATING;
     case SigninError::kOwnerKeyLost:
       return IDS_LOGIN_ERROR_OWNER_KEY_LOST;
+    case SigninError::kChallengeResponseAuthMultipleClientCerts:
+      return IDS_CHALLENGE_RESPONSE_AUTH_MULTIPLE_CLIENT_CERTS_ERROR;
+    case SigninError::kChallengeResponseAuthInvalidClientCert:
+      return IDS_CHALLENGE_RESPONSE_AUTH_INVALID_CLIENT_CERT_ERROR;
+    case SigninError::kCookieWaitTimeout:
+      return IDS_LOGIN_FATAL_ERROR_NO_AUTH_TOKEN;
+    case SigninError::kFailedToFetchSamlRedirect:
+      return IDS_FAILED_TO_FETCH_SAML_REDIRECT;
+    case SigninError::kActiveDirectoryNetworkProblem:
+      return IDS_AD_AUTH_NETWORK_ERROR;
+    case SigninError::kActiveDirectoryNotSupportedEncryption:
+      return IDS_AD_AUTH_NOT_SUPPORTED_ENCRYPTION;
+    case SigninError::kActiveDirectoryUnknownError:
+      return IDS_AD_AUTH_UNKNOWN_ERROR;
   }
 }
 
 bool IsAuthError(SigninError error) {
-  return error != SigninError::kOwnerKeyLost &&
-         error != SigninError::kOwnerRequired &&
-         error != SigninError::kGoogleAccountNotAllowed &&
-         error != SigninError::kTpmUpdateRequired;
+  return error == SigninError::kCaptivePortalError ||
+         error == SigninError::kAuthenticationError ||
+         error == SigninError::kOfflineFailedNetworkNotConnected ||
+         error == SigninError::kAuthenticatingNew ||
+         error == SigninError::kAuthenticating;
 }
 
 }  // namespace

chrome/browser/ash/login/ui/signin_ui.h

@@ -21,6 +21,13 @@ enum class SigninError {
   kAuthenticatingNew,
   kAuthenticating,
   kOwnerKeyLost,
+  kChallengeResponseAuthMultipleClientCerts,
+  kChallengeResponseAuthInvalidClientCert,
+  kCookieWaitTimeout,
+  kFailedToFetchSamlRedirect,
+  kActiveDirectoryNetworkProblem,
+  kActiveDirectoryNotSupportedEncryption,
+  kActiveDirectoryUnknownError,
 };
 
 // This class represents an interface between code that performs sign-in

chrome/browser/extensions/extension_sync_service.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/extensions/extension_sync_service.h"
 
-#include <memory>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ -19,11 +18,7 @@
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/sync_start_util.h"
-#include "chrome/browser/web_applications/components/install_manager.h"
-#include "chrome/browser/web_applications/components/web_app_provider_base.h"
-#include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chrome/common/buildflags.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "components/sync/model/sync_change.h"
 #include "components/sync/model/sync_error_factory.h"
@@ -33,7 +28,6 @@
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
-#include "extensions/common/image_util.h"
 #include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/permissions/permissions_data.h"
 
@@ -475,11 +469,8 @@ void ExtensionSyncService::ApplySyncData(
     }
 
     if (!extension_sync_data.bookmark_app_url().empty()) {
-      // Handles creating and updating the bookmark app only if
-      // kSyncBookmarkApps is enabled. Bookmark apps have been migrated to web
-      // apps and are now handled by WebAppSyncBridge.
-      if (base::FeatureList::IsEnabled(features::kSyncBookmarkApps))
-        ApplyBookmarkAppSyncData(extension_sync_data);
+      // Bookmark apps have been migrated to web apps and are now handled by
+      // WebAppSyncBridge.
       return;
     }
   }
@@ -513,50 +504,6 @@ void ExtensionSyncService::ApplySyncData(
     extension_service()->CheckForUpdatesSoon();
 }
 
-void ExtensionSyncService::ApplyBookmarkAppSyncData(
-    const ExtensionSyncData& extension_sync_data) {
-  DCHECK(extension_sync_data.is_app());
-
-  // Process bookmark app sync if necessary.
-  GURL bookmark_app_url(extension_sync_data.bookmark_app_url());
-  if (!bookmark_app_url.is_valid() ||
-      extension_sync_data.uninstalled()) {
-    return;
-  }
-
-  auto web_app_info = std::make_unique<WebApplicationInfo>();
-  web_app_info->start_url = bookmark_app_url;
-  web_app_info->title = base::UTF8ToUTF16(extension_sync_data.name());
-  web_app_info->description =
-      base::UTF8ToUTF16(extension_sync_data.bookmark_app_description());
-  web_app_info->scope = GURL(extension_sync_data.bookmark_app_scope());
-  web_app_info->theme_color = extension_sync_data.bookmark_app_theme_color();
-  web_app_info->open_as_window =
-      extension_sync_data.launch_type() == extensions::LAUNCH_TYPE_WINDOW;
-
-  if (!extension_sync_data.bookmark_app_icon_color().empty()) {
-    extensions::image_util::ParseHexColorString(
-        extension_sync_data.bookmark_app_icon_color(),
-        &web_app_info->generated_icon_color);
-  }
-  for (const auto& icon : extension_sync_data.linked_icons()) {
-    WebApplicationIconInfo icon_info;
-    icon_info.url = icon.url;
-    icon_info.square_size_px = icon.size;
-    // Web apps in Extensions system supports Purpose::ANY icons only.
-    icon_info.purpose = blink::mojom::ManifestImageResource_Purpose::ANY;
-    web_app_info->icon_infos.push_back(icon_info);
-  }
-
-  auto* provider = web_app::WebAppProviderBase::GetProviderBase(profile_);
-  // Legacy profiles containing server-side bookmark apps data must be excluded
-  // from sync if the web apps system is disabled for such a profile.
-  if (provider) {
-    provider->install_manager().InstallBookmarkAppFromSync(
-        extension_sync_data.id(), std::move(web_app_info), base::DoNothing());
-  }
-}
-
 void ExtensionSyncService::SetSyncStartFlareForTesting(
     const syncer::SyncableService::StartSyncFlare& flare) {
   flare_ = flare;

chrome/browser/extensions/extension_sync_service.h

@@ -106,10 +106,6 @@ class ExtensionSyncService : public syncer::SyncableService,
   // Applies the given change coming in from the server to the local state.
   void ApplySyncData(const extensions::ExtensionSyncData& extension_sync_data);
 
-  // Applies the bookmark app specific parts of |extension_sync_data|.
-  void ApplyBookmarkAppSyncData(
-      const extensions::ExtensionSyncData& extension_sync_data);
-
   // Collects the ExtensionSyncData for all installed apps or extensions.
   std::vector<extensions::ExtensionSyncData> GetLocalSyncDataList(
       syncer::ModelType type) const;

chrome/browser/resources/chromeos/emoji_picker/emoji_picker.html

@@ -186,7 +186,9 @@
   </div>
   <div class="sr-only" role="heading" aria-level="1">Emoji Groups</div>
   <div class="side-padding">
-    <div id="bar" on-transitionend="onBarTransitionEnd"></div>
+    <div id="bar"
+      on-transitionend="onBarTransitionEnd"
+      on-transitionstart="onBarTransitionStart"></div>
   </div>
   <div class="divider"></div>
 

chrome/browser/resources/chromeos/emoji_picker/emoji_picker.js

@@ -211,6 +211,10 @@ export class EmojiPicker extends PolymerElement {
     this.$.listContainer.style.display = newValue ? 'none' : '';
   }
 
+  onBarTransitionStart() {
+    this.highlightBarMoving = true;
+  }
+
   onBarTransitionEnd() {
     this.highlightBarMoving = false;
   }
@@ -262,15 +266,13 @@ export class EmojiPicker extends PolymerElement {
   onRightChevronClick() {
     this.shadowRoot.getElementById('tabs').scrollLeft = GROUP_ICON_SIZE * 6;
     this.scrollToGroup(GROUP_TABS[GROUP_PER_ROW - 3].groupId);
-    this.highlightBarMoving = true;
     this.groupTabsMoving = true;
     this.shadowRoot.getElementById('bar').style.left = EMOJI_GROUP_SIZE_PX;
   }
 
   onLeftChevronClick() {
     this.shadowRoot.getElementById('tabs').scrollLeft = 0;
     this.scrollToGroup(GROUP_TABS[0].groupId);
-    this.highlightBarMoving = true;
     this.groupTabsMoving = true;
     if (this.history.emoji.length > 0) {
       this.shadowRoot.getElementById('bar').style.left = '0';

chrome/browser/resources/chromeos/login/md_login.js

@@ -45,9 +45,6 @@ HTMLImports.whenReady(() => {
         chrome.send('screenStateInitialize');
       },
 
-      // Dummy Oobe functions not present with stripped login UI.
-      refreshA11yInfo(data) {},
-
       /**
        * Reloads content of the page.
        * @param {!Object} data New dictionary with i18n values.