Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from chromium:main #115

Merged
merged 38 commits into from
Dec 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e8b30b8
[mparch] Add a test for the permission request for a fenced frame
jkim-julie Dec 15, 2021
e56267b
[Snooping protection] Replaced outdated radio list with a toggle.
martis-chromium Dec 15, 2021
dc244cc
Cmdline switch to avoid blocking dev mode by policy
Dec 15, 2021
233d68b
Remove NonSFI mode part 9.
Dec 15, 2021
f3dec91
Roll vulkan-deps from 2ec74208b030 to a8221eed5970 (1 revision)
Dec 15, 2021
192c49d
[Sensors] AmbientLightSensor rounding moved to browser process
JuhaVainio Dec 15, 2021
2a6a90e
Roll PDFium from ffe2e366064b to 8436313566e6 (5 revisions)
Dec 15, 2021
552a3fd
Fix test expectation and baseline to unblock wpt importer
WeizhongX Dec 15, 2021
363285b
[skylab_tests] Update skylab tests cros img version
skylab-tests-roller Dec 15, 2021
89a383e
CCA: Move recording gif feature out of expert mode
Dec 15, 2021
b1ce0bb
[mparch] Use PrimaryPageChanged in SameOriginObserver.
hyowon-igalia Dec 15, 2021
d86ea6b
[WebChannel] Adjust webChannels flag title and desc
Dec 15, 2021
93bb389
Add more tests for presentation callback when there is no update
Dec 15, 2021
4279047
BackForwardCache: Reenable ForEachRenderFrameHost
Dec 15, 2021
150200b
Import wpt@b8c0410ed53a15dcaa6792a13f47584505d4b833
Dec 15, 2021
2dae07e
Roll Skia from 71f7880bb635 to e17fd4fea551 (3 revisions)
Dec 15, 2021
e92d644
Remove dead files chromeos/login/auth/login_event_recorder.{cc|h}
duswnchl Dec 15, 2021
4501f16
Update lsan suppression for SurfaceDrawContext to cover similar leaks.
Dec 15, 2021
8493d07
Fix use-after-move in ContentAutofillAssistantDriver
Dec 15, 2021
37ba6ee
Roll src-internal from 8ec97804c2ef to 3772b4e1977a (2 revisions)
Dec 15, 2021
ec10337
Roll src/third_party/cros_system_api/ 48bb7e747..725259a4b (12 commits)
ayamahmod Dec 15, 2021
3917389
Lacros web apps: Icons for App Management completed in Ash
ericwilligers Dec 15, 2021
ec8cbeb
[benchmarking] update pixel 4 os dimension to have more details
Dec 15, 2021
738c40c
Dismantle IMEBridge::Initialize() and related lifecycle requirement.
Dec 15, 2021
5b41b8b
Fix mouse drag selection
hashseed Dec 15, 2021
9c7b5f4
Clean up ServiceWorker.OfflineCapable.Reason* and callers of it
d0iasm Dec 15, 2021
e772d72
Add sharding option for quickrun
Dec 15, 2021
03bde11
[Lacros] Remove the browser app launcher usage in demo mode.
Dec 15, 2021
2ecff10
Roll Fuchsia SDK from 7.20211214.2.1 to 7.20211215.0.1
Dec 15, 2021
0276eba
CrOS: Migrate chrome://sys-internals to JS modules.
freshp86 Dec 15, 2021
fd041bd
[Autofill Assistant] Enable animations + Remove filter
Dec 15, 2021
5bff203
Roll Chrome Mac PGO Profile
Dec 15, 2021
857a78c
wpt docs: use vpython3 to run tests
Dec 15, 2021
7542bc5
Roll Chrome Win64 PGO Profile
Dec 15, 2021
d35ce0b
Roll Chrome Linux PGO Profile
Dec 15, 2021
6e65429
[iOS] Update CPE's 'Add password' view footer
adangla Dec 15, 2021
b534f9a
Roll Chrome Win32 PGO Profile
Dec 15, 2021
8671941
Roll DevTools Frontend from 895afdf921d3 to 8b004bd56791 (2 revisions)
Dec 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,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': '71f7880bb635810ca81e6cebaaaa25018499f2d7',
'skia_revision': 'e17fd4fea551ea554b67af7c044b5fbc1e90ce00',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling V8
# and whatever else without interference from each other.
Expand All @@ -255,7 +255,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling PDFium
# and whatever else without interference from each other.
'pdfium_revision': 'ffe2e366064b6d884e0c8ffd9fe94f2a585c5581',
'pdfium_revision': '8436313566e6ad9c82e73888db468b315026ce8f',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other.
Expand Down Expand Up @@ -314,7 +314,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling devtools-frontend
# and whatever else without interference from each other.
'devtools_frontend_revision': '895afdf921d39c15ec8b6c072e08d12961f797b1',
'devtools_frontend_revision': '8b004bd567919de941703655d5f312465428fc0a',
# 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.
Expand Down Expand Up @@ -1033,7 +1033,7 @@ deps = {

# For Linux and Chromium OS.
'src/third_party/cros_system_api': {
'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + '188fb4eba05af428a48c7ce173a3026215241850',
'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + '725259a4bd767e8535374fc391849f2bc4a79e32',
'condition': 'checkout_linux',
},

Expand Down Expand Up @@ -1603,7 +1603,7 @@ deps = {
'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '62d7d0c928c9a040dce96aa2f16c00e7e67d59cb',

'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@2ec74208b0306eff87b9ebc097d8dfbb20e76fc2',
'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@a8221eed597007ec8c52726562c1371195c41b08',

'src/third_party/vulkan_memory_allocator':
Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git' + '@' + '5e49f57a6e71a026a54eb42e366de09a4142d24e',
Expand Down Expand Up @@ -1700,7 +1700,7 @@ deps = {
Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'),

'src-internal': {
'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@8ec97804c2ef0925c3447d7915a8ec63f5181895',
'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@3772b4e1977a26513f2da475016bd6912a1c9c65',
'condition': 'checkout_src_internal',
},

Expand Down
4 changes: 3 additions & 1 deletion ash/constants/ash_pref_names.cc
Original file line number Diff line number Diff line change
Expand Up @@ -431,9 +431,11 @@ const char kManagedGuestSessionPrivacyWarningsEnabled[] =
"managed_session.privacy_warning_enabled";

// Boolean pref indicating whether the user has enabled detection of snooping
// over their shoulder.
// over their shoulder, and hiding of notifications when a snooper is detected.
const char kSnoopingProtectionEnabled[] =
"ash.privacy.snooping_protection_enabled";
const char kSnoopingProtectionNotificationSuppressionEnabled[] =
"ash.privacy.snooping_protection_notification_suppression_enabled";

// A string pref storing the type of lock screen notification mode.
// "show" -> show notifications on the lock screen
Expand Down
2 changes: 2 additions & 0 deletions ash/constants/ash_pref_names.h
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ extern const char kManagedGuestSessionPrivacyWarningsEnabled[];

COMPONENT_EXPORT(ASH_CONSTANTS)
extern const char kSnoopingProtectionEnabled[];
COMPONENT_EXPORT(ASH_CONSTANTS)
extern const char kSnoopingProtectionNotificationSuppressionEnabled[];

// Lock screen notification settings.
COMPONENT_EXPORT(ASH_CONSTANTS)
Expand Down
6 changes: 6 additions & 0 deletions ash/constants/ash_switches.cc
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,12 @@ const char kEnterpriseEnrollmentInitialModulus[] =
const char kEnterpriseEnrollmentModulusLimit[] =
"enterprise-enrollment-modulus-limit";

// Disallow blocking developer mode through enterprise device policy:
// - Fail enterprise enrollment if enrolling would block dev mode.
// - Don't apply new device policy if it would block dev mode.
// This is only usable on test builds.
const char kDisallowPolicyBlockDevMode[] = "disallow-policy-block-dev-mode";

// Write extension install events to chrome log for integration test.
const char kExtensionInstallEventChromeLogForTests[] =
"extension-install-event-chrome-log-for-tests";
Expand Down
2 changes: 2 additions & 0 deletions ash/constants/ash_switches.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ extern const char kEnterpriseEnrollmentInitialModulus[];
COMPONENT_EXPORT(ASH_CONSTANTS)
extern const char kEnterpriseEnrollmentModulusLimit[];
COMPONENT_EXPORT(ASH_CONSTANTS)
extern const char kDisallowPolicyBlockDevMode[];
COMPONENT_EXPORT(ASH_CONSTANTS)
extern const char kExtensionInstallEventChromeLogForTests[];
COMPONENT_EXPORT(ASH_CONSTANTS)
extern const char kExternalMetricsCollectionInterval[];
Expand Down
4 changes: 4 additions & 0 deletions ash/system/unified/hps_notify_controller.cc
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ void HpsNotifyController::RegisterProfilePrefs(PrefRegistrySimple* registry) {
prefs::kSnoopingProtectionEnabled,
/*default_value=*/false,
user_prefs::PrefRegistrySyncable::SYNCABLE_OS_PREF);
registry->RegisterBooleanPref(
prefs::kSnoopingProtectionNotificationSuppressionEnabled,
/*default_value=*/false,
user_prefs::PrefRegistrySyncable::SYNCABLE_OS_PREF);
}

void HpsNotifyController::OnSessionStateChanged(
Expand Down
1 change: 0 additions & 1 deletion ash/webui/camera_app_ui/resources.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ const struct {
{"expert_print_performance_logs", IDS_EXPERT_PRINT_PERFORMANCE_LOGS},
{"expert_save_metadata", IDS_EXPERT_SAVE_METADATA},
{"expert_scan_barcode", IDS_EXPERT_SCAN_BARCODE},
{"expert_show_gif_recording_option", IDS_EXPERT_SHOW_GIF_RECORDING_OPTION},
{"export_button", IDS_EXPORT_BUTTON},
{"feedback_button", IDS_FEEDBACK_BUTTON},
{"feedback_description_placeholder", IDS_FEEDBACK_DESCRIPTION_PLACEHOLDER},
Expand Down
2 changes: 1 addition & 1 deletion ash/webui/camera_app_ui/resources/css/mode/video.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. */

body:is(:not(.video), :not(.expert), :not(.show-gif-recording-option), .taking, .camera-configuring, .should-handle-intent-result) #record-types-group {
body:is(:not(.video), .taking, .camera-configuring, .should-handle-intent-result) #record-types-group {
display: none;
}

Expand Down
1 change: 0 additions & 1 deletion ash/webui/camera_app_ui/resources/js/i18n_string.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ export enum I18nString {
EXPERT_PRINT_PERFORMANCE_LOGS = 'expert_print_performance_logs',
EXPERT_SAVE_METADATA = 'expert_save_metadata',
EXPERT_SCAN_BARCODE = 'expert_scan_barcode',
EXPERT_SHOW_GIF_RECORDING_OPTION = 'expert_show_gif_recording_option',
EXPORT_BUTTON = 'export_button',
FEEDBACK_BUTTON = 'feedback_button',
FEEDBACK_DESCRIPTION_PLACEHOLDER = 'feedback_description_placeholder',
Expand Down
1 change: 0 additions & 1 deletion ash/webui/camera_app_ui/resources/js/state.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ export const State = {
SHOULD_HANDLE_INTENT_RESULT: 'should-handle-intent-result',
SHOW_METADATA: 'show-metadata',
SHOW_SCAN_MODE: 'show-scan-mode',
SHOW_GIF_RECORDING_OPTION: 'show-gif-recording-option',
SHUTTER_PROGRESSING: 'shutter-progressing',
STREAMING: 'streaming',
SUSPEND: 'suspend',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,7 @@ export class Video extends ModeBase {
* record type option groups.
*/
getToggledRecordOption_() {
if (state.get(state.State.SHOULD_HANDLE_INTENT_RESULT) ||
!state.get(state.State.EXPERT) ||
!state.get(state.State.SHOW_GIF_RECORDING_OPTION)) {
if (state.get(state.State.SHOULD_HANDLE_INTENT_RESULT)) {
return RecordType.NORMAL;
}
return Object.values(RecordType).find((t) => state.get(t)) ||
Expand Down
3 changes: 0 additions & 3 deletions ash/webui/camera_app_ui/resources/strings/camera_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,6 @@
<message desc="Label for expert mode option: enable full-sized video snapshot." name="IDS_EXPERT_ENABLE_FULL_SIZED_VIDEO_SNAPSHOT">
Enable full-sized video snapshot
</message>
<message desc="Label for expert mode option: Show GIF recording option." name="IDS_EXPERT_SHOW_GIF_RECORDING_OPTION">
Show GIF recording option
</message>
<message desc="Label for snackbar message when a link is copied" name="IDS_SNACKBAR_LINK_COPIED">
Link copied
</message>
Expand Down

This file was deleted.

6 changes: 0 additions & 6 deletions ash/webui/camera_app_ui/resources/views/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -574,12 +574,6 @@
data-key="enableFullSizedVideoSnapshot">
<span i18n-text="expert_enable_full_sized_video_snapshot"></span>
</label>
<label class="menu-item inkdrop">
<input id="expert-enable-gif-recording" class="icon" type="checkbox"
tabindex="0" data-state="show-gif-recording-option"
data-key="show-gif-recording-option">
<span i18n-text="expert_show_gif_recording_option"></span>
</label>
<label class="menu-item inkdrop">
<input id="expert-enable-expert-mode" class="icon" type="checkbox"
tabindex="0" data-state="expert"
Expand Down
2 changes: 1 addition & 1 deletion build/fuchsia/linux.sdk.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.20211214.2.1
7.20211215.0.1
2 changes: 1 addition & 1 deletion build/fuchsia/mac.sdk.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.20211214.2.1
7.20211215.0.1
2 changes: 1 addition & 1 deletion build/sanitizers/lsan_suppressions.cc
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ char kLSanDefaultSuppressions[] =
// Suppress AnimationSequence leak. crbug.com/1265031
"leak:ash::LockStateController::StartPostLockAnimation\n"
// Suppress leak in SurfaceDrawContext. crbug.com/1265033
"leak:skgpu::v1::SurfaceDrawContext::drawGlyphRunListWithCache\n"
"leak:skgpu::v1::SurfaceDrawContext::drawGlyphRunList\n"
#endif

// PLEASE READ ABOVE BEFORE ADDING NEW SUPPRESSIONS.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.chromium.chrome.browser.customtabs.CustomTabActivityTestRule;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.ui.test.util.DisableAnimationsTestRule;

import java.util.Collections;

Expand All @@ -39,10 +40,14 @@
public class AutofillAssistantAutostartTest {
private final CustomTabActivityTestRule mTestRule = new CustomTabActivityTestRule();

// TODO(crbug/1272997): Find out why the DisableAnimationsTestRule is necessary and remove it
// again.
@Rule
public final TestRule mRulesChain =
RuleChain.outerRule(mTestRule).around(new AutofillAssistantCustomTabTestRule(
mTestRule, "autofill_assistant_target_website.html"));
RuleChain.outerRule(mTestRule)
.around(new DisableAnimationsTestRule(/* enableAnimation= */ true))
.around(new AutofillAssistantCustomTabTestRule(
mTestRule, "autofill_assistant_target_website.html"));

/**
* Launches autofill assistant with a single autostartable script.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
import org.chromium.chrome.test.util.ChromeTabUtils;
import org.chromium.ui.test.util.DisableAnimationsTestRule;

import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -76,8 +77,13 @@ public class AutofillAssistantBackButtonIntegrationTest {
private final AutofillAssistantChromeTabTestRule mTabTestRule =
new AutofillAssistantChromeTabTestRule(mTestRule, TEST_PAGE_A);

// TODO(crbug/1272997): Find out why the DisableAnimationsTestRule is necessary and remove it
// again.
@Rule
public final TestRule mRulesChain = RuleChain.outerRule(mTestRule).around(mTabTestRule);
public final TestRule mRulesChain =
RuleChain.outerRule(mTestRule)
.around(new DisableAnimationsTestRule(/* enableAnimation= */ true))
.around(mTabTestRule);

private String getURL(String page) {
return mTabTestRule.getURL(page);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
import org.chromium.chrome.browser.customtabs.CustomTabActivityTestRule;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.ui.test.util.DisableAnimationsTestRule;

import java.util.ArrayList;
import java.util.Collections;
Expand All @@ -94,10 +95,14 @@
public class AutofillAssistantBottomsheetTest {
private final CustomTabActivityTestRule mTestRule = new CustomTabActivityTestRule();

// TODO(crbug/1272997): Find out why the DisableAnimationsTestRule is necessary and remove it
// again.
@Rule
public final TestRule mRulesChain =
RuleChain.outerRule(mTestRule).around(new AutofillAssistantCustomTabTestRule(
mTestRule, "bottomsheet_behaviour_target_website.html"));
RuleChain.outerRule(mTestRule)
.around(new DisableAnimationsTestRule(/* enableAnimation= */ true))
.around(new AutofillAssistantCustomTabTestRule(
mTestRule, "bottomsheet_behaviour_target_website.html"));

private AutofillAssistantTestScript makeScriptWithActionArray(
ArrayList<ActionProto> actionsList) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator;
import org.chromium.content_public.browser.test.util.KeyUtils;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
import org.chromium.ui.test.util.UiRestriction;

import java.util.ArrayList;
Expand All @@ -84,8 +85,13 @@ public class AutofillAssistantChromeTabIntegrationTest {
private final AutofillAssistantChromeTabTestRule mTabTestRule =
new AutofillAssistantChromeTabTestRule(mTestRule, TEST_PAGE_A);

// TODO(crbug/1272997): Find out why the DisableAnimationsTestRule is necessary and remove it
// again.
@Rule
public final TestRule mRulesChain = RuleChain.outerRule(mTestRule).around(mTabTestRule);
public final TestRule mRulesChain =
RuleChain.outerRule(mTestRule)
.around(new DisableAnimationsTestRule(/* enableAnimation= */ true))
.around(mTabTestRule);

private ScrimCoordinator mScrimCoordinator;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.content_public.browser.WebContents;
import org.chromium.ui.test.util.DisableAnimationsTestRule;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
Expand All @@ -130,9 +131,14 @@
public class AutofillAssistantCollectUserDataIntegrationTest {
private final CustomTabActivityTestRule mTestRule = new CustomTabActivityTestRule();

// TODO(crbug/1272997): Find out why the DisableAnimationsTestRule is necessary and remove it
// again.
@Rule
public final TestRule mRulesChain = RuleChain.outerRule(mTestRule).around(
new AutofillAssistantCustomTabTestRule(mTestRule, "form_target_website.html"));
public final TestRule mRulesChain =
RuleChain.outerRule(mTestRule)
.around(new DisableAnimationsTestRule(/* enableAnimation= */ true))
.around(new AutofillAssistantCustomTabTestRule(
mTestRule, "form_target_website.html"));

private AutofillAssistantCollectUserDataTestHelper mHelper;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.test.util.DisableAnimationsTestRule;

import java.util.ArrayList;
import java.util.Collections;
Expand All @@ -94,10 +95,14 @@
public class AutofillAssistantFormActionTest {
private final CustomTabActivityTestRule mTestRule = new CustomTabActivityTestRule();

// TODO(crbug/1272997): Find out why the DisableAnimationsTestRule is necessary and remove it
// again.
@Rule
public final TestRule mRulesChain =
RuleChain.outerRule(mTestRule).around(new AutofillAssistantCustomTabTestRule(
mTestRule, "autofill_assistant_target_website.html"));
RuleChain.outerRule(mTestRule)
.around(new DisableAnimationsTestRule(/* enableAnimation= */ true))
.around(new AutofillAssistantCustomTabTestRule(
mTestRule, "autofill_assistant_target_website.html"));

/**
* Creates a close-to-real example of a form action with multiple counters and choices,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
import org.chromium.chrome.browser.customtabs.CustomTabActivityTestRule;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.ui.test.util.DisableAnimationsTestRule;

import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -178,10 +179,14 @@
public class AutofillAssistantGenericUiTest {
private final CustomTabActivityTestRule mTestRule = new CustomTabActivityTestRule();

// TODO(crbug/1272997): Find out why the DisableAnimationsTestRule is necessary and remove it
// again.
@Rule
public final TestRule mRulesChain =
RuleChain.outerRule(mTestRule).around(new AutofillAssistantCustomTabTestRule(
mTestRule, "autofill_assistant_target_website.html"));
RuleChain.outerRule(mTestRule)
.around(new DisableAnimationsTestRule(/* enableAnimation= */ true))
.around(new AutofillAssistantCustomTabTestRule(
mTestRule, "autofill_assistant_target_website.html"));

private AutofillAssistantCollectUserDataTestHelper mHelper;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.content_public.browser.test.util.TestCallbackHelperContainer;
import org.chromium.ui.test.util.DisableAnimationsTestRule;

import java.util.ArrayList;
import java.util.Collections;
Expand All @@ -83,9 +84,13 @@ public class AutofillAssistantInputActionIntegrationTest {

private final CustomTabActivityTestRule mTestRule = new CustomTabActivityTestRule();

// TODO(crbug/1272997): Find out why the DisableAnimationsTestRule is necessary and remove it
// again.
@Rule
public final TestRule mRulesChain = RuleChain.outerRule(mTestRule).around(
new AutofillAssistantCustomTabTestRule(mTestRule, TEST_PAGE));
public final TestRule mRulesChain =
RuleChain.outerRule(mTestRule)
.around(new DisableAnimationsTestRule(/* enableAnimation= */ true))
.around(new AutofillAssistantCustomTabTestRule(mTestRule, TEST_PAGE));

@Test
@MediumTest
Expand Down
Loading