[chrome_elf] NTRegistry - added wow64 redirection support.

chrome_elf/blacklist/test/blacklist_test.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 <stddef.h>
 
 #include <memory>
 
 #include "base/environment.h"
 #include "base/files/file.h"
@@ skipping 115 matching lines @@
   registry_util::RegistryOverrideManager override_manager_;
 
   // The number of dlls initially blocked by the blacklist.
   int num_initially_blocked_;
 
  private:
   // This function puts registry-key redirection paths into
   // process-specific environment variables, for our test DLLs to access.
   // This will only work as long as the IPC is within the same process.
   void IpcOverrides() {
-    if (::wcslen(nt::HKCU_override) != 0) {
-      ASSERT_TRUE(
-          ::SetEnvironmentVariableW(L"hkcu_override", nt::HKCU_override));
-    }
-    if (::wcslen(nt::HKLM_override) != 0) {
-      ASSERT_TRUE(
-          ::SetEnvironmentVariableW(L"hklm_override", nt::HKLM_override));
-    }
+    base::string16 temp;

[grt (UTC plus 2), 2016/10/02 20:10:54]

nit:
    base::string16 temp = nt::GetTestingOverride(nt::HKCU);

[penny, 2016/10/03 19:18:48]

Done.

+    temp = nt::GetTestingOverride(nt::HKCU);
+    if (temp.length() != 0)

[grt (UTC plus 2), 2016/10/02 20:10:54]

nit:
    if (!temp.empty())
below, too

[penny, 2016/10/03 19:18:48]

Done.

+      ASSERT_TRUE(::SetEnvironmentVariableW(L"hkcu_override", temp.c_str()));
+    temp = nt::GetTestingOverride(nt::HKLM);
+    if (temp.length() != 0)
+      ASSERT_TRUE(::SetEnvironmentVariableW(L"hklm_override", temp.c_str()));
   }
 
   void SetUp() override {
     base::string16 temp;
     override_manager_.OverrideRegistry(HKEY_CURRENT_USER, &temp);
-    ::wcsncpy(nt::HKCU_override, temp.c_str(), nt::g_kRegMaxPathLen - 1);
+    ASSERT_TRUE(nt::SetTestingOverride(nt::HKCU, temp));
 
     // Make the override path available to our test DLL.
     IpcOverrides();
 
     // Load the main test Dll now.
     // Note: this has to happen after we set up the registry overrides.
     HMODULE dll = nullptr;
     dll = ::LoadLibraryW(L"blacklist_test_main_dll.dll");
     if (!dll)
       return;
@@ skipping 36 matching lines @@
                               KEY_QUERY_VALUE | KEY_SET_VALUE));
 
     // Find out how many dlls were blocked before the test starts.
     TestDll_SuccessfullyBlocked(NULL, &num_initially_blocked_);
   }
 
   void TearDown() override {
     TestDll_RemoveDllFromBlacklist(kTestDllName1);
     TestDll_RemoveDllFromBlacklist(kTestDllName2);
     TestDll_RemoveDllFromBlacklist(kTestDllName3);
+
+    base::string16 temp;
+    ASSERT_TRUE(nt::SetTestingOverride(nt::HKCU, temp));

[grt (UTC plus 2), 2016/10/02 20:10:54]

nit:
    ASSERT_TRUE(nt::SetTestingOverride(nt::HKCU, base::string16()));

[penny, 2016/10/03 19:18:48]

Done.

   }
-
-  // A scoped temporary directory to be destroyed with this test.
-  base::ScopedTempDir reg_override_dir_;
 };
 
 TEST_F(BlacklistTest, Beacon) {
   // Ensure that the beacon state starts off 'running' for this version.
   LONG result = blacklist_registry_key_->WriteValue(
       blacklist::kBeaconState, blacklist::BLACKLIST_SETUP_RUNNING);
   EXPECT_EQ(ERROR_SUCCESS, result);
 
   result = blacklist_registry_key_->WriteValue(blacklist::kBeaconVersion,
                                                TEXT(CHROME_VERSION_STRING));
@@ skipping 162 matching lines @@
                                        &blacklist_state);
   EXPECT_EQ(blacklist_state, blacklist::BLACKLIST_SETUP_RUNNING);
 
   DWORD attempt_count = blacklist::kBeaconMaxAttempts;
   blacklist_registry_key_->ReadValueDW(blacklist::kBeaconAttemptCount,
                                        &attempt_count);
   EXPECT_EQ(static_cast<DWORD>(0), attempt_count);
 }
 
 }  // namespace