Fix ContentVerifierTest.FailOnDone and ContentVerifierTest.FailOnRead on Windows 10.

chrome/browser/extensions/content_verifier_browsertest.cc

 // Copyright 2014 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 <list>
 #include <set>
 #include <string>
 
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string_split.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/extensions/browsertest_util.h"
 #include "chrome/browser/extensions/chrome_content_verifier_delegate.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_management_test_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/policy_extension_reinstaller.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/ui_test_utils.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/common/mock_configuration_policy_provider.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/content_verifier.h"
 #include "extensions/browser/content_verify_job.h"
 #include "extensions/browser/crx_file_info.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_registry_observer.h"
 #include "extensions/browser/external_install_info.h"
 #include "extensions/browser/external_provider_interface.h"
 #include "extensions/browser/management_policy.h"
 #include "extensions/browser/updater/extension_downloader.h"
 #include "extensions/browser/updater/extension_downloader_test_delegate.h"
 #include "extensions/browser/updater/manifest_fetch_data.h"
 #include "extensions/common/extension_urls.h"
 
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-
 namespace extensions {
 
 namespace {
 
 // Helper for observing extension registry events.
 class RegistryObserver : public ExtensionRegistryObserver {
  public:
   explicit RegistryObserver(ExtensionRegistry* registry) : observer_(this) {
     observer_.Add(registry);
   }
@@ skipping 428 matching lines @@
     delegate_.set_id(id);
 
     // |unload_observer| needs to destroy before the ExtensionRegistry gets
     // deleted, which happens before TearDownOnMainThread is called.
     RegistryObserver unload_observer(ExtensionRegistry::Get(profile()));
     const Extension* extension = InstallExtensionFromWebstore(
         test_data_dir_.AppendASCII("content_verifier/v1.crx"), 1);
     ASSERT_TRUE(extension);
     ASSERT_EQ(id, extension->id());
     page_url_ = extension->GetResourceURL("page.html");
-
-    // This call passes false for |check_navigation_success|, because checking
-    // for navigation success needs the WebContents to still exist after the
-    // navigation, whereas this navigation triggers an unload which destroys
-    // the WebContents.
-    AddTabAtIndexToBrowser(browser(), 1, page_url_, ui::PAGE_TRANSITION_LINK,
-                           false);
+    // Wait for 0 navigations to complete because with PlzNavigate it's racy
+    // when the didstop IPC arrives relative to the tab being closed. The
+    // wait call below is what the tests care about.
+    ui_test_utils::NavigateToURLWithDispositionBlockUntilNavigationsComplete(
+        browser(), page_url_, 0, WindowOpenDisposition::NEW_FOREGROUND_TAB,
+        ui_test_utils::BROWSER_TEST_NONE);
 
     EXPECT_TRUE(unload_observer.WaitForUnload(id));
     ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
     int reasons = prefs->GetDisableReasons(id);
     EXPECT_TRUE(reasons & Extension::DISABLE_CORRUPTED);
   }
 
   void TestContentScriptExtension(const std::string& crx_relpath,
                                   const std::string& id,
                                   const std::string& script_relpath) {
@@ skipping 41 matching lines @@
     EnableExtension(id);
     EXPECT_TRUE(job_observer.WaitForExpectedJobs());
   }
 
  protected:
   JobDelegate delegate_;
   GURL page_url_;
 };
 
 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, FailOnRead) {
-#if defined(OS_WIN)
-  if (content::IsBrowserSideNavigationEnabled() &&
-      base::win::GetVersion() >= base::win::VERSION_WIN10) {
-    // http://crbug.com/699437
-    return;
-  }
-#endif
   EXPECT_EQ(0, delegate_.bytes_read_failed());
   delegate_.fail_next_read();
   OpenPageAndWaitForUnload();
   EXPECT_EQ(1, delegate_.bytes_read_failed());
 }
 
 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, FailOnDone) {
-#if defined(OS_WIN)
-  if (content::IsBrowserSideNavigationEnabled() &&
-      base::win::GetVersion() >= base::win::VERSION_WIN10) {
-    // http://crbug.com/699437
-    return;
-  }
-#endif
   EXPECT_EQ(0, delegate_.done_reading_failed());
   delegate_.fail_next_done();
   OpenPageAndWaitForUnload();
   EXPECT_EQ(1, delegate_.done_reading_failed());
 }
 
 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, DotSlashPaths) {
   JobObserver job_observer;
   std::string id = "hoipipabpcoomfapcecilckodldhmpgl";
 
@@ skipping 309 matching lines @@
   // Remove the override and set ExtensionService to update again. The extension
   // should be now installed.
   PolicyExtensionReinstaller::set_policy_reinstall_action_for_test(nullptr);
   service->set_external_updates_disabled_for_test(false);
   delay_tracker.Proceed();
 
   EXPECT_TRUE(registry_observer.WaitForInstall(id_));
 }
 
 }  // namespace extensions