| Index: extensions/browser/content_hash_fetcher_unittest.cc
|
| diff --git a/extensions/browser/content_hash_fetcher_unittest.cc b/extensions/browser/content_hash_fetcher_unittest.cc
|
| index 2d01fb1fa7c9a4761b89c54d83d08e190b9f357e..e54b4d66f7b8be0cb6e32f25e6fa4100da187bd8 100644
|
| --- a/extensions/browser/content_hash_fetcher_unittest.cc
|
| +++ b/extensions/browser/content_hash_fetcher_unittest.cc
|
| @@ -186,9 +186,15 @@ class ContentHashFetcherTest : public ExtensionsTest {
|
| base::ScopedTempDir temp_dir_;
|
| };
|
|
|
| +// Flaky on Linux and ChromeOS. https://crbug.com/702300
|
| +#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
| +#define MAYBE_MissingVerifiedContents DISABLED_MissingVerifiedContents
|
| +#else
|
| +#define MAYBE_MissingVerifiedContents MissingVerifiedContents
|
| +#endif
|
| // This tests our ability to successfully fetch, parse, and validate a missing
|
| // verified_contents.json file for an extension.
|
| -TEST_F(ContentHashFetcherTest, MissingVerifiedContents) {
|
| +TEST_F(ContentHashFetcherTest, MAYBE_MissingVerifiedContents) {
|
| // We unzip the extension source to a temp directory to simulate it being
|
| // installed there, because the ContentHashFetcher will create the _metadata/
|
| // directory within the extension install dir and write the fetched
|
| @@ -227,9 +233,7 @@ TEST_F(ContentHashFetcherTest, MissingVerifiedContents) {
|
| base::PathExists(file_util::GetVerifiedContentsPath(extension->path())));
|
| }
|
|
|
| -// Similar to MissingVerifiedContents, but tests the case where the extension
|
| -// actually has corruption.
|
| -// Flaky on Linux and ChromeOS. crbug.com/
|
| +// Flaky on Linux and ChromeOS. https://crbug.com/702300
|
| #if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
| #define MAYBE_MissingVerifiedContentsAndCorrupt \
|
| DISABLED_MissingVerifiedContentsAndCorrupt
|
| @@ -237,6 +241,8 @@ TEST_F(ContentHashFetcherTest, MissingVerifiedContents) {
|
| #define MAYBE_MissingVerifiedContentsAndCorrupt \
|
| MissingVerifiedContentsAndCorrupt
|
| #endif
|
| +// Similar to MissingVerifiedContents, but tests the case where the extension
|
| +// actually has corruption.
|
| TEST_F(ContentHashFetcherTest, MAYBE_MissingVerifiedContentsAndCorrupt) {
|
| base::FilePath test_dir_base =
|
| GetTestPath(base::FilePath()).AppendASCII("missing_verified_contents");
|
|
|