Revert "Revert "Disable ContentVerifierTest.FailOnDone and ContentVerifierTest.FailOnRead on Win 10 with PlzNavigate.""
This reverts commit 1b7b56141f9b86e96cc9f62423a81ff8ad3cd96b.
Reason for revert: Bots are complaining again. :) See failure at:
https://uberchromegw.corp.google.com/i/chromium.win/builders/Win10%20Tests%20x64/builds/11572
Original change's description:
> Revert "Disable ContentVerifierTest.FailOnDone and ContentVerifierTest.FailOnRead on Win 10 with PlzNavigate."
>
> This reverts commit e3cba8b7bd9d5bf5b045b5cb08434a80cf53b288.
>
> Bug: 699437
> Change-Id: I48c898574d26cca9af8d9def984c084680f71adb
> Reviewed-on: https://chromium-review.googlesource.com/504929
> Reviewed-by: Devlin <[email protected]>
> Commit-Queue: Nasko Oskov <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#471440}
[email protected],[email protected]
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Bug: 699437
Change-Id: I41584a9c90a174a482d3a7e3bc86b7914b9839e1
Reviewed-on: https://chromium-review.googlesource.com/505094
Reviewed-by: Justin Donnelly <[email protected]>
Commit-Queue: Justin Donnelly <[email protected]>
Cr-Commit-Position: refs/heads/master@{#471457}diff --git a/chrome/browser/extensions/content_verifier_browsertest.cc b/chrome/browser/extensions/content_verifier_browsertest.cc
index 384b0bc5..4a83527 100644
--- a/chrome/browser/extensions/content_verifier_browsertest.cc
+++ b/chrome/browser/extensions/content_verifier_browsertest.cc
@@ -24,6 +24,7 @@
#include "chrome/common/chrome_switches.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"
@@ -39,6 +40,10 @@
#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 {
@@ -555,6 +560,13 @@
};
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();
@@ -562,6 +574,13 @@
}
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();
