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

Side by Side Diff: chrome_elf/chrome_elf_util_unittest.cc

Issue 644783004: Replace OVERRIDE with its C++11 counterparts in src/chrome_elf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « no previous file | chrome_elf/create_file/chrome_create_file_unittest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome_elf/chrome_elf_util.h" 5 #include "chrome_elf/chrome_elf_util.h"
6 6
7 #include <tuple> 7 #include <tuple>
8 8
9 #include "base/test/test_reg_util_win.h" 9 #include "base/test/test_reg_util_win.h"
10 #include "base/win/registry.h" 10 #include "base/win/registry.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 // Parameterized test with paramters: 51 // Parameterized test with paramters:
52 // 1: product: "canary" or "google" 52 // 1: product: "canary" or "google"
53 // 2: install level: "user" or "system" 53 // 2: install level: "user" or "system"
54 // 3: install mode: "single" or "multi" 54 // 3: install mode: "single" or "multi"
55 class ChromeElfUtilTest : 55 class ChromeElfUtilTest :
56 public testing::TestWithParam<std::tuple<const char*, 56 public testing::TestWithParam<std::tuple<const char*,
57 const char*, 57 const char*,
58 const char*> > { 58 const char*> > {
59 protected: 59 protected:
60 virtual void SetUp() OVERRIDE { 60 virtual void SetUp() override {
grt (UTC plus 2) 2014/10/16 01:52:21 the style guide states: "use exactly one of overri
61 override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE); 61 override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE);
62 override_manager_.OverrideRegistry(HKEY_CURRENT_USER); 62 override_manager_.OverrideRegistry(HKEY_CURRENT_USER);
63 const char* app; 63 const char* app;
64 const char* level; 64 const char* level;
65 const char* mode; 65 const char* mode;
66 std::tie(app, level, mode) = GetParam(); 66 std::tie(app, level, mode) = GetParam();
67 is_canary_ = (std::string(app) == "canary"); 67 is_canary_ = (std::string(app) == "canary");
68 system_level_ = (std::string(level) != "user"); 68 system_level_ = (std::string(level) != "user");
69 multi_install_ = (std::string(mode) != "single"); 69 multi_install_ = (std::string(mode) != "single");
70 if (is_canary_) { 70 if (is_canary_) {
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 INSTANTIATE_TEST_CASE_P(Canary, ChromeElfUtilTest, 175 INSTANTIATE_TEST_CASE_P(Canary, ChromeElfUtilTest,
176 testing::Combine(testing::Values("canary"), 176 testing::Combine(testing::Values("canary"),
177 testing::Values("user"), 177 testing::Values("user"),
178 testing::Values("single"))); 178 testing::Values("single")));
179 INSTANTIATE_TEST_CASE_P(GoogleChrome, ChromeElfUtilTest, 179 INSTANTIATE_TEST_CASE_P(GoogleChrome, ChromeElfUtilTest,
180 testing::Combine(testing::Values("google"), 180 testing::Combine(testing::Values("google"),
181 testing::Values("user", "system"), 181 testing::Values("user", "system"),
182 testing::Values("single", "multi"))); 182 testing::Values("single", "multi")));
183 183
184 } // namespace 184 } // namespace
OLDNEW
« no previous file with comments | « no previous file | chrome_elf/create_file/chrome_create_file_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698