Commit a35e7b9f authored by David Bertoni's avatar David Bertoni Committed by Commit Bot

[Extensions] Re-enable some ExtensionIconSourceTest tests.

These tests are no longer flaky.

Bug: 238705
Change-Id: I1e0b84122a2cc7d2581a9dff8007a5f31d7b00f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2411470Reviewed-by: default avatarKelvin Jiang <kelvinjiang@chromium.org>
Commit-Queue: David Bertoni <dbertoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807600}
parent 45214516
...@@ -18,14 +18,7 @@ ...@@ -18,14 +18,7 @@
using ExtensionIconSourceTest = extensions::ExtensionApiTest; using ExtensionIconSourceTest = extensions::ExtensionApiTest;
// Times out on Mac and Win. http://crbug.com/238705 IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoaded) {
#if defined(OS_WIN) || defined(OS_MAC)
#define MAYBE_IconsLoaded DISABLED_IconsLoaded
#else
#define MAYBE_IconsLoaded IconsLoaded
#endif
IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, MAYBE_IconsLoaded) {
base::FilePath basedir = test_data_dir_.AppendASCII("icons"); base::FilePath basedir = test_data_dir_.AppendASCII("icons");
ASSERT_TRUE(LoadExtension(basedir.AppendASCII("extension_with_permission"))); ASSERT_TRUE(LoadExtension(basedir.AppendASCII("extension_with_permission")));
ASSERT_TRUE(LoadExtension(basedir.AppendASCII("extension_no_permission"))); ASSERT_TRUE(LoadExtension(basedir.AppendASCII("extension_no_permission")));
...@@ -69,14 +62,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, InvalidURL) { ...@@ -69,14 +62,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, InvalidURL) {
EXPECT_EQ(result, "invalid (96\xC3\x97""96)"); EXPECT_EQ(result, "invalid (96\xC3\x97""96)");
} }
// Times out on Mac and Win. http://crbug.com/238705 IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoadedIncognito) {
#if defined(OS_WIN) || defined(OS_MAC)
#define MAYBE_IconsLoadedIncognito DISABLED_IconsLoadedIncognito
#else
#define MAYBE_IconsLoadedIncognito IconsLoadedIncognito
#endif
IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, MAYBE_IconsLoadedIncognito) {
base::FilePath basedir = test_data_dir_.AppendASCII("icons"); base::FilePath basedir = test_data_dir_.AppendASCII("icons");
ASSERT_TRUE(LoadExtensionIncognito( ASSERT_TRUE(LoadExtensionIncognito(
basedir.AppendASCII("extension_with_permission"))); basedir.AppendASCII("extension_with_permission")));
......
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