Removing useless Win7 checks + standardize its use

chrome/browser/ui/webui/set_as_default_browser_ui_browsertest_win.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 "chrome/browser/ui/webui/set_as_default_browser_ui_win.h"
 
 #include "base/command_line.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 22 matching lines @@
   }
 
  protected:
   void TearDownInProcessBrowserTestFixture() override {
     ASSERT_FALSE(SetAsDefaultBrowserUI::GetDialogWidgetForTesting());
   }
 };
 
 IN_PROC_BROWSER_TEST_F(SetAsDefaultBrowserUIBrowserTestWithFirstRun, Test) {
   // Windows 8 only test case.
-  if (base::win::GetVersion() <= base::win::VERSION_WIN7 ||
-      base::win::GetVersion() >= base::win::VERSION_WIN10) {
+  if (base::win::GetVersion() != base::win::VERSION_WIN8 &&
+      base::win::GetVersion() != base::win::VERSION_WIN8_1) {

[Nico, 2017/06/01 15:01:22]

nit: To me, the prior `if (base::win::GetVersion() >= base::win::VERSION_WIN10)`
reads slightly faster

[Patrick Monette, 2017/06/02 00:34:04]

Acknowledged. I think I still prefer it this way so it better matches the
comment.

     return;
   }
   ASSERT_FALSE(IsBrowserVisible(browser()));
   views::Widget* dialog_widget =
       SetAsDefaultBrowserUI::GetDialogWidgetForTesting();
   ASSERT_TRUE(dialog_widget);
   ASSERT_TRUE(dialog_widget->IsVisible());
   dialog_widget->CloseNow();
   ASSERT_TRUE(IsBrowserVisible(browser()));
 }
 
 IN_PROC_BROWSER_TEST_F(SetAsDefaultBrowserUIBrowserTestWithoutFirstRun,
                        TestWithoutFirstRun) {
   ASSERT_TRUE(IsBrowserVisible(browser()));
   EXPECT_EQ(nullptr, SetAsDefaultBrowserUI::GetDialogWidgetForTesting());
 }