Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Side by Side Diff: chrome_elf/blacklist/test/blacklist_test.cc

Issue 1405633002: Cleanup chrome/version.h handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Building Chrome is hard Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome_elf/DEPS ('k') | chrome_elf/breakpad.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/environment.h" 5 #include "base/environment.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/i18n/case_conversion.h" 8 #include "base/i18n/case_conversion.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/scoped_native_library.h" 10 #include "base/scoped_native_library.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "base/test/test_reg_util_win.h" 14 #include "base/test/test_reg_util_win.h"
15 #include "base/win/registry.h" 15 #include "base/win/registry.h"
16 #include "chrome/common/chrome_version.h"
16 #include "chrome_elf/blacklist/blacklist.h" 17 #include "chrome_elf/blacklist/blacklist.h"
17 #include "chrome_elf/blacklist/test/blacklist_test_main_dll.h" 18 #include "chrome_elf/blacklist/test/blacklist_test_main_dll.h"
18 #include "chrome_elf/chrome_elf_constants.h" 19 #include "chrome_elf/chrome_elf_constants.h"
19 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
20 #include "version.h" // NOLINT
21 21
22 const wchar_t kTestDllName1[] = L"blacklist_test_dll_1.dll"; 22 const wchar_t kTestDllName1[] = L"blacklist_test_dll_1.dll";
23 const wchar_t kTestDllName2[] = L"blacklist_test_dll_2.dll"; 23 const wchar_t kTestDllName2[] = L"blacklist_test_dll_2.dll";
24 const wchar_t kTestDllName3[] = L"blacklist_test_dll_3.dll"; 24 const wchar_t kTestDllName3[] = L"blacklist_test_dll_3.dll";
25 25
26 const wchar_t kDll2Beacon[] = L"{F70A0100-2889-4629-9B44-610FE5C73231}"; 26 const wchar_t kDll2Beacon[] = L"{F70A0100-2889-4629-9B44-610FE5C73231}";
27 const wchar_t kDll3Beacon[] = L"{9E056AEC-169E-400c-B2D0-5A07E3ACE2EB}"; 27 const wchar_t kDll3Beacon[] = L"{9E056AEC-169E-400c-B2D0-5A07E3ACE2EB}";
28 28
29 extern const wchar_t* kEnvVars[]; 29 extern const wchar_t* kEnvVars[];
30 30
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 &blacklist_state); 336 &blacklist_state);
337 EXPECT_EQ(blacklist_state, blacklist::BLACKLIST_SETUP_RUNNING); 337 EXPECT_EQ(blacklist_state, blacklist::BLACKLIST_SETUP_RUNNING);
338 338
339 DWORD attempt_count = blacklist::kBeaconMaxAttempts; 339 DWORD attempt_count = blacklist::kBeaconMaxAttempts;
340 blacklist_registry_key_->ReadValueDW(blacklist::kBeaconAttemptCount, 340 blacklist_registry_key_->ReadValueDW(blacklist::kBeaconAttemptCount,
341 &attempt_count); 341 &attempt_count);
342 EXPECT_EQ(static_cast<DWORD>(0), attempt_count); 342 EXPECT_EQ(static_cast<DWORD>(0), attempt_count);
343 } 343 }
344 344
345 } // namespace 345 } // namespace
OLDNEW
« no previous file with comments | « chrome_elf/DEPS ('k') | chrome_elf/breakpad.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698