Fix two ContentHashFetcherTest.* tests' flakiness.

extensions/browser/content_hash_fetcher_unittest.cc

 // Copyright 2016 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 <memory>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 168 matching lines @@
     interceptor_->SetResponse(url, response_path);
   }
 
  protected:
   std::unique_ptr<content::TestBrowserThreadBundle> browser_threads_;
   std::unique_ptr<net::TestURLRequestInterceptor> interceptor_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_;
   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, MAYBE_MissingVerifiedContents) {
+TEST_F(ContentHashFetcherTest, 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
   // verified_contents.json file there.
   base::FilePath test_dir_base = GetTestPath(
       base::FilePath(FILE_PATH_LITERAL("missing_verified_contents")));
   scoped_refptr<Extension> extension =
       UnzipToTempDirAndLoad(test_dir_base.AppendASCII("source.zip"));
 
   // Make sure there isn't already a verified_contents.json file there.
@@ skipping 18 matching lines @@
   EXPECT_TRUE(result->success);
   EXPECT_TRUE(result->force);
   EXPECT_TRUE(result->mismatch_paths.empty());
 
   // Make sure the verified_contents.json file was written into the extension's
   // install dir.
   EXPECT_TRUE(
       base::PathExists(file_util::GetVerifiedContentsPath(extension->path())));
 }
 
-// Flaky on Linux and ChromeOS. https://crbug.com/702300
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-#define MAYBE_MissingVerifiedContentsAndCorrupt \
-  DISABLED_MissingVerifiedContentsAndCorrupt
-#else
-#define MAYBE_MissingVerifiedContentsAndCorrupt \
-  MissingVerifiedContentsAndCorrupt
-#endif
 // Similar to MissingVerifiedContents, but tests the case where the extension
 // actually has corruption.
-TEST_F(ContentHashFetcherTest, MAYBE_MissingVerifiedContentsAndCorrupt) {
+TEST_F(ContentHashFetcherTest, MissingVerifiedContentsAndCorrupt) {
   base::FilePath test_dir_base =
       GetTestPath(base::FilePath()).AppendASCII("missing_verified_contents");
   scoped_refptr<Extension> extension =
       UnzipToTempDirAndLoad(test_dir_base.AppendASCII("source.zip"));
 
   // Tamper with a file in the extension.
   base::FilePath script_path = extension->path().AppendASCII("script.js");
   std::string addition = "//hello world";
   ASSERT_TRUE(
       base::AppendToFile(script_path, addition.c_str(), addition.size()));
@@ skipping 17 matching lines @@
   EXPECT_TRUE(
       base::ContainsKey(result->mismatch_paths, script_path.BaseName()));
 
   // Make sure the verified_contents.json file was written into the extension's
   // install dir.
   EXPECT_TRUE(
       base::PathExists(file_util::GetVerifiedContentsPath(extension->path())));
 }
 
 }  // namespace extensions