Commit 32deb2f2 authored by Peter Kotwicz's avatar Peter Kotwicz Committed by Commit Bot

Re-enable StatusBarColorControllerTest on phones

This CL re-enables StatusBarColorControllerTest on phones only. The
test does not apply to tablets where the status bar is always black

BUG=1056196

Change-Id: Ie8a06eeb272ab17a36eeb28668320ffdd1592425
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2075976Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745080}
parent 51ba32ba
...@@ -16,9 +16,9 @@ import org.junit.Test; ...@@ -16,9 +16,9 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.MinAndroidSdkLevel; import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.browser.ChromeSwitches;
import org.chromium.chrome.browser.ChromeTabbedActivity; import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.flags.CachedFeatureFlags; import org.chromium.chrome.browser.flags.CachedFeatureFlags;
...@@ -30,6 +30,7 @@ import org.chromium.chrome.test.ChromeTabbedActivityTestRule; ...@@ -30,6 +30,7 @@ import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
import org.chromium.chrome.test.util.browser.ThemeTestUtils; import org.chromium.chrome.test.util.browser.ThemeTestUtils;
import org.chromium.components.browser_ui.styles.ChromeColors; import org.chromium.components.browser_ui.styles.ChromeColors;
import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.test.util.UiRestriction;
/** /**
* {@link StatusBarColorController} tests. * {@link StatusBarColorController} tests.
...@@ -59,7 +60,7 @@ public class StatusBarColorControllerTest { ...@@ -59,7 +60,7 @@ public class StatusBarColorControllerTest {
@LargeTest @LargeTest
@Feature({"StatusBar"}) @Feature({"StatusBar"})
@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP_MR1) @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP_MR1)
@DisabledTest(message = "https://crbug.com/1056196") @Restriction({UiRestriction.RESTRICTION_TYPE_PHONE}) // Status bar is always black on tablets
public void testColorToggleIncongitoInOverview() { public void testColorToggleIncongitoInOverview() {
ChromeTabbedActivity activity = mActivityTestRule.getActivity(); ChromeTabbedActivity activity = mActivityTestRule.getActivity();
Resources resources = activity.getResources(); Resources resources = activity.getResources();
...@@ -90,7 +91,7 @@ public class StatusBarColorControllerTest { ...@@ -90,7 +91,7 @@ public class StatusBarColorControllerTest {
@LargeTest @LargeTest
@Feature({"StatusBar"}) @Feature({"StatusBar"})
@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP_MR1) @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP_MR1)
@DisabledTest(message = "https://crbug.com/1056196") @Restriction({UiRestriction.RESTRICTION_TYPE_PHONE}) // Status bar is always black on tablets
public void testBrandColorIgnoredInOverview() throws Exception { public void testBrandColorIgnoredInOverview() throws Exception {
ChromeTabbedActivity activity = mActivityTestRule.getActivity(); ChromeTabbedActivity activity = mActivityTestRule.getActivity();
Resources resources = activity.getResources(); Resources resources = activity.getResources();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment