| Index: rlz/test/rlz_test_helpers.cc
|
| diff --git a/rlz/test/rlz_test_helpers.cc b/rlz/test/rlz_test_helpers.cc
|
| index 53c9732fee1801c32f376bf77985601b76f99690..b056a81ab8dd8b61c4d49a9d464009d6ab1dbc9a 100644
|
| --- a/rlz/test/rlz_test_helpers.cc
|
| +++ b/rlz/test/rlz_test_helpers.cc
|
| @@ -125,7 +125,7 @@ void InitializeRegistryOverridesForTesting(
|
|
|
| #endif // defined(OS_WIN)
|
|
|
| -void RlzLibTestNoMachineState::SetUp() {
|
| +void RlzLibTestNoMachineStateHelper::SetUp() {
|
| #if defined(OS_WIN)
|
| InitializeRegistryOverridesForTesting(&override_manager_);
|
| #elif defined(OS_MACOSX)
|
| @@ -137,12 +137,20 @@ void RlzLibTestNoMachineState::SetUp() {
|
| #endif // defined(OS_POSIX)
|
| }
|
|
|
| -void RlzLibTestNoMachineState::TearDown() {
|
| +void RlzLibTestNoMachineStateHelper::TearDown() {
|
| #if defined(OS_POSIX)
|
| rlz_lib::testing::SetRlzStoreDirectory(base::FilePath());
|
| #endif // defined(OS_POSIX)
|
| }
|
|
|
| +void RlzLibTestNoMachineState::SetUp() {
|
| + m_rlz_test_helper_.SetUp();
|
| +}
|
| +
|
| +void RlzLibTestNoMachineState::TearDown() {
|
| + m_rlz_test_helper_.TearDown();
|
| +}
|
| +
|
| void RlzLibTestBase::SetUp() {
|
| RlzLibTestNoMachineState::SetUp();
|
| #if defined(OS_WIN)
|
|
|