From f292b332616dbb34ea95c641aaeb45cae7854417 Mon Sep 17 00:00:00 2001 From: chrome-weblayer-builder Date: Sun, 26 Sep 2021 22:25:16 +0000 Subject: [PATCH 01/25] [lacros skew tests] Refresh skew tests for M96 This CL updates the ash version 96.0.4654.0 for Lacros version skew testing. If this CL caused regressions, please revert and stop the autoroller at https://luci-scheduler.appspot.com/jobs/chrome/lacros-version-skew-roller Also please file a bug to OS>LaCrOS>Partner, and CC svenzheng@chromium.org, liaoyuke@chromium.org, yjt@google.com. R=rubber-stamper@appspot.gserviceaccount.com Bug: None Change-Id: Ie3a1084fd86024aad7681cf9908d0fa0b86e3c56 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184780 Auto-Submit: chrome-weblayer-builder Commit-Queue: Rubber Stamper Bot-Commit: Rubber Stamper Cr-Commit-Position: refs/heads/main@{#925088} --- testing/buildbot/chromium.chromiumos.json | 16 +++--- testing/buildbot/chromium.fyi.json | 64 +++++++++++------------ testing/buildbot/variants.pyl | 8 +-- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index dd257c73acbf88..8e18b35acb1bef 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json @@ -5898,21 +5898,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4653.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4654.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_Lacros version skew testing ash 96.0.4653.0", + "name": "lacros_chrome_browsertests_Lacros version skew testing ash 96.0.4654.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v96.0.4653.0", - "revision": "version:96.0.4653.0" + "location": "lacros_version_skew_tests_v96.0.4654.0", + "revision": "version:96.0.4654.0" } ], "dimension_sets": [ @@ -6006,21 +6006,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4653.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4654.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 96.0.4653.0", + "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 96.0.4654.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v96.0.4653.0", - "revision": "version:96.0.4653.0" + "location": "lacros_version_skew_tests_v96.0.4654.0", + "revision": "version:96.0.4654.0" } ], "dimension_sets": [ diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index 1493f84ce81518..075bc8ccdb8f53 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json @@ -83471,7 +83471,7 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4653.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4654.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "isolate_profile_data": true, @@ -83479,14 +83479,14 @@ "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_Lacros version skew testing ash 96.0.4653.0", + "name": "lacros_chrome_browsertests_Lacros version skew testing ash 96.0.4654.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v96.0.4653.0", - "revision": "version:96.0.4653.0" + "location": "lacros_version_skew_tests_v96.0.4654.0", + "revision": "version:96.0.4654.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -83563,7 +83563,7 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4653.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4654.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "isolate_profile_data": true, @@ -83571,14 +83571,14 @@ "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 96.0.4653.0", + "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 96.0.4654.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v96.0.4653.0", - "revision": "version:96.0.4653.0" + "location": "lacros_version_skew_tests_v96.0.4654.0", + "revision": "version:96.0.4654.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -84947,21 +84947,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4653.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4654.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_Lacros version skew testing ash 96.0.4653.0", + "name": "lacros_chrome_browsertests_Lacros version skew testing ash 96.0.4654.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v96.0.4653.0", - "revision": "version:96.0.4653.0" + "location": "lacros_version_skew_tests_v96.0.4654.0", + "revision": "version:96.0.4654.0" } ], "dimension_sets": [ @@ -85059,21 +85059,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4653.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4654.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 96.0.4653.0", + "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 96.0.4654.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v96.0.4653.0", - "revision": "version:96.0.4653.0" + "location": "lacros_version_skew_tests_v96.0.4654.0", + "revision": "version:96.0.4654.0" } ], "dimension_sets": [ @@ -86614,21 +86614,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4653.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4654.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_Lacros version skew testing ash 96.0.4653.0", + "name": "lacros_chrome_browsertests_Lacros version skew testing ash 96.0.4654.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v96.0.4653.0", - "revision": "version:96.0.4653.0" + "location": "lacros_version_skew_tests_v96.0.4654.0", + "revision": "version:96.0.4654.0" } ], "dimension_sets": [ @@ -86726,21 +86726,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4653.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4654.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 96.0.4653.0", + "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 96.0.4654.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v96.0.4653.0", - "revision": "version:96.0.4653.0" + "location": "lacros_version_skew_tests_v96.0.4654.0", + "revision": "version:96.0.4654.0" } ], "dimension_sets": [ @@ -87483,21 +87483,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4653.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4654.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_Lacros version skew testing ash 96.0.4653.0", + "name": "lacros_chrome_browsertests_Lacros version skew testing ash 96.0.4654.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v96.0.4653.0", - "revision": "version:96.0.4653.0" + "location": "lacros_version_skew_tests_v96.0.4654.0", + "revision": "version:96.0.4654.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -87579,21 +87579,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4653.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4654.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 96.0.4653.0", + "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 96.0.4654.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v96.0.4653.0", - "revision": "version:96.0.4653.0" + "location": "lacros_version_skew_tests_v96.0.4654.0", + "revision": "version:96.0.4654.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl index 91e3abcc2f5e5e..4713e8ff87898a 100644 --- a/testing/buildbot/variants.pyl +++ b/testing/buildbot/variants.pyl @@ -52,16 +52,16 @@ }, 'LACROS_VERSION_SKEW_CANARY': { 'args': [ - '--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4653.0/test_ash_chrome', + '--ash-chrome-path-override=../../lacros_version_skew_tests_v96.0.4654.0/test_ash_chrome', '--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter', ], - 'identifier': 'Lacros version skew testing ash 96.0.4653.0', + 'identifier': 'Lacros version skew testing ash 96.0.4654.0', 'swarming': { 'cipd_packages': [ { 'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip', - 'location': 'lacros_version_skew_tests_v96.0.4653.0', - 'revision': 'version:96.0.4653.0', + 'location': 'lacros_version_skew_tests_v96.0.4654.0', + 'revision': 'version:96.0.4654.0', }, ], }, From a655e6b486f5ee3b05487319c79290ed34ac32e4 Mon Sep 17 00:00:00 2001 From: Sammie Quon Date: Sun, 26 Sep 2021 22:25:20 +0000 Subject: [PATCH 02/25] full_restore: Remove test only functions in full_restore_utils. Test: trybots Bug: none Change-Id: I3f0d4281db27ad23db7b25877277a42a6effd4e2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3183635 Auto-Submit: Sammie Quon Commit-Queue: Nancy Wang Reviewed-by: Nancy Wang Cr-Commit-Position: refs/heads/main@{#925089} --- ..._restore_app_launch_handler_browsertest.cc | 16 ++- .../full_restore_service_unittest.cc | 128 ++++++++++-------- components/app_restore/full_restore_utils.cc | 19 --- components/app_restore/full_restore_utils.h | 20 --- 4 files changed, 84 insertions(+), 99 deletions(-) diff --git a/chrome/browser/ash/app_restore/full_restore_app_launch_handler_browsertest.cc b/chrome/browser/ash/app_restore/full_restore_app_launch_handler_browsertest.cc index 21d2c962fd57c7..845ffd5dc54045 100644 --- a/chrome/browser/ash/app_restore/full_restore_app_launch_handler_browsertest.cc +++ b/chrome/browser/ash/app_restore/full_restore_app_launch_handler_browsertest.cc @@ -126,6 +126,15 @@ void RemoveInactiveDesks() { } } +// Gets the ARC app launch information from the full restore file for `app_id` +// and `session_id`. +std::unique_ptr<::app_restore::AppLaunchInfo> GetArcAppLaunchInfo( + const std::string& app_id, + int32_t session_id) { + return ::full_restore::FullRestoreReadHandler::GetInstance() + ->GetArcAppLaunchInfo(app_id, session_id); +} + class TestFullRestoreInfoObserver : public ::full_restore::FullRestoreInfo::Observer { public: @@ -1279,8 +1288,7 @@ class FullRestoreAppLaunchHandlerArcAppBrowserTest void VerifyGetArcAppLaunchInfo(const std::string& app_id, int32_t session_id, int32_t restore_window_id) { - auto app_launch_info = - ::full_restore::GetArcAppLaunchInfo(app_id, session_id); + auto app_launch_info = GetArcAppLaunchInfo(app_id, session_id); ASSERT_TRUE(app_launch_info); EXPECT_EQ(app_id, app_launch_info->app_id); @@ -1680,7 +1688,7 @@ IN_PROC_BROWSER_TEST_F(FullRestoreAppLaunchHandlerArcAppBrowserTest, VerifyWindowInfo(window, kActivationIndex); // Verify the ghost window session id has been removed from the restore data. - EXPECT_FALSE(::full_restore::GetArcAppLaunchInfo(app_id, session_id2)); + EXPECT_FALSE(GetArcAppLaunchInfo(app_id, session_id2)); // Destroy the task and close the window. app_host()->OnTaskDestroyed(kTaskId2); @@ -1786,7 +1794,7 @@ IN_PROC_BROWSER_TEST_F(FullRestoreAppLaunchHandlerArcAppBrowserTest, VerifyWindowInfo(window, kActivationIndex); // Verify the ghost window session id has been removed from the restore data. - EXPECT_FALSE(::full_restore::GetArcAppLaunchInfo(app_id, session_id3)); + EXPECT_FALSE(GetArcAppLaunchInfo(app_id, session_id3)); // Destroy the task and close the window. app_host()->OnTaskDestroyed(kTaskId2); diff --git a/chrome/browser/ash/app_restore/full_restore_service_unittest.cc b/chrome/browser/ash/app_restore/full_restore_service_unittest.cc index 4bf55280332092..3b619675ff5285 100644 --- a/chrome/browser/ash/app_restore/full_restore_service_unittest.cc +++ b/chrome/browser/ash/app_restore/full_restore_service_unittest.cc @@ -71,6 +71,22 @@ syncer::SyncData CreatePrefSyncData(const std::string& name, specifics, syncer::ClientTagHash::FromHashed("unused")); } +// Returns true if we should restore apps and pages based on the restore setting +// and the user's choice from the notification. Otherwise, returns false. +bool ShouldRestore(const AccountId& account_id) { + return ::full_restore::FullRestoreInfo::GetInstance()->ShouldRestore( + account_id); +} + +// Returns true if the restore pref is 'Always' or 'Ask every time', as we +// could restore apps and pages based on the user's choice from the +// notification for `account_id`. Otherwise, returns false, when the restore +// pref is 'Do not restore'. +bool CanPerformRestore(const AccountId& account_id) { + return ::full_restore::FullRestoreInfo::GetInstance()->CanPerformRestore( + account_id); +} + } // namespace class FullRestoreServiceTest : public testing::Test { @@ -212,7 +228,7 @@ TEST_F(FullRestoreServiceTest, Crash) { VerifyNotification(false /* has_crash_notification */, false /* has_restore_notification */); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOption()); } @@ -231,7 +247,7 @@ TEST_F(FullRestoreServiceTest, AskEveryTime) { false /* has_restore_notification */); EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOption()); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); } class FullRestoreServiceTestHavingFullRestoreFile @@ -288,8 +304,8 @@ TEST_F(FullRestoreServiceTestHavingFullRestoreFile, CrashAndRestore) { SimulateClick(kRestoreForCrashNotificationId, RestoreNotificationButtonIndex::kRestore); - EXPECT_TRUE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_TRUE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); EXPECT_TRUE(allow_save()); // Verify the set restore notification is not shown. @@ -309,8 +325,8 @@ TEST_F(FullRestoreServiceTestHavingFullRestoreFile, CrashAndCancel) { SimulateClick(kRestoreForCrashNotificationId, RestoreNotificationButtonIndex::kCancel); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); EXPECT_TRUE(allow_save()); } @@ -327,8 +343,8 @@ TEST_F(FullRestoreServiceTestHavingFullRestoreFile, CrashAndCloseNotification) { VerifyNotification(false /* has_crash_notification */, false /* has_restore_notification */); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); EXPECT_TRUE(allow_save()); } @@ -368,8 +384,8 @@ TEST_F(FullRestoreServiceTest, NewUserSyncOff) { VerifyNotification(false, false); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); } // For a new Chrome OS user, if the Chrome restore setting is 'Continue where @@ -383,8 +399,8 @@ TEST_F(FullRestoreServiceTest, NewUserSyncChromeRestoreSetting) { VerifyNotification(false, false); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); // Set the Chrome restore setting to simulate sync for the first time. syncer::SyncDataList sync_data_list; @@ -398,8 +414,8 @@ TEST_F(FullRestoreServiceTest, NewUserSyncChromeRestoreSetting) { VerifyNotification(false, false); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); // Update the global values to simulate sync from other device. syncer::SyncChangeList change_list; @@ -417,8 +433,8 @@ TEST_F(FullRestoreServiceTest, NewUserSyncChromeRestoreSetting) { content::RunAllTasksUntilIdle(); EXPECT_EQ(RestoreOption::kDoNotRestore, GetRestoreOption()); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_FALSE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_FALSE(CanPerformRestore(account_id())); } // For a new Chrome OS user, if the Chrome restore setting is 'New tab', after @@ -432,8 +448,8 @@ TEST_F(FullRestoreServiceTest, NewUserSyncChromeNotRestoreSetting) { VerifyNotification(false, false); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); // Set the Chrome restore setting to simulate sync for the first time. syncer::SyncDataList sync_data_list; @@ -447,8 +463,8 @@ TEST_F(FullRestoreServiceTest, NewUserSyncChromeNotRestoreSetting) { VerifyNotification(false, false); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); // Update the global values to simulate sync from other device. syncer::SyncChangeList change_list; @@ -466,8 +482,8 @@ TEST_F(FullRestoreServiceTest, NewUserSyncChromeNotRestoreSetting) { content::RunAllTasksUntilIdle(); EXPECT_EQ(RestoreOption::kDoNotRestore, GetRestoreOption()); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_FALSE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_FALSE(CanPerformRestore(account_id())); } // For a new Chrome OS user, keep the ChromeOS restore setting from sync, and @@ -480,8 +496,8 @@ TEST_F(FullRestoreServiceTest, ReImage) { VerifyNotification(false, false); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); // Set the restore pref setting to simulate sync for the first time. syncer::SyncDataList sync_data_list; @@ -498,8 +514,8 @@ TEST_F(FullRestoreServiceTest, ReImage) { VerifyNotification(false, false); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); // Update the global values to simulate sync from other device. syncer::SyncChangeList change_list; @@ -517,8 +533,8 @@ TEST_F(FullRestoreServiceTest, ReImage) { content::RunAllTasksUntilIdle(); EXPECT_EQ(RestoreOption::kAlways, GetRestoreOption()); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); } // For the current ChromeOS user, when first time upgrading to the full restore @@ -535,8 +551,8 @@ TEST_F(FullRestoreServiceTest, Upgrading) { VerifyNotification(false, false); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_FALSE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_FALSE(CanPerformRestore(account_id())); // Simulate the Chrome restore setting is changed. profile()->GetPrefs()->SetInteger( @@ -545,8 +561,8 @@ TEST_F(FullRestoreServiceTest, Upgrading) { // The OS restore setting should not change. EXPECT_EQ(RestoreOption::kDoNotRestore, GetRestoreOption()); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_FALSE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_FALSE(CanPerformRestore(account_id())); } // If the OS restore setting is 'Ask every time', after reboot, show the restore @@ -567,8 +583,8 @@ TEST_F(FullRestoreServiceTestHavingFullRestoreFile, AskEveryTimeAndRestore) { RestoreNotificationButtonIndex::kRestore); EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOption()); - EXPECT_TRUE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_TRUE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); EXPECT_TRUE(allow_save()); VerifyNotification(false, false); @@ -596,8 +612,8 @@ TEST_F(FullRestoreServiceTestHavingFullRestoreFile, AskEveryTimeAndSettings) { RestoreNotificationButtonIndex::kCancel); EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOption()); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); EXPECT_TRUE(allow_save()); // Click the setting button, the restore notification should not be closed. @@ -628,8 +644,8 @@ TEST_F(FullRestoreServiceTestHavingFullRestoreFile, FullRestoreService::MaybeCloseNotification(profile()); EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOption()); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); EXPECT_TRUE(allow_save()); VerifyNotification(false, false); @@ -661,8 +677,8 @@ TEST_F(FullRestoreServiceTestHavingFullRestoreFile, CloseNotificationEarly) { false /* has_restore_notification */); EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOption()); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); EXPECT_TRUE(allow_save()); } @@ -678,8 +694,8 @@ TEST_F(FullRestoreServiceTest, Always) { VerifyNotification(false, false); - EXPECT_TRUE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_TRUE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); } // If the OS restore setting is 'Do not restore', after reboot, don't show any @@ -695,8 +711,8 @@ TEST_F(FullRestoreServiceTest, NotRestore) { VerifyNotification(false, false); - EXPECT_FALSE(::full_restore::ShouldRestore(account_id())); - EXPECT_FALSE(::full_restore::CanPerformRestore(account_id())); + EXPECT_FALSE(ShouldRestore(account_id())); + EXPECT_FALSE(CanPerformRestore(account_id())); } class FullRestoreServiceMultipleUsersTest @@ -833,8 +849,8 @@ TEST_F(FullRestoreServiceMultipleUsersTest, TwoUsersLoginAtTheSameTime) { RestoreNotificationButtonIndex::kRestore); EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOption()); - EXPECT_TRUE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_TRUE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); EXPECT_TRUE(allow_save()); VerifyNotification(false /* has_crash_notification */, @@ -855,8 +871,8 @@ TEST_F(FullRestoreServiceMultipleUsersTest, TwoUsersLoginAtTheSameTime) { RestoreNotificationButtonIndex::kRestore); EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOptionForProfile2()); - EXPECT_TRUE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_TRUE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); EXPECT_TRUE(allow_save()); VerifyNotificationForProfile2(false /* has_crash_notification */, @@ -879,8 +895,8 @@ TEST_F(FullRestoreServiceMultipleUsersTest, TwoUsersLoginOneByOne) { RestoreNotificationButtonIndex::kRestore); EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOption()); - EXPECT_TRUE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_TRUE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); EXPECT_TRUE(allow_save()); VerifyNotification(false /* has_crash_notification */, @@ -908,8 +924,8 @@ TEST_F(FullRestoreServiceMultipleUsersTest, TwoUsersLoginOneByOne) { RestoreNotificationButtonIndex::kRestore); EXPECT_EQ(RestoreOption::kAskEveryTime, GetRestoreOptionForProfile2()); - EXPECT_TRUE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_TRUE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); EXPECT_TRUE(allow_save()); VerifyNotificationForProfile2(false /* has_crash_notification */, @@ -950,8 +966,8 @@ TEST_F(FullRestoreServiceMultipleUsersTest, TwoUsersLoginWithActiveUserLogin) { SimulateClickForProfile2(kRestoreNotificationId, RestoreNotificationButtonIndex::kRestore); - EXPECT_TRUE(::full_restore::ShouldRestore(account_id2())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id2())); + EXPECT_TRUE(ShouldRestore(account_id2())); + EXPECT_TRUE(CanPerformRestore(account_id2())); // Simulate switch to the first user. auto* full_restore_service = FullRestoreService::GetForProfile(profile()); @@ -964,8 +980,8 @@ TEST_F(FullRestoreServiceMultipleUsersTest, TwoUsersLoginWithActiveUserLogin) { SimulateClick(kRestoreNotificationId, RestoreNotificationButtonIndex::kRestore); - EXPECT_TRUE(::full_restore::ShouldRestore(account_id())); - EXPECT_TRUE(::full_restore::CanPerformRestore(account_id())); + EXPECT_TRUE(ShouldRestore(account_id())); + EXPECT_TRUE(CanPerformRestore(account_id())); // Simulate switch to the second user, and verify no more init process. full_restore_service2->OnTransitionedToNewActiveUser(profile2()); diff --git a/components/app_restore/full_restore_utils.cc b/components/app_restore/full_restore_utils.cc index 9a55a81ad56403..c718b9531dab69 100644 --- a/components/app_restore/full_restore_utils.cc +++ b/components/app_restore/full_restore_utils.cc @@ -5,7 +5,6 @@ #include "components/app_restore/full_restore_utils.h" #include "base/files/file_path.h" -#include "components/account_id/account_id.h" #include "components/app_restore/app_launch_info.h" #include "components/app_restore/desk_template_read_handler.h" #include "components/app_restore/features.h" @@ -33,16 +32,6 @@ void SaveWindowInfo(const app_restore::WindowInfo& window_info) { FullRestoreSaveHandler::GetInstance()->SaveWindowInfo(window_info); } -std::unique_ptr GetArcAppLaunchInfo( - const std::string& app_id, - int32_t session_id) { - if (!full_restore::features::IsFullRestoreEnabled()) - return nullptr; - - return FullRestoreReadHandler::GetInstance()->GetArcAppLaunchInfo(app_id, - session_id); -} - std::unique_ptr GetWindowInfo(aura::Window* window) { if (!full_restore::features::IsFullRestoreEnabled()) return nullptr; @@ -82,14 +71,6 @@ int32_t GetArcRestoreWindowIdForSessionId(int32_t session_id) { ->GetArcRestoreWindowIdForSessionId(session_id); } -bool ShouldRestore(const AccountId& account_id) { - return FullRestoreInfo::GetInstance()->ShouldRestore(account_id); -} - -bool CanPerformRestore(const AccountId& account_id) { - return FullRestoreInfo::GetInstance()->CanPerformRestore(account_id); -} - void SetActiveProfilePath(const base::FilePath& profile_path) { if (!full_restore::features::IsFullRestoreEnabled()) return; diff --git a/components/app_restore/full_restore_utils.h b/components/app_restore/full_restore_utils.h index bc93386c55823d..72ed5ddf3b2415 100644 --- a/components/app_restore/full_restore_utils.h +++ b/components/app_restore/full_restore_utils.h @@ -11,8 +11,6 @@ #include "ui/base/class_property.h" #include "ui/views/widget/widget.h" -class AccountId; - namespace app_restore { struct AppLaunchInfo; struct WindowInfo; @@ -51,13 +49,6 @@ void SaveAppLaunchInfo( COMPONENT_EXPORT(APP_RESTORE) void SaveWindowInfo(const app_restore::WindowInfo& window_info); -// Gets the ARC app launch information from the full restore file for `app_id` -// and `session_id`. -COMPONENT_EXPORT(APP_RESTORE) -std::unique_ptr GetArcAppLaunchInfo( - const std::string& app_id, - int32_t session_id); - // Gets the window information from the full restore file for |window|. COMPONENT_EXPORT(APP_RESTORE) std::unique_ptr GetWindowInfo(aura::Window* window); @@ -75,17 +66,6 @@ int32_t GetArcRestoreWindowIdForTaskId(int32_t task_id); COMPONENT_EXPORT(APP_RESTORE) int32_t GetArcRestoreWindowIdForSessionId(int32_t session_id); -// Returns true if we should restore apps and pages based on the restore setting -// and the user's choice from the notification. Otherwise, returns false. -COMPONENT_EXPORT(APP_RESTORE) bool ShouldRestore(const AccountId& account_id); - -// Returns true if the restore pref is 'Always' or 'Ask every time', as we -// could restore apps and pages based on the user's choice from the -// notification for |account_id|. Otherwise, returns false, when the restore -// pref is 'Do not restore'. -COMPONENT_EXPORT(APP_RESTORE) -bool CanPerformRestore(const AccountId& account_id); - // Sets the current active profile path. COMPONENT_EXPORT(APP_RESTORE) void SetActiveProfilePath(const base::FilePath& profile_path); From c4a32003fca5228ff6050adc95e986fcc470f848 Mon Sep 17 00:00:00 2001 From: v8-ci-autoroll-builder Date: Sun, 26 Sep 2021 22:26:20 +0000 Subject: [PATCH 03/25] Update V8 to version 9.6.114. Summary of changes available at: https://chromium.googlesource.com/v8/v8/+log/0c958868..5ffc2828 Please follow these instructions for assigning/CC'ing issues: https://v8.dev/docs/triage-issues Please close rolling in case of a roll revert: https://v8-roll.appspot.com/ This only works with a Google account. CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux-blink-rel CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux_optional_gpu_tests_rel CQ_INCLUDE_TRYBOTS=luci.chromium.try:mac_optional_gpu_tests_rel CQ_INCLUDE_TRYBOTS=luci.chromium.try:win_optional_gpu_tests_rel CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel R=hablich@chromium.org,vahl@chromium.org,v8-waterfall-sheriff@grotations.appspotmail.com Change-Id: Ie7b5403594d5d7c6f49bea6696c8c89558bf52a6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184242 Bot-Commit: v8-ci-autoroll-builder Commit-Queue: v8-ci-autoroll-builder Cr-Commit-Position: refs/heads/main@{#925090} --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 83d67bce9a2fc9..c3822f5ec9b312 100644 --- a/DEPS +++ b/DEPS @@ -235,7 +235,7 @@ vars = { # 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': '0c958868d79796808af29df2902e39870e412d90', + 'v8_revision': '5ffc282852046908b5497661cb464cb90ce649cd', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. From 70155a040a5171d6f01525a5dbdecf0ed43c6b97 Mon Sep 17 00:00:00 2001 From: chromium-internal-autoroll Date: Sun, 26 Sep 2021 22:26:24 +0000 Subject: [PATCH 04/25] Roll src-internal from 9ffa7a4a05e1 to 1d1771262535 (1 revision) https://chrome-internal.googlesource.com/chrome/src-internal.git/+log/9ffa7a4a05e1..1d1771262535 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://skia-autoroll.corp.goog/r/src-internal-chromium-autoroll Please CC on the revert to ensure that a human is aware of the problem. To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Cq-Include-Trybots: luci.chrome.try:linux-chromeos-chrome Bug: None Tbr: Change-Id: Ic9e365f9d63b0f47a9358a667d961b772b645dbd Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184513 Commit-Queue: chromium-internal-autoroll Bot-Commit: chromium-internal-autoroll Cr-Commit-Position: refs/heads/main@{#925091} --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index c3822f5ec9b312..5aecd133fa22d5 100644 --- a/DEPS +++ b/DEPS @@ -1691,7 +1691,7 @@ deps = { Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@9ffa7a4a05e1d8d499c9f3b16c8e9da37ac57fb4', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@1d1771262535bb72ea053a7c22f4a10fc9cc73c5', 'condition': 'checkout_src_internal', }, From cb5eaf398333d31357b251b0f5471b43e830766d Mon Sep 17 00:00:00 2001 From: Maksim Ivanov Date: Sun, 26 Sep 2021 22:27:24 +0000 Subject: [PATCH 05/25] Fix use-after-move crash in //ash/quick_pair/repository/ Fix a potential crash in fast_pair_repository_impl.cc, caused by running a once callback twice due to a forgotten "return" in an error handling branch. This issue was found by the bugprone-use-after-move clang-tidy diagnostics: fast_pair_repository_impl.cc:161: 'callback' used after it was moved fast_pair_repository_impl.cc:159: move occurred here Bug: 1122844 Change-Id: I5c989c8eb8adfa64bc0cf429848d33df009de4ab Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184322 Auto-Submit: Maksim Ivanov Reviewed-by: Jon Mann Commit-Queue: Jon Mann Cr-Commit-Position: refs/heads/main@{#925092} --- ash/quick_pair/repository/fast_pair_repository_impl.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/ash/quick_pair/repository/fast_pair_repository_impl.cc b/ash/quick_pair/repository/fast_pair_repository_impl.cc index 164e1b8639d4e6..94a2035f2c68b8 100644 --- a/ash/quick_pair/repository/fast_pair_repository_impl.cc +++ b/ash/quick_pair/repository/fast_pair_repository_impl.cc @@ -157,6 +157,7 @@ void FastPairRepositoryImpl::CompleteAccountKeyLookup( DeviceMetadata* device_metadata) { if (!device_metadata) { std::move(callback).Run(absl::nullopt); + return; } std::move(callback).Run( PairingMetadata(device_metadata, std::move(account_key))); From d6a7b3bea8d3b2ab42e09b04f4f2b67e2e046b28 Mon Sep 17 00:00:00 2001 From: Pavel Yatsuk Date: Sun, 26 Sep 2021 22:27:27 +0000 Subject: [PATCH 06/25] [Messages] Logic to display message banner for PWA Install Message This CL includes changes to display PWA install message. The following will be added in a separate CLs: - The code to set description and icon - Handlers to react to user interaction (Install button click, message dismiss) BUG=1247374 Change-Id: I62fb7260e947d1ea6bc3fc7a5489f017559bf224 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3169952 Reviewed-by: Lijin Shen Reviewed-by: Glenn Hartmann Reviewed-by: Michael Thiessen Commit-Queue: Pavel Yatsuk Cr-Commit-Position: refs/heads/main@{#925093} --- .../components/messages/MessagesMetrics.java | 2 + components/messages/android/message_enums.h | 1 + components/webapps/browser/BUILD.gn | 6 ++ .../android/app_banner_manager_android.cc | 2 +- ...llable_ambient_badge_message_controller.cc | 55 ++++++++++- ...allable_ambient_badge_message_controller.h | 20 +++- ...bient_badge_message_controller_unittest.cc | 92 +++++++++++++++++++ tools/metrics/histograms/enums.xml | 1 + .../metadata/android/histograms.xml | 1 + 9 files changed, 174 insertions(+), 6 deletions(-) create mode 100644 components/webapps/browser/android/installable/installable_ambient_badge_message_controller_unittest.cc diff --git a/components/messages/android/internal/java/src/org/chromium/components/messages/MessagesMetrics.java b/components/messages/android/internal/java/src/org/chromium/components/messages/MessagesMetrics.java index b8c393ec01017f..94b542a6385037 100644 --- a/components/messages/android/internal/java/src/org/chromium/components/messages/MessagesMetrics.java +++ b/components/messages/android/internal/java/src/org/chromium/components/messages/MessagesMetrics.java @@ -105,6 +105,8 @@ static String messageIdentifierToHistogramSuffix(@MessageIdentifier int messageI return "SharedHighlighting"; case MessageIdentifier.NEAR_OOM_REDUCTION: return "NearOomReduction"; + case MessageIdentifier.INSTALLABLE_AMBIENT_BADGE: + return "InstallableAmbientBadge"; default: return "Unknown"; } diff --git a/components/messages/android/message_enums.h b/components/messages/android/message_enums.h index bf3f5f0bde51f1..118de0435d3c05 100644 --- a/components/messages/android/message_enums.h +++ b/components/messages/android/message_enums.h @@ -90,6 +90,7 @@ enum class MessageIdentifier { SYNC_ERROR = 17, SHARED_HIGHLIGHTING = 18, NEAR_OOM_REDUCTION = 19, + INSTALLABLE_AMBIENT_BADGE = 20, // Insert new values before this line. COUNT diff --git a/components/webapps/browser/BUILD.gn b/components/webapps/browser/BUILD.gn index d96f64687442fe..f71214fec12b94 100644 --- a/components/webapps/browser/BUILD.gn +++ b/components/webapps/browser/BUILD.gn @@ -94,6 +94,7 @@ source_set("browser") { "//components/feature_engagement", "//components/infobars/android", "//components/infobars/content", + "//components/messages/android", "//components/messages/android:feature_flags", "//components/strings", "//components/url_formatter", @@ -150,4 +151,9 @@ source_set("unit_tests") { "//testing/gtest", "//third_party/blink/public/mojom:mojom_platform_headers", ] + + if (is_android) { + sources += [ "android/installable/installable_ambient_badge_message_controller_unittest.cc" ] + deps += [ "//components/messages/android:test_support" ] + } } diff --git a/components/webapps/browser/android/app_banner_manager_android.cc b/components/webapps/browser/android/app_banner_manager_android.cc index 1635330d5ad787..5b0335bfbe5607 100644 --- a/components/webapps/browser/android/app_banner_manager_android.cc +++ b/components/webapps/browser/android/app_banner_manager_android.cc @@ -556,7 +556,7 @@ void AppBannerManagerAndroid::ShowAmbientBadge() { if (base::FeatureList::IsEnabled(features::kInstallableAmbientBadgeMessage) && base::FeatureList::IsEnabled( messages::kMessagesForAndroidInfrastructure)) { - message_controller_.EnqueueMessage(); + message_controller_.EnqueueMessage(web_contents(), GetAppName()); } else { InstallableAmbientBadgeInfoBarDelegate::Create( web_contents(), weak_factory_.GetWeakPtr(), GetAppName(), primary_icon_, diff --git a/components/webapps/browser/android/installable/installable_ambient_badge_message_controller.cc b/components/webapps/browser/android/installable/installable_ambient_badge_message_controller.cc index b9854fed6a5616..19b8ffce2684d7 100644 --- a/components/webapps/browser/android/installable/installable_ambient_badge_message_controller.cc +++ b/components/webapps/browser/android/installable/installable_ambient_badge_message_controller.cc @@ -4,19 +4,66 @@ #include "components/webapps/browser/android/installable/installable_ambient_badge_message_controller.h" +#include "base/bind.h" +#include "components/messages/android/message_dispatcher_bridge.h" +#include "components/strings/grit/components_strings.h" +#include "ui/base/l10n/l10n_util.h" + namespace webapps { +InstallableAmbientBadgeMessageController:: + InstallableAmbientBadgeMessageController() = default; + +InstallableAmbientBadgeMessageController:: + ~InstallableAmbientBadgeMessageController() { + DismissMessage(); +} + bool InstallableAmbientBadgeMessageController::IsMessageEnqueued() { - // TODO(crbug.com/1247374): Implement. - return false; + return message_ != nullptr; } -void InstallableAmbientBadgeMessageController::EnqueueMessage() { - // TODO(crbug.com/1247374): Implement. +void InstallableAmbientBadgeMessageController::EnqueueMessage( + content::WebContents* web_contents, + const std::u16string& app_name) { + DCHECK(!message_); + + message_ = std::make_unique( + messages::MessageIdentifier::INSTALLABLE_AMBIENT_BADGE, + base::BindOnce( + &InstallableAmbientBadgeMessageController::HandleInstallButtonClicked, + base::Unretained(this)), + base::BindOnce( + &InstallableAmbientBadgeMessageController::HandleMessageDismissed, + base::Unretained(this))); + + // TODO(crbug.com/1247374): Adjust title string, add description and icon. + message_->SetTitle(l10n_util::GetStringFUTF16( + IDS_AMBIENT_BADGE_INSTALL_ALTERNATIVE, app_name)); + message_->SetPrimaryButtonText(l10n_util::GetStringUTF16(IDS_INSTALL)); + messages::MessageDispatcherBridge::Get()->EnqueueMessage( + message_.get(), web_contents, messages::MessageScopeType::NAVIGATION, + messages::MessagePriority::kNormal); } void InstallableAmbientBadgeMessageController::DismissMessage() { + if (!message_) + return; + + messages::MessageDispatcherBridge::Get()->DismissMessage( + message_.get(), messages::DismissReason::UNKNOWN); +} + +void InstallableAmbientBadgeMessageController::HandleInstallButtonClicked() { // TODO(crbug.com/1247374): Implement. } +void InstallableAmbientBadgeMessageController::HandleMessageDismissed( + messages::DismissReason dismiss_reason) { + DCHECK(message_); + message_.reset(); + // TODO(crbug.com/1247374): Add a call to + // AppBannerManagerAndroid::BadgeDismissed to record metrics. +} + } // namespace webapps diff --git a/components/webapps/browser/android/installable/installable_ambient_badge_message_controller.h b/components/webapps/browser/android/installable/installable_ambient_badge_message_controller.h index 0e661d2fe48d69..72bc89d103236e 100644 --- a/components/webapps/browser/android/installable/installable_ambient_badge_message_controller.h +++ b/components/webapps/browser/android/installable/installable_ambient_badge_message_controller.h @@ -5,6 +5,16 @@ #ifndef COMPONENTS_WEBAPPS_BROWSER_ANDROID_INSTALLABLE_INSTALLABLE_AMBIENT_BADGE_MESSAGE_CONTROLLER_H_ #define COMPONENTS_WEBAPPS_BROWSER_ANDROID_INSTALLABLE_INSTALLABLE_AMBIENT_BADGE_MESSAGE_CONTROLLER_H_ +#include +#include + +#include "components/messages/android/message_enums.h" +#include "components/messages/android/message_wrapper.h" + +namespace content { +class WebContents; +} // namespace content + namespace webapps { // Message controller for a message shown to users when they visit a @@ -12,6 +22,9 @@ namespace webapps { // flow. class InstallableAmbientBadgeMessageController { public: + InstallableAmbientBadgeMessageController(); + ~InstallableAmbientBadgeMessageController(); + // Returns true if the message was enqueued with EnqueueMessage() method, but // wasn't dismissed yet. bool IsMessageEnqueued(); @@ -19,13 +32,18 @@ class InstallableAmbientBadgeMessageController { // Enqueues a message to be displayed on the screen. Typically there are no // other messages on the screen and enqueued message will get displayed // immediately. - void EnqueueMessage(); + void EnqueueMessage(content::WebContents* web_contents, + const std::u16string& app_name); // Dismisses displayed message. This method is safe to call when there is no // displayed message. void DismissMessage(); private: + void HandleInstallButtonClicked(); + void HandleMessageDismissed(messages::DismissReason dismiss_reason); + + std::unique_ptr message_; }; } // namespace webapps diff --git a/components/webapps/browser/android/installable/installable_ambient_badge_message_controller_unittest.cc b/components/webapps/browser/android/installable/installable_ambient_badge_message_controller_unittest.cc new file mode 100644 index 00000000000000..736a5720fe11f8 --- /dev/null +++ b/components/webapps/browser/android/installable/installable_ambient_badge_message_controller_unittest.cc @@ -0,0 +1,92 @@ +// Copyright 2021 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/webapps/browser/android/installable/installable_ambient_badge_message_controller.h" + +#include "components/messages/android/mock_message_dispatcher_bridge.h" +#include "content/public/test/test_renderer_host.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace webapps { + +namespace { +constexpr char16_t kAppName[] = u"App name"; +} // namespace + +class InstallableAmbientBadgeMessageControllerTest + : public content::RenderViewHostTestHarness { + public: + void SetUp() override; + void TearDown() override; + + void EnqueueMessage(); + void DismissMessage(bool expected); + + InstallableAmbientBadgeMessageController* message_controller() { + return &message_controller_; + } + + messages::MessageWrapper* message_wrapper() { return message_wrapper_; } + + private: + messages::MockMessageDispatcherBridge message_dispatcher_bridge_; + InstallableAmbientBadgeMessageController message_controller_; + messages::MessageWrapper* message_wrapper_ = nullptr; +}; + +void InstallableAmbientBadgeMessageControllerTest::SetUp() { + content::RenderViewHostTestHarness::SetUp(); + messages::MessageDispatcherBridge::SetInstanceForTesting( + &message_dispatcher_bridge_); +} + +void InstallableAmbientBadgeMessageControllerTest::TearDown() { + messages::MessageDispatcherBridge::SetInstanceForTesting(nullptr); + content::RenderViewHostTestHarness::TearDown(); +} + +void InstallableAmbientBadgeMessageControllerTest::EnqueueMessage() { + EXPECT_CALL(message_dispatcher_bridge_, EnqueueMessage) + .WillOnce(testing::DoAll(testing::SaveArg<0>(&message_wrapper_), + testing::Return(true))); + message_controller_.EnqueueMessage(web_contents(), kAppName); +} + +void InstallableAmbientBadgeMessageControllerTest::DismissMessage( + bool bridge_dismiss_call_expected) { + if (bridge_dismiss_call_expected) { + EXPECT_CALL(message_dispatcher_bridge_, DismissMessage) + .WillOnce([](messages::MessageWrapper* message, + messages::DismissReason dismiss_reason) { + message->HandleDismissCallback(base::android::AttachCurrentThread(), + static_cast(dismiss_reason)); + }); + } + message_controller_.DismissMessage(); +} + +// Tests InstallableAmbientBadgeMessageController API: EnqueueMessage, +// IsMessageEnqueued, DismissMessage. +TEST_F(InstallableAmbientBadgeMessageControllerTest, APITest) { + ASSERT_FALSE(message_controller()->IsMessageEnqueued()); + EnqueueMessage(); + ASSERT_TRUE(message_controller()->IsMessageEnqueued()); + DismissMessage(true); + ASSERT_FALSE(message_controller()->IsMessageEnqueued()); + // Calling DismissMessage when there is no message enqueued should not fail or + // result in a call to MessageDispatcherBridge. + DismissMessage(false); +} + +// Tests that message properties are set correctly. +TEST_F(InstallableAmbientBadgeMessageControllerTest, MessagePropertyValues) { + EnqueueMessage(); + + EXPECT_NE(std::u16string::npos, message_wrapper()->GetTitle().find(kAppName)); + EXPECT_FALSE(message_wrapper()->GetPrimaryButtonText().empty()); + + DismissMessage(true); +} + +} // namespace webapps \ No newline at end of file diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index 1a9cd2ab3fbe40..7260e9a739b679 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml @@ -55899,6 +55899,7 @@ Called by update_use_counter_css.py.--> + diff --git a/tools/metrics/histograms/metadata/android/histograms.xml b/tools/metrics/histograms/metadata/android/histograms.xml index a9be8cfaf3aacb..aa568048fb5136 100644 --- a/tools/metrics/histograms/metadata/android/histograms.xml +++ b/tools/metrics/histograms/metadata/android/histograms.xml @@ -84,6 +84,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. + From 25e921e1bb6b7a21d35a9335734679dd79f0cf3d Mon Sep 17 00:00:00 2001 From: chromium-internal-autoroll Date: Sun, 26 Sep 2021 22:28:27 +0000 Subject: [PATCH 07/25] Roll Media App from q7EI3XbKu... to VGbkbIQy4... Release_Notes: http://go/media_app-x20/relnotes/Main/media_app_202109260800_RC00.html https://chrome-infra-packages.appspot.com/p/chromeos_internal/apps/media_app/app/+/VGbkbIQy4l5j2gmve_60OzV-VQA2ZqWVEJDnpLrE7IoC If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://skia-autoroll.corp.goog/r/media-app-chromium-autoroll Please CC media-app@grotations.appspotmail.com on the revert to ensure that a human is aware of the problem. To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Cq-Include-Trybots: luci.chrome.try:chromeos-betty-pi-arc-chrome;luci.chrome.try:linux-chromeos-chrome Bug: None Tbr: media-app@grotations.appspotmail.com Change-Id: I76536dcbb9e271f40a871380cf1aa572877be81f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184007 Bot-Commit: chromium-internal-autoroll Commit-Queue: chromium-internal-autoroll Cr-Commit-Position: refs/heads/main@{#925094} --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 5aecd133fa22d5..310039529353c2 100644 --- a/DEPS +++ b/DEPS @@ -1721,7 +1721,7 @@ deps = { 'packages': [ { 'package': 'chromeos_internal/apps/media_app/app', - 'version': 'q7EI3XbKu_Tpmjk0tux1DEf-cn_wHHxhx27QLkdqBXUC', + 'version': 'VGbkbIQy4l5j2gmve_60OzV-VQA2ZqWVEJDnpLrE7IoC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', From c1342a8a1edb08f2ad81d851e20f5484382bb139 Mon Sep 17 00:00:00 2001 From: Internal Frameworks Autoroller Date: Sun, 26 Sep 2021 22:28:32 +0000 Subject: [PATCH 08/25] [Frameworks roll] Roll to 398998066 piper revision Change-Id: I54863194fc24bad9c03fb90ebd6d2519acfbbc36 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184524 Commit-Queue: Internal Frameworks Autoroller Bot-Commit: Internal Frameworks Autoroller Cr-Commit-Position: refs/heads/main@{#925095} --- .../frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 | 2 +- .../chrome_internal_dynamic_framework.iossimulator.zip.sha1 | 2 +- .../chrome_sso_internal_dynamic_framework.ios.zip.sha1 | 2 +- .../chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 | 2 +- .../remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 | 2 +- ...ing_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 | 2 +- .../frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 | 2 +- .../remoting_internal_dynamic_framework.iossimulator.zip.sha1 | 2 +- .../web_view_shell_internal_dynamic_framework.ios.zip.sha1 | 2 +- ..._view_shell_internal_dynamic_framework.iossimulator.zip.sha1 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 index ca796a42e3b3bb..dcff6dc9ade412 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -ba04241d32c8f00ed8da2165de076ce86c0f2e4f \ No newline at end of file +f557829398b13a521864133870ebc1002aa07aac \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 index 90f898b1b13a4b..00a5a63678a444 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -84157eba6ba5ffa91619f68bfab170f2949242e1 \ No newline at end of file +223ec94e216a33da1200791037bf5ff8de57f76d \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 index 110140711f847f..fbffbc5ad8ddd9 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -14ab325b1c10372600e3971dd15399b0efaa61eb \ No newline at end of file +998c5281cc3dc2c6ace696b2084b845817399e01 \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 index 2984abc0c73130..81074e6f06df82 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -2749a456cd1ff3190d673c9f72db28d676f63c1a \ No newline at end of file +1bd443a00daeda794da3878ee9941090edd3b670 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 index a2b7918baaebf2..9f90cc002e78ea 100644 --- a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -361a676cf70bbd28b8592d3c74bc5851a47bdc7d \ No newline at end of file +1010b0fae6decf3141eec33b833c800778a3c08a \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 index 949a4281c4a571..63d61df59ced89 100644 --- a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -881503a49cc7897acfc00be0de4eb2a8cdd09f9c \ No newline at end of file +343aaf20da235fc0293a0d567f4da70c454fdfe8 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 index a7e40a19d8d5e0..06659bda2ad9c7 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -30d6ff0d65fac3bd73af2f8baa381a838adc5812 \ No newline at end of file +3fa2f16ca598785ec3aef452ff89f6410b047cb0 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 index 8bd3580defae7a..6d6329c412337a 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -861ea0409f4000ff1770de9de1769c04ffc8be75 \ No newline at end of file +3f32bde0a12a7f906956da9b10b2fc5e5ea40315 \ No newline at end of file diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 index b0fa2beb77fb3f..a3e1380a5d4bb3 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -e6283c0f0a5528da5533af27730ad2428fa89985 \ No newline at end of file +13d17f4a8c877f2c4f28f7239117f2c6fba45ec5 \ No newline at end of file diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 index fc1109defdfd5f..a9adea7a33be23 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -4fd3ed39a7ee37fe11db622173c2b55d7ef6a2b6 \ No newline at end of file +42799392161914a46739e29e3952a8661cb3c0be \ No newline at end of file From a36bf3322e6bf10e4691a79f2b33798b9239efdd Mon Sep 17 00:00:00 2001 From: "3su6n15k.default@developer.gserviceaccount.com" <3su6n15k.default@developer.gserviceaccount.com> Date: Sun, 26 Sep 2021 22:29:30 +0000 Subject: [PATCH 09/25] Automated Commit: LKGM 14243.0.0 for chromeos. CQ_INCLUDE_TRYBOTS=luci.chrome.try:chromeos-betty-pi-arc-chrome CQ_INCLUDE_TRYBOTS=luci.chrome.try:chromeos-eve-chrome CQ_INCLUDE_TRYBOTS=luci.chrome.try:chromeos-kevin-chrome CQ_INCLUDE_TRYBOTS=luci.chrome.try:lacros-amd64-generic-chrome R=chrome-os-gardeners-reviews@google.com Change-Id: Ic07ec760407ae2e8f6fff9e5bab21ee4ab34b2d3 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184243 Commit-Queue: ChromeOS bot <3su6n15k.default@developer.gserviceaccount.com> Bot-Commit: ChromeOS bot <3su6n15k.default@developer.gserviceaccount.com> Cr-Commit-Position: refs/heads/main@{#925096} --- chromeos/CHROMEOS_LKGM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromeos/CHROMEOS_LKGM b/chromeos/CHROMEOS_LKGM index f776bc7ec03f79..fdeeaf8e0260e2 100644 --- a/chromeos/CHROMEOS_LKGM +++ b/chromeos/CHROMEOS_LKGM @@ -1 +1 @@ -14240.0.0 \ No newline at end of file +14243.0.0 \ No newline at end of file From 760c4e3452d4b70a4c98c6943dc58183f2a321bb Mon Sep 17 00:00:00 2001 From: chromium-autoroll Date: Sun, 26 Sep 2021 22:29:35 +0000 Subject: [PATCH 10/25] Roll Skia from aeb5d4daed3a to 496b89cb74b3 (1 revision) https://skia.googlesource.com/skia.git/+log/aeb5d4daed3a..496b89cb74b3 2021-09-26 skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com Update SKP version If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-autoroll Please CC michaelludwig@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Skia: https://bugs.chromium.org/p/skia/issues/entry To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux-blink-rel;luci.chromium.try:linux-chromeos-compile-dbg;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel Cq-Do-Not-Cancel-Tryjobs: true Bug: None Tbr: michaelludwig@google.com Change-Id: Id8f00a63627518462befb701d2406f66505d2ddd Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184658 Commit-Queue: chromium-autoroll Bot-Commit: chromium-autoroll Cr-Commit-Position: refs/heads/main@{#925097} --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 310039529353c2..db7035862c7e9e 100644 --- a/DEPS +++ b/DEPS @@ -231,7 +231,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': 'aeb5d4daed3ab8927c80db3904dc0f8c24169afa', + 'skia_revision': '496b89cb74b389b0a1047919275033ef0630416e', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. From 01fa67b631ced5c6e8ca545a0ca218895875a157 Mon Sep 17 00:00:00 2001 From: CT Log list updates bot Date: Sun, 26 Sep 2021 22:31:10 +0000 Subject: [PATCH 11/25] Automatic update for log_list.json Automatic update for 2021-09-26 UTC Change-Id: I478350e1c39ebe07f685f85874d3871ff33f4f88 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184899 Commit-Queue: CT Log list updates bot Bot-Commit: CT Log list updates bot Cr-Commit-Position: refs/heads/main@{#925098} --- components/certificate_transparency/data/log_list.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/certificate_transparency/data/log_list.json b/components/certificate_transparency/data/log_list.json index 4454a53c0ce87d..14b9f197b9c4c5 100644 --- a/components/certificate_transparency/data/log_list.json +++ b/components/certificate_transparency/data/log_list.json @@ -1,6 +1,6 @@ { - "version": "3.41", - "log_list_timestamp": "2021-09-25T01:36:11Z", + "version": "3.42", + "log_list_timestamp": "2021-09-26T01:34:08Z", "operators": [ { "name": "Google", From 7574a756282a881a78cfa2a046bab07a2e879042 Mon Sep 17 00:00:00 2001 From: chromium-internal-autoroll Date: Sun, 26 Sep 2021 22:31:13 +0000 Subject: [PATCH 12/25] Roll Help App from d6i23O0eu... to YACky8ppL... Release_Notes: http://go/help_app-x20/relnotes/Main/help_app_nightly_202109260800_RC00.html https://chrome-infra-packages.appspot.com/p/chromeos_internal/apps/help_app/app/+/YACky8ppLFM0FXPDau15wHt9xmw-BVM8HKnMLz5HQXgC If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://skia-autoroll.corp.goog/r/help-app-chromium-autoroll Please CC help-app@grotations.appspotmail.com on the revert to ensure that a human is aware of the problem. To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Cq-Include-Trybots: luci.chrome.try:linux-chromeos-chrome Bug: None Tbr: help-app@grotations.appspotmail.com Change-Id: I66f734257bd2f23c7533dd7b88a5007565f7bcbb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184008 Commit-Queue: chromium-internal-autoroll Bot-Commit: chromium-internal-autoroll Cr-Commit-Position: refs/heads/main@{#925099} --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index db7035862c7e9e..4dbcc3734ab85b 100644 --- a/DEPS +++ b/DEPS @@ -1710,7 +1710,7 @@ deps = { 'packages': [ { 'package': 'chromeos_internal/apps/help_app/app', - 'version': 'd6i23O0euIf4Q8_opLtD2ixVDKSOjinVtVdZjH-1trsC', + 'version': 'YACky8ppLFM0FXPDau15wHt9xmw-BVM8HKnMLz5HQXgC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', From 3cd845f7fb24a30ad63b9e6854df4716e14ad131 Mon Sep 17 00:00:00 2001 From: chromium-autoroll Date: Sun, 26 Sep 2021 22:32:13 +0000 Subject: [PATCH 13/25] Roll Chrome Linux PGO Profile Roll Chrome Linux PGO profile from chrome-linux-main-1632613016-45822416ec7d3bb4f62afb9f5de0d725a1f374f2.profdata to chrome-linux-main-1632625678-22a3e9462cda624da319caab3674327b73205ff0.profdata If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/pgo-linux-chromium Please CC pgo-profile-sheriffs@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Chromium main branch: https://bugs.chromium.org/p/chromium/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Cq-Include-Trybots: luci.chrome.try:linux-chrome Tbr: pgo-profile-sheriffs@google.com Change-Id: Ie9616e595c06330f1e2e17643b85a9e5ab6b4ae4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184600 Commit-Queue: chromium-autoroll Bot-Commit: chromium-autoroll Cr-Commit-Position: refs/heads/main@{#925100} --- chrome/build/linux.pgo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt index f72abb52f4530b..c76ec2c84958c2 100644 --- a/chrome/build/linux.pgo.txt +++ b/chrome/build/linux.pgo.txt @@ -1 +1 @@ -chrome-linux-main-1632613016-45822416ec7d3bb4f62afb9f5de0d725a1f374f2.profdata +chrome-linux-main-1632625678-22a3e9462cda624da319caab3674327b73205ff0.profdata From 3f84c8b2ec8b4d4397c64ffc885204d88900056a Mon Sep 17 00:00:00 2001 From: Fergus Dall Date: Sun, 26 Sep 2021 22:32:18 +0000 Subject: [PATCH 14/25] Disable test crostini.AppEmacs Bug: b/201197372 Bug: b/192521089 Change-Id: Ib080a637b62c24d47df01b2c244fcdea1cc6aaf1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3183920 Owners-Override: Fergus Dall Auto-Submit: Fergus Dall Commit-Queue: Joel Hockey Reviewed-by: Joel Hockey Cr-Commit-Position: refs/heads/main@{#925101} --- chromeos/tast_control.gni | 3 +++ 1 file changed, 3 insertions(+) diff --git a/chromeos/tast_control.gni b/chromeos/tast_control.gni index ed08b2d90b50a2..ef9a354f28a672 100644 --- a/chromeos/tast_control.gni +++ b/chromeos/tast_control.gni @@ -44,6 +44,9 @@ tast_disabled_tests_from_chrome_all = [ "quicksettings.SignInScreen.battery", "quicksettings.SignInScreen.noaudio_nobattery", "quicksettings.SignInScreen.audio", + + # b/201197372 + "crostini.AppEmacs", ] # To disable a specific test in lacros_all_tast_tests, add it the following From 382a95cc4eb96ba74abc841143cb4f7562440507 Mon Sep 17 00:00:00 2001 From: Shane Fitzpatrick Date: Sun, 26 Sep 2021 22:33:54 +0000 Subject: [PATCH 15/25] [FastPair] Add SetCheckAccountKeysResult call to fake repository This method is required in upcoming tests to control the result of this call. Change-Id: Ie43484d415f448c7f74c1392701b50d3141c4603 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3174294 Commit-Queue: Shane Fitzpatrick Reviewed-by: Jon Mann Cr-Commit-Position: refs/heads/main@{#925102} --- .../repository/fake_fast_pair_repository.cc | 7 ++++++- ash/quick_pair/repository/fake_fast_pair_repository.h | 3 +++ .../repository/fast_pair/pairing_metadata.cc | 6 ++++-- .../repository/fast_pair/pairing_metadata.h | 11 ++++++----- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ash/quick_pair/repository/fake_fast_pair_repository.cc b/ash/quick_pair/repository/fake_fast_pair_repository.cc index 94f0ccbf763d21..9096acb97c381c 100644 --- a/ash/quick_pair/repository/fake_fast_pair_repository.cc +++ b/ash/quick_pair/repository/fake_fast_pair_repository.cc @@ -25,6 +25,11 @@ void FakeFastPairRepository::ClearFakeMetadata( data_.erase(base::ToUpperASCII(hex_model_id)); } +void FakeFastPairRepository::SetCheckAccountKeysResult( + absl::optional result) { + check_account_key_result_ = result; +} + void FakeFastPairRepository::GetDeviceMetadata( const std::string& hex_model_id, DeviceMetadataCallback callback) { @@ -46,7 +51,7 @@ void FakeFastPairRepository::IsValidModelId( void FakeFastPairRepository::CheckAccountKeys( const AccountKeyFilter& account_key_filter, CheckAccountKeysCallback callback) { - std::move(callback).Run(absl::nullopt); + std::move(callback).Run(check_account_key_result_); } void FakeFastPairRepository::AssociateAccountKey( diff --git a/ash/quick_pair/repository/fake_fast_pair_repository.h b/ash/quick_pair/repository/fake_fast_pair_repository.h index d89e943c4fd12e..a4933950b69c37 100644 --- a/ash/quick_pair/repository/fake_fast_pair_repository.h +++ b/ash/quick_pair/repository/fake_fast_pair_repository.h @@ -35,6 +35,8 @@ class FakeFastPairRepository : public FastPairRepository { void ClearFakeMetadata(const std::string& hex_model_id); + void SetCheckAccountKeysResult(absl::optional result); + // FastPairRepository:: void GetDeviceMetadata(const std::string& hex_model_id, DeviceMetadataCallback callback) override; @@ -50,6 +52,7 @@ class FakeFastPairRepository : public FastPairRepository { static void SetInstance(FastPairRepository* instance); base::flat_map> data_; + absl::optional check_account_key_result_; base::WeakPtrFactory weak_ptr_factory_{this}; }; diff --git a/ash/quick_pair/repository/fast_pair/pairing_metadata.cc b/ash/quick_pair/repository/fast_pair/pairing_metadata.cc index b797b1ab22fd32..e677a77b48dbc8 100644 --- a/ash/quick_pair/repository/fast_pair/pairing_metadata.cc +++ b/ash/quick_pair/repository/fast_pair/pairing_metadata.cc @@ -7,10 +7,12 @@ namespace ash { namespace quick_pair { -PairingMetadata::PairingMetadata(const DeviceMetadata* device_metadata, - const std::vector account_key) +PairingMetadata::PairingMetadata(DeviceMetadata* device_metadata, + std::vector account_key) : device_metadata(device_metadata), account_key(std::move(account_key)) {} +PairingMetadata::PairingMetadata(const PairingMetadata&) = default; +PairingMetadata& PairingMetadata::operator=(const PairingMetadata&) = default; PairingMetadata::PairingMetadata(PairingMetadata&&) = default; PairingMetadata::~PairingMetadata() = default; diff --git a/ash/quick_pair/repository/fast_pair/pairing_metadata.h b/ash/quick_pair/repository/fast_pair/pairing_metadata.h index 904967024d1ab1..a7d50ee5ad633c 100644 --- a/ash/quick_pair/repository/fast_pair/pairing_metadata.h +++ b/ash/quick_pair/repository/fast_pair/pairing_metadata.h @@ -17,14 +17,15 @@ struct DeviceMetadata; // Thin wrapper around Account Key + decoded metadata for a Fast Pair device // which has already been paired. struct COMPONENT_EXPORT(QUICK_PAIR_REPOSITORY) PairingMetadata { - explicit PairingMetadata(const DeviceMetadata* device_metadata, - const std::vector account_key); - PairingMetadata(const PairingMetadata&) = delete; + explicit PairingMetadata(DeviceMetadata* device_metadata, + std::vector account_key); + PairingMetadata(const PairingMetadata&); + PairingMetadata& operator=(const PairingMetadata&); PairingMetadata(PairingMetadata&&); ~PairingMetadata(); - const DeviceMetadata* device_metadata; - const std::vector account_key; + DeviceMetadata* device_metadata; + std::vector account_key; }; } // namespace quick_pair From 397427f2065ff65d424210f577925ec93da9b403 Mon Sep 17 00:00:00 2001 From: chromium-autoroll Date: Sun, 26 Sep 2021 22:34:02 +0000 Subject: [PATCH 16/25] Roll Chrome Win64 PGO Profile Roll Chrome Win64 PGO profile from chrome-win64-main-1632613016-920ef4b6aad6e1e7efff235e4c1d1606e0a75b61.profdata to chrome-win64-main-1632624887-bf17608289ea3853613e1267b6ecb836a3e78a3a.profdata If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/pgo-win64-chromium Please CC pgo-profile-sheriffs@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Chromium main branch: https://bugs.chromium.org/p/chromium/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Cq-Include-Trybots: luci.chrome.try:win64-chrome Tbr: pgo-profile-sheriffs@google.com Change-Id: I0c950870e1a718a7f22542cf9899db074769a841 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184481 Commit-Queue: chromium-autoroll Bot-Commit: chromium-autoroll Cr-Commit-Position: refs/heads/main@{#925103} --- chrome/build/win64.pgo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt index 94b9af0bdf8d80..e4c17edd8cc49e 100644 --- a/chrome/build/win64.pgo.txt +++ b/chrome/build/win64.pgo.txt @@ -1 +1 @@ -chrome-win64-main-1632613016-920ef4b6aad6e1e7efff235e4c1d1606e0a75b61.profdata +chrome-win64-main-1632624887-bf17608289ea3853613e1267b6ecb836a3e78a3a.profdata From b0c6828e3f3da7532b8f3c20f82f9f98d4df0290 Mon Sep 17 00:00:00 2001 From: chromium-autoroll Date: Sun, 26 Sep 2021 22:35:02 +0000 Subject: [PATCH 17/25] Roll DevTools Frontend from 10474d9f680f to fdb326ff691d (1 revision) https://chromium.googlesource.com/devtools/devtools-frontend.git/+log/10474d9f680f..fdb326ff691d 2021-09-26 devtools-ci-autoroll-builder@chops-service-accounts.iam.gserviceaccount.com Update DevTools Chromium DEPS. If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/devtools-frontend-chromium Please CC devtools-waterfall-sheriff-onduty@grotations.appspotmail.com on the revert to ensure that a human is aware of the problem. To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Bug: None Tbr: devtools-waterfall-sheriff-onduty@grotations.appspotmail.com Change-Id: I02485e20e405ac6bffb039d48e87d48a15024135 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184640 Commit-Queue: chromium-autoroll Bot-Commit: chromium-autoroll Cr-Commit-Position: refs/heads/main@{#925104} --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 4dbcc3734ab85b..670cbba96b5646 100644 --- a/DEPS +++ b/DEPS @@ -306,7 +306,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': '10474d9f680fe879beb6bfcc21e9baade89d3845', + 'devtools_frontend_revision': 'fdb326ff691d3e871b03c6a598cb7f662ad051fe', # 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. From 9f4b8b266f5228a41ce1f66b7a5a86e41725a270 Mon Sep 17 00:00:00 2001 From: chromium-autoroll Date: Sun, 26 Sep 2021 22:35:06 +0000 Subject: [PATCH 18/25] Roll Chrome Mac PGO Profile Roll Chrome Mac PGO profile from chrome-mac-main-1632613016-15d316daa5cb0d3ce63998f5bf029971a584b138.profdata to chrome-mac-main-1632625678-7fcb34d1e3b7ddb3fc254057b98705345bcbaad7.profdata If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/pgo-mac-chromium Please CC pgo-profile-sheriffs@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Chromium main branch: https://bugs.chromium.org/p/chromium/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Cq-Include-Trybots: luci.chrome.try:mac-chrome Tbr: pgo-profile-sheriffs@google.com Change-Id: Ie238f752846a870bb3a6a321aa5ad70de3025631 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184518 Commit-Queue: chromium-autoroll Bot-Commit: chromium-autoroll Cr-Commit-Position: refs/heads/main@{#925105} --- chrome/build/mac.pgo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt index 3229bfc858144c..5e7cbcc6ecddb9 100644 --- a/chrome/build/mac.pgo.txt +++ b/chrome/build/mac.pgo.txt @@ -1 +1 @@ -chrome-mac-main-1632613016-15d316daa5cb0d3ce63998f5bf029971a584b138.profdata +chrome-mac-main-1632625678-7fcb34d1e3b7ddb3fc254057b98705345bcbaad7.profdata From b05bbd54649f7a98646e98440278ccf34efdbb85 Mon Sep 17 00:00:00 2001 From: chromium-autoroll Date: Sun, 26 Sep 2021 22:36:05 +0000 Subject: [PATCH 19/25] Roll WebRTC from b6a73b69233c to 96168abfb74c (1 revision) https://webrtc.googlesource.com/src.git/+log/b6a73b69233c..96168abfb74c 2021-09-26 webrtc-version-updater@webrtc-ci.iam.gserviceaccount.com Update WebRTC code version (2021-09-26T04:03:45). If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/webrtc-chromium-autoroll Please CC webrtc-chromium-sheriffs-robots@google.com on the revert to ensure that a human is aware of the problem. To file a bug in WebRTC: https://bugs.chromium.org/p/webrtc/issues/entry To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Bug: None Tbr: webrtc-chromium-sheriffs-robots@google.com Change-Id: Id3dcee81cf6f9916f9237200b6b8569cf1cefa3c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184649 Commit-Queue: chromium-autoroll Bot-Commit: chromium-autoroll Cr-Commit-Position: refs/heads/main@{#925106} --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 670cbba96b5646..393863a1839fd9 100644 --- a/DEPS +++ b/DEPS @@ -1633,7 +1633,7 @@ deps = { Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'b0291fd966b55a5efc496772555b94842bde1085', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + 'b6a73b69233ce00df85bf173eca94b6fc5e35fd1', + Var('webrtc_git') + '/src.git' + '@' + '96168abfb74cd800f2e18e7dcca5bed72ef36e2d', 'src/third_party/libgifcodec': Var('skia_git') + '/libgifcodec' + '@'+ Var('libgifcodec_revision'), From 1d3a581c7a80da4da376e5623f37a9ef47f7ae77 Mon Sep 17 00:00:00 2001 From: chromium-autoroll Date: Sun, 26 Sep 2021 22:36:10 +0000 Subject: [PATCH 20/25] Roll Chrome Win32 PGO Profile Roll Chrome Win32 PGO profile from chrome-win32-main-1632613016-a73b4e09f16f6a9ecdaeee0578e76a908107f2fc.profdata to chrome-win32-main-1632624887-926c058f916f49344d541360fcf9d6a9e9deac4b.profdata If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/pgo-win32-chromium Please CC pgo-profile-sheriffs@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Chromium main branch: https://bugs.chromium.org/p/chromium/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Cq-Include-Trybots: luci.chrome.try:win-chrome Tbr: pgo-profile-sheriffs@google.com Change-Id: I808977e841dfca5efc83ca771e0801064e3fb8ff Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184515 Commit-Queue: chromium-autoroll Bot-Commit: chromium-autoroll Cr-Commit-Position: refs/heads/main@{#925107} --- chrome/build/win32.pgo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt index eb60bee874a7c3..da1118d0a7fd58 100644 --- a/chrome/build/win32.pgo.txt +++ b/chrome/build/win32.pgo.txt @@ -1 +1 @@ -chrome-win32-main-1632613016-a73b4e09f16f6a9ecdaeee0578e76a908107f2fc.profdata +chrome-win32-main-1632624887-926c058f916f49344d541360fcf9d6a9e9deac4b.profdata From 6b6f8313a9870ced99a1cf15a8ab3ba6f31f52e1 Mon Sep 17 00:00:00 2001 From: chromium-autoroll Date: Sun, 26 Sep 2021 22:37:11 +0000 Subject: [PATCH 21/25] Roll Fuchsia SDK from 6.20210925.2.1 to 6.20210926.0.1 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/fuchsia-sdk-chromium-autoroll Please CC chrome-fuchsia-gardener@grotations.appspotmail.com on the revert to ensure that a human is aware of the problem. To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Cq-Include-Trybots: luci.chromium.try:fuchsia-arm64-cast;luci.chromium.try:fuchsia-deterministic-dbg;luci.chromium.try:fuchsia-x64-cast Tbr: chrome-fuchsia-gardener@grotations.appspotmail.com Disable-Retries: true Change-Id: I9ecf3bc70e5e75c215cf616d561608877878f4cf Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184639 Commit-Queue: chromium-autoroll Bot-Commit: chromium-autoroll Cr-Commit-Position: refs/heads/main@{#925108} --- build/fuchsia/linux.sdk.sha1 | 2 +- build/fuchsia/mac.sdk.sha1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/fuchsia/linux.sdk.sha1 b/build/fuchsia/linux.sdk.sha1 index e513a557d68953..e1e1950a057a9f 100644 --- a/build/fuchsia/linux.sdk.sha1 +++ b/build/fuchsia/linux.sdk.sha1 @@ -1 +1 @@ -6.20210925.2.1 +6.20210926.0.1 diff --git a/build/fuchsia/mac.sdk.sha1 b/build/fuchsia/mac.sdk.sha1 index 2767f33fbcca34..e1e1950a057a9f 100644 --- a/build/fuchsia/mac.sdk.sha1 +++ b/build/fuchsia/mac.sdk.sha1 @@ -1 +1 @@ -6.20210925.3.1 +6.20210926.0.1 From 948a2f8497ef67c8648a47e45370978aa0e91a84 Mon Sep 17 00:00:00 2001 From: Takuto Ikuta Date: Sun, 26 Sep 2021 23:12:05 +0000 Subject: [PATCH 22/25] infra/config: migrate remaining builders to RBE-CAS This is approved in http://shortn/_F1xGHkKSRw Bug: 1143122 Change-Id: Ib258ff76396765d80c9084146a61c1472bb2973d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3180923 Reviewed-by: Fumitoshi Ukai Commit-Queue: Takuto Ikuta Cr-Commit-Position: refs/heads/main@{#925109} --- .../config/generated/luci/cr-buildbucket.cfg | 36 ------------------- infra/config/subprojects/chromium/ci.star | 4 --- infra/config/subprojects/chromium/try.star | 31 ---------------- 3 files changed, 71 deletions(-) diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg index be5dca0b668091..8681f0018f27ed 100644 --- a/infra/config/generated/luci/cr-buildbucket.cfg +++ b/infra/config/generated/luci/cr-buildbucket.cfg @@ -2712,10 +2712,6 @@ buckets { key: "chromium.chromium_tests.use_gitiles_trigger" value: 100 } - experiments { - key: "chromium.chromium_tests.use_isolate" - value: 50 - } experiments { key: "chromium.chromium_tests.use_rdb_results" value: 100 @@ -53978,10 +53974,6 @@ buckets { task_template_canary_percentage { value: 5 } - experiments { - key: "chromium.chromium_tests.use_isolate" - value: 50 - } experiments { key: "chromium.chromium_tests.use_rdb_results" value: 100 @@ -54085,10 +54077,6 @@ buckets { task_template_canary_percentage { value: 5 } - experiments { - key: "chromium.chromium_tests.use_isolate" - value: 50 - } experiments { key: "chromium.chromium_tests.use_rdb_results" value: 100 @@ -54192,10 +54180,6 @@ buckets { task_template_canary_percentage { value: 5 } - experiments { - key: "chromium.chromium_tests.use_isolate" - value: 50 - } experiments { key: "chromium.chromium_tests.use_rdb_results" value: 100 @@ -58611,10 +58595,6 @@ buckets { task_template_canary_percentage { value: 5 } - experiments { - key: "chromium.chromium_tests.use_isolate" - value: 50 - } experiments { key: "chromium.chromium_tests.use_rdb_results" value: 100 @@ -74737,10 +74717,6 @@ buckets { task_template_canary_percentage { value: 5 } - experiments { - key: "chromium.chromium_tests.use_isolate" - value: 50 - } experiments { key: "chromium.chromium_tests.use_rdb_results" value: 100 @@ -74837,10 +74813,6 @@ buckets { task_template_canary_percentage { value: 5 } - experiments { - key: "chromium.chromium_tests.use_isolate" - value: 50 - } experiments { key: "chromium.chromium_tests.use_rdb_results" value: 100 @@ -75897,10 +75869,6 @@ buckets { task_template_canary_percentage { value: 5 } - experiments { - key: "chromium.chromium_tests.use_isolate" - value: 50 - } experiments { key: "chromium.chromium_tests.use_rdb_results" value: 100 @@ -75996,10 +75964,6 @@ buckets { task_template_canary_percentage { value: 5 } - experiments { - key: "chromium.chromium_tests.use_isolate" - value: 50 - } experiments { key: "chromium.chromium_tests.use_rdb_results" value: 100 diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star index 84b8f0c28d5acb..a6acd4ce19b059 100644 --- a/infra/config/subprojects/chromium/ci.star +++ b/infra/config/subprojects/chromium/ci.star @@ -580,10 +580,6 @@ ci.android_builder( execution_timeout = 7 * time.hour, main_console_view = main_console_if_on_branch(), tree_closing = True, - # TODO(crbug.com/1143122): remove this after migration. - experiments = { - "chromium.chromium_tests.use_isolate": 50, - }, ) ci.android_builder( diff --git a/infra/config/subprojects/chromium/try.star b/infra/config/subprojects/chromium/try.star index 942761fb026304..6255b3c7dfb021 100644 --- a/infra/config/subprojects/chromium/try.star +++ b/infra/config/subprojects/chromium/try.star @@ -391,10 +391,6 @@ try_.chromium_android_builder( tryjob = try_.job(), # TODO(crbug/1202741) os = os.LINUX_XENIAL_OR_BIONIC_REMOVE, - # TODO(crbug.com/1143122): remove this after migration. - experiments = { - "chromium.chromium_tests.use_isolate": 50, - }, ) try_.chromium_android_builder( @@ -411,9 +407,6 @@ try_.chromium_android_builder( ), # TODO(crbug/1202741) os = os.LINUX_XENIAL_OR_BIONIC_REMOVE, - experiments = { - "chromium.chromium_tests.use_isolate": 50, - }, ) try_.chromium_android_builder( @@ -428,10 +421,6 @@ try_.chromium_android_builder( tryjob = try_.job(), # TODO(crbug/1202741) os = os.LINUX_XENIAL_OR_BIONIC_REMOVE, - # TODO(crbug.com/1143122): remove this after migration. - experiments = { - "chromium.chromium_tests.use_isolate": 50, - }, ) try_.chromium_android_builder( @@ -1066,10 +1055,6 @@ try_.chromium_linux_builder( builderless = not settings.is_main, main_list_view = "try", tryjob = try_.job(), - # TODO(crbug.com/1143122): remove this after migration. - experiments = { - "chromium.chromium_tests.use_isolate": 50, - }, ) try_.chromium_linux_builder( @@ -1432,10 +1417,6 @@ try_.chromium_linux_builder( ssd = True, main_list_view = "try", tryjob = try_.job(), - # TODO(crbug.com/1143122): remove this after migration. - experiments = { - "chromium.chromium_tests.use_isolate": 50, - }, ) try_.chromium_linux_builder( @@ -1446,10 +1427,6 @@ try_.chromium_linux_builder( tryjob = try_.job( experiment_percentage = 5, ), - # TODO(crbug.com/1143122): remove this after migration. - experiments = { - "chromium.chromium_tests.use_isolate": 50, - }, ) try_.chromium_linux_builder( @@ -1534,10 +1511,6 @@ try_.chromium_linux_builder( goma_jobs = goma.jobs.J150, main_list_view = "try", tryjob = try_.job(), - # TODO(crbug.com/1143122): remove this after migration. - experiments = { - "chromium.chromium_tests.use_isolate": 50, - }, ) try_.chromium_linux_builder( @@ -1548,10 +1521,6 @@ try_.chromium_linux_builder( tryjob = try_.job( experiment_percentage = 5, ), - # TODO(crbug.com/1143122): remove this after migration. - experiments = { - "chromium.chromium_tests.use_isolate": 50, - }, ) try_.chromium_linux_builder( From 78bbab3d5ea5867c0d17837c383cf6917d06fa57 Mon Sep 17 00:00:00 2001 From: Maksim Ivanov Date: Sun, 26 Sep 2021 23:23:56 +0000 Subject: [PATCH 23/25] Fix unsequenced move in //c/b/apps/app_service/ Fix a potential issue in browser_app_instance_registry.cc with the same object being used for reading and for std::move()'ing from within the same expression. This is only a potential issue, since currently it's only happening with the base::UnguessableToken object, whose move constructor leaves the moved-from object in the same state as before moving; still, it's a potential bug if this gets changed or other fields become read from. This issue was found by the bugprone-use-after-move clang-tidy diagnostics: browser_app_instance_registry.cc:284: 'update' used after it was moved browser_app_instance_registry.cc:285: move occurred here browser_app_instance_registry.cc:284: the use and move are unsequenced, i.e. there is no guarantee about the order in which they are evaluated Bug: 1122844 Change-Id: Iea34617e57e3981bd7d062092baa631b14c1bb5f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184739 Auto-Submit: Maksim Ivanov Commit-Queue: Dominick Ng Reviewed-by: Dominick Ng Cr-Commit-Position: refs/heads/main@{#925110} --- .../browser/apps/app_service/browser_app_instance_registry.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chrome/browser/apps/app_service/browser_app_instance_registry.cc b/chrome/browser/apps/app_service/browser_app_instance_registry.cc index 6b12e15bbeed06..d8c7ece2ce80e4 100644 --- a/chrome/browser/apps/app_service/browser_app_instance_registry.cc +++ b/chrome/browser/apps/app_service/browser_app_instance_registry.cc @@ -280,8 +280,9 @@ void BrowserAppInstanceRegistry::LacrosAppInstanceAdded( apps::BrowserAppInstanceUpdate update, aura::Window* window) { DCHECK(window); + auto id = update.id; auto& instance = AddInstance( - lacros_app_instances_, update.id, + lacros_app_instances_, id, std::make_unique(std::move(update), window)); for (auto& observer : observers_) { observer.OnBrowserAppAdded(instance); From 61a9a3d74c3de3c849b89e2be6901e5510667e0e Mon Sep 17 00:00:00 2001 From: chromium-autoroll Date: Mon, 27 Sep 2021 00:06:34 +0000 Subject: [PATCH 24/25] Roll Chrome Win64 PGO Profile Roll Chrome Win64 PGO profile from chrome-win64-main-1632624887-bf17608289ea3853613e1267b6ecb836a3e78a3a.profdata to chrome-win64-main-1632625678-e531df8aa016871399e6678aa3d33807f48febaf.profdata If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/pgo-win64-chromium Please CC pgo-profile-sheriffs@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Chromium main branch: https://bugs.chromium.org/p/chromium/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Cq-Include-Trybots: luci.chrome.try:win64-chrome Tbr: pgo-profile-sheriffs@google.com Change-Id: Ifc5da9504821a39a0829482469707d0c23a9d0d2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3183379 Commit-Queue: chromium-autoroll Bot-Commit: chromium-autoroll Cr-Commit-Position: refs/heads/main@{#925111} --- chrome/build/win64.pgo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt index e4c17edd8cc49e..45da60379a9b96 100644 --- a/chrome/build/win64.pgo.txt +++ b/chrome/build/win64.pgo.txt @@ -1 +1 @@ -chrome-win64-main-1632624887-bf17608289ea3853613e1267b6ecb836a3e78a3a.profdata +chrome-win64-main-1632625678-e531df8aa016871399e6678aa3d33807f48febaf.profdata From b59ece45f8c10cfc8693ac1b790aadb9127e1577 Mon Sep 17 00:00:00 2001 From: chromium-autoroll Date: Mon, 27 Sep 2021 00:12:13 +0000 Subject: [PATCH 25/25] Roll Chrome Win32 PGO Profile Roll Chrome Win32 PGO profile from chrome-win32-main-1632624887-926c058f916f49344d541360fcf9d6a9e9deac4b.profdata to chrome-win32-main-1632625678-a947020e084e041a2efb58a847e9b1b657244667.profdata If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/pgo-win32-chromium Please CC pgo-profile-sheriffs@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Chromium main branch: https://bugs.chromium.org/p/chromium/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Cq-Include-Trybots: luci.chrome.try:win-chrome Tbr: pgo-profile-sheriffs@google.com Change-Id: Icb43e8df1e07b633f2fc10d148a1aaa3a7646a50 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3184723 Commit-Queue: chromium-autoroll Bot-Commit: chromium-autoroll Cr-Commit-Position: refs/heads/main@{#925112} --- chrome/build/win32.pgo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt index da1118d0a7fd58..e8f252a9ef97c6 100644 --- a/chrome/build/win32.pgo.txt +++ b/chrome/build/win32.pgo.txt @@ -1 +1 @@ -chrome-win32-main-1632624887-926c058f916f49344d541360fcf9d6a9e9deac4b.profdata +chrome-win32-main-1632625678-a947020e084e041a2efb58a847e9b1b657244667.profdata