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

Side by Side Diff: rlz/test/rlz_test_helpers.h

Issue 633353002: Replace OVERRIDE with its C++11 counterparts in src/rlz (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 | « rlz/mac/lib/rlz_value_store_mac.h ('k') | rlz/win/lib/rlz_value_store_registry.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // Helper functions used by the tests. 5 // Helper functions used by the tests.
6 6
7 #ifndef RLZ_TEST_RLZ_TEST_HELPERS_H 7 #ifndef RLZ_TEST_RLZ_TEST_HELPERS_H
8 #define RLZ_TEST_RLZ_TEST_HELPERS_H 8 #define RLZ_TEST_RLZ_TEST_HELPERS_H
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 #if defined(OS_POSIX) 13 #if defined(OS_POSIX)
14 #include "base/files/scoped_temp_dir.h" 14 #include "base/files/scoped_temp_dir.h"
15 #endif 15 #endif
16 16
17 #if defined(OS_WIN) 17 #if defined(OS_WIN)
18 #include "base/test/test_reg_util_win.h" 18 #include "base/test/test_reg_util_win.h"
19 #endif 19 #endif
20 20
21 class RlzLibTestNoMachineState : public ::testing::Test { 21 class RlzLibTestNoMachineState : public ::testing::Test {
22 protected: 22 protected:
23 virtual void SetUp() OVERRIDE; 23 virtual void SetUp() override;
24 virtual void TearDown() OVERRIDE; 24 virtual void TearDown() override;
25 25
26 #if defined(OS_POSIX) 26 #if defined(OS_POSIX)
27 base::ScopedTempDir temp_dir_; 27 base::ScopedTempDir temp_dir_;
28 #endif 28 #endif
29 29
30 #if defined(OS_WIN) 30 #if defined(OS_WIN)
31 registry_util::RegistryOverrideManager override_manager_; 31 registry_util::RegistryOverrideManager override_manager_;
32 #endif 32 #endif
33 }; 33 };
34 34
35 class RlzLibTestBase : public RlzLibTestNoMachineState { 35 class RlzLibTestBase : public RlzLibTestNoMachineState {
36 protected: 36 protected:
37 virtual void SetUp() OVERRIDE; 37 virtual void SetUp() override;
38 }; 38 };
39 39
40 #endif // RLZ_TEST_RLZ_TEST_HELPERS_H 40 #endif // RLZ_TEST_RLZ_TEST_HELPERS_H
OLDNEW
« no previous file with comments | « rlz/mac/lib/rlz_value_store_mac.h ('k') | rlz/win/lib/rlz_value_store_registry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698