Removing useless Win7 checks + standardize its use

rlz/test/rlz_test_helpers.cc

 // Copyright (c) 2012 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.
 //
 // Main entry point for all unit tests.
 
 #include "rlz_test_helpers.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "rlz/lib/rlz_lib.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include <shlwapi.h>
 #include "base/win/registry.h"
-#include "base/win/windows_version.h"
 #elif defined(OS_POSIX)
 #include "base/files/file_path.h"
 #include "rlz/lib/rlz_value_store.h"
 #endif
 
 #if defined(OS_WIN)
 
 namespace {
 
 // Path to recursively copy into the replacemment hives.  These are needed
@@ skipping 59 matching lines @@
 // Initialize temporary HKLM/HKCU registry hives used for testing.
 // Testing RLZ requires reading and writing to the Windows registry.  To keep
 // the tests isolated from the machine's state, as well as to prevent the tests
 // from causing side effects in the registry, HKCU and HKLM are overridden for
 // the duration of the tests. RLZ tests don't expect the HKCU and KHLM hives to
 // be empty though, and this function initializes the minimum value needed so
 // that the test will run successfully.
 void InitializeRegistryOverridesForTesting(
     registry_util::RegistryOverrideManager* override_manager) {
   // For the moment, the HKCU hive requires no initialization.
-  const bool do_copy = (base::win::GetVersion() >= base::win::VERSION_WIN7);
   RegistryKeyData data;
 
-  if (do_copy) {
-    // Copy the following HKLM subtrees to the temporary location so that the
-    // win32 APIs used by the tests continue to work:
-    //
-    //    HKLM\System\CurrentControlSet\Control\Lsa\AccessProviders
-    //
-    // This seems to be required since Win7.
-    ReadRegistryTree(base::win::RegKey(HKEY_LOCAL_MACHINE,
-                                       kHKLMAccessProviders,
-                                       KEY_READ), &data);
-  }
+  // Copy the following HKLM subtrees to the temporary location so that the
+  // win32 APIs used by the tests continue to work:
+  //
+  //    HKLM\System\CurrentControlSet\Control\Lsa\AccessProviders
+  //
+  // This seems to be required since Win7.
+  ReadRegistryTree(base::win::RegKey(HKEY_LOCAL_MACHINE,
+                                     kHKLMAccessProviders,
+                                     KEY_READ), &data);
 
   ASSERT_NO_FATAL_FAILURE(
       override_manager->OverrideRegistry(HKEY_LOCAL_MACHINE));
   ASSERT_NO_FATAL_FAILURE(
       override_manager->OverrideRegistry(HKEY_CURRENT_USER));
 
-  if (do_copy) {
-    base::win::RegKey key(
-        HKEY_LOCAL_MACHINE, kHKLMAccessProviders, KEY_ALL_ACCESS);
-    WriteRegistryTree(data, &key);
-  }
+  base::win::RegKey key(
+      HKEY_LOCAL_MACHINE, kHKLMAccessProviders, KEY_ALL_ACCESS);
+  WriteRegistryTree(data, &key);
 }
 
 }  // namespace
 
 #endif  // defined(OS_WIN)
 
 void RlzLibTestNoMachineStateHelper::SetUp() {
 #if defined(OS_WIN)
   ASSERT_NO_FATAL_FAILURE(
       InitializeRegistryOverridesForTesting(&override_manager_));
@@ skipping 19 matching lines @@
 void RlzLibTestNoMachineState::TearDown() {
   m_rlz_test_helper_.TearDown();
 }
 
 void RlzLibTestBase::SetUp() {
   RlzLibTestNoMachineState::SetUp();
 #if defined(OS_WIN)
   rlz_lib::CreateMachineState();
 #endif  // defined(OS_WIN)
 }