Update WebThemeEngineImplDefaultBrowserTest.GetSystemColor

WebThemeEngineImplDefaultBrowserTest.GetSystemColor fails non-deterministically on Windows2008ServerR2. To fix this, the test is updated to avoid running on server version types. Bug: 1010924 Change-Id: Ic6d28ab03204452b2441bd215a494b118aa0e847 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1876750Reviewed-by: Kevin Babbitt <kbabbitt@microsoft.com> Reviewed-by: Avi Drissman <avi@chromium.org> Commit-Queue: Alison Maher <almaher@microsoft.com> Cr-Commit-Position: refs/heads/master@{#709540}

Update WebThemeEngineImplDefaultBrowserTest.GetSystemColor
WebThemeEngineImplDefaultBrowserTest.GetSystemColor fails non-deterministically on Windows2008ServerR2. To fix this, the test is updated to avoid running on server version types. Bug: 1010924 Change-Id: Ic6d28ab03204452b2441bd215a494b118aa0e847 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1876750Reviewed-by: Kevin Babbitt <kbabbitt@microsoft.com> Reviewed-by: Avi Drissman <avi@chromium.org> Commit-Queue: Alison Maher <almaher@microsoft.com> Cr-Commit-Position: refs/heads/master@{#709540}
35d4d535 · Alison Maher · Commit Bot · 412bd0e3 · 35d4d535
Commit 35d4d535 authored Oct 25, 2019 by Alison Maher Committed by Commit Bot Oct 25, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

content/child/webthemeengine_impl_default_browsertest.cc content/child/webthemeengine_impl_default_browsertest.cc +6 -4

No files found.
--- a/content/child/webthemeengine_impl_default_browsertest.cc
+++ b/content/child/webthemeengine_impl_default_browsertest.cc
@@ -19,11 +19,13 @@ class WebThemeEngineImplDefaultBrowserTest : public ContentBrowserTest {
 #if defined(OS_WIN)
 IN_PROC_BROWSER_TEST_F(WebThemeEngineImplDefaultBrowserTest, GetSystemColor) {
-  // The test non-deterministically fails on Windows Server 2008 builders due to
+  // The test non-deterministically fails on Windows-2008ServerR2 builders due
-  // a difference in the default theme. As a result, only run the test on
+  // to a difference in the default theme. As a result, only run the test on
-  // Windows version 7 and above.
+  // non-server versions.
-  if (base::win::GetVersion() < base::win::Version::WIN7)
+  if (base::win::OSInfo::GetInstance()->version_type() ==
+      base::win::VersionType::SUITE_SERVER) {
    return;
+  }
  GURL url(
      "data:text/html,"
      "<!doctype html><html>"