Revert 251095 "Revert 250828 "Add a UMA stat to track if the Bro..."

trunk/src/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 "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/case_conversion.h"
 #include "base/path_service.h"
 #include "base/scoped_native_library.h"
@@ skipping 14 matching lines @@
 const wchar_t kDll2Beacon[] = L"{F70A0100-2889-4629-9B44-610FE5C73231}";
 const wchar_t kDll3Beacon[] = L"{9E056AEC-169E-400c-B2D0-5A07E3ACE2EB}";
 
 extern const wchar_t* kEnvVars[];
 
 extern "C" {
 // When modifying the blacklist in the test process, use the exported test dll
 // functions on the test blacklist dll, not the ones linked into the test
 // executable itself.
 __declspec(dllimport) bool TestDll_AddDllToBlacklist(const wchar_t* dll_name);
+__declspec(dllimport) bool TestDLL_IsBlacklistInitialized();
 __declspec(dllimport) bool TestDll_RemoveDllFromBlacklist(
     const wchar_t* dll_name);
 }
 
 class BlacklistTest : public testing::Test {
   virtual void SetUp() {
     // Force an import from blacklist_test_main_dll.
     InitBlacklistTestDll();
   }
 
@@ skipping 68 matching lines @@
   }
   EXPECT_FALSE(blacklist::RemoveDllFromBlacklist(added_dlls[0].c_str()));
   EXPECT_FALSE(blacklist::RemoveDllFromBlacklist(
     added_dlls[empty_spaces - 1].c_str()));
 }
 
 TEST_F(BlacklistTest, LoadBlacklistedLibrary) {
   base::FilePath current_dir;
   ASSERT_TRUE(PathService::Get(base::DIR_EXE, &current_dir));
 
+  // Ensure that the blacklist is loaded.
+  ASSERT_TRUE(TestDLL_IsBlacklistInitialized());
+
   // Test that an un-blacklisted DLL can load correctly.
   base::ScopedNativeLibrary dll1(current_dir.Append(kTestDllName1));
   EXPECT_TRUE(dll1.is_valid());
   dll1.Reset(NULL);
 
   struct TestData {
     const wchar_t* dll_name;
     const wchar_t* dll_beacon;
   } test_data[] = {
     { kTestDllName2, kDll2Beacon },
@@ skipping 26 matching lines @@
     EXPECT_TRUE(TestDll_AddDllToBlacklist(uppercase_name.c_str()));
     base::ScopedNativeLibrary dll_blacklisted_different_case(
         current_dir.Append(test_data[i].dll_name));
     EXPECT_FALSE(dll_blacklisted_different_case.is_valid());
     EXPECT_EQ(0u, ::GetEnvironmentVariable(test_data[i].dll_beacon, NULL, 0));
     dll_blacklisted_different_case.Reset(NULL);
 
     EXPECT_TRUE(TestDll_RemoveDllFromBlacklist(uppercase_name.c_str()));
   }
 }