Removing useless Win7 checks + standardize its use

chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc

 // Copyright 2013 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 <objbase.h>
 #include <shlobj.h>  // Must be before propkey.
 #include <propkey.h>
 #include <shellapi.h>
 #include <stddef.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_propvariant.h"
-#include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_shortcut_manager_win.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 145 matching lines @@
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserTestWithProfileShortcutManager);
 };
 
 // Check that the window properties on Windows are properly set.
 // http://crbug.com/396344
 IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager,
                        DISABLED_WindowProperties) {
-  // This test checks HWND properties that are only available on Win7+.
-  if (base::win::GetVersion() < base::win::VERSION_WIN7)
-    return;
-
   // Single profile case. The profile name should not be shown.
   WaitAndValidateBrowserWindowProperties(base::Bind(
       &ValidateBrowserWindowProperties, browser(), base::string16()));
 
   // If multiprofile mode is not enabled, we can't test the behavior when there
   // are multiple profiles.
   if (!profiles::IsMultipleProfilesEnabled())
     return;
 
   // Two profile case. Both profile names should be shown.
@@ skipping 23 matching lines @@
   ASSERT_TRUE(profile_manager->GetProfileAttributesStorage().
               GetProfileAttributesWithPath(path_profile2, &entry));
   WaitAndValidateBrowserWindowProperties(
       base::Bind(&ValidateBrowserWindowProperties,
                  profile2_browser,
                  entry->GetName()));
 }
 
 // http://crbug.com/396344
 IN_PROC_BROWSER_TEST_F(BrowserWindowPropertyManagerTest, DISABLED_HostedApp) {
-  // This test checks HWND properties that are only available on Win7+.
-  if (base::win::GetVersion() < base::win::VERSION_WIN7)
-    return;
-
   // Load an app.
   const extensions::Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("app/"));
   EXPECT_TRUE(extension);
 
   OpenApplication(AppLaunchParams(
       browser()->profile(), extension, extensions::LAUNCH_CONTAINER_WINDOW,
       WindowOpenDisposition::NEW_FOREGROUND_TAB, extensions::SOURCE_TEST));
 
   // Check that the new browser has an app name.
   // The launch should have created a new browser.
   ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile()));
 
   // Find the new browser.
   Browser* app_browser = nullptr;
   for (auto* b : *BrowserList::GetInstance()) {
     if (b != browser())
       app_browser = b;
   }
   ASSERT_TRUE(app_browser);
   ASSERT_TRUE(app_browser != browser());
 
   WaitAndValidateBrowserWindowProperties(
       base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension));
 }