Index: chrome/common/multi_process_lock_unittest.cc |
diff --git a/chrome/common/multi_process_lock_unittest.cc b/chrome/common/multi_process_lock_unittest.cc |
index 30c4d7b0ab9ade41f7eb130fee33f1d4502c1598..ef52b79690f14c53633105996b0c7ad1b7e07d65 100644 |
--- a/chrome/common/multi_process_lock_unittest.cc |
+++ b/chrome/common/multi_process_lock_unittest.cc |
@@ -9,6 +9,7 @@ |
#include "base/rand_util.h" |
#include "base/stringprintf.h" |
#include "base/test/multiprocess_test.h" |
+#include "base/test/scoped_environment_variable.h" |
#include "base/time.h" |
#include "chrome/common/multi_process_lock.h" |
#include "testing/multiprocess_func_list.h" |
@@ -17,23 +18,6 @@ class MultiProcessLockTest : public base::MultiProcessTest { |
public: |
static const char kLockEnviromentVarName[]; |
- class ScopedEnvironmentVariable { |
- public: |
- ScopedEnvironmentVariable(const std::string &name, |
- const std::string &value) |
- : name_(name), environment_(base::Environment::Create()) { |
jar (doing other things)
2012/11/16 20:29:23
nit: you could fix this up to have one initializer
|
- environment_->SetVar(name_.c_str(), value); |
- } |
- ~ScopedEnvironmentVariable() { |
- environment_->UnSetVar(name_.c_str()); |
- } |
- |
- private: |
- std::string name_; |
- scoped_ptr<base::Environment> environment_; |
- DISALLOW_COPY_AND_ASSIGN(ScopedEnvironmentVariable); |
- }; |
- |
std::string GenerateLockName(); |
void ExpectLockIsLocked(const std::string &name); |
void ExpectLockIsUnlocked(const std::string &name); |
@@ -49,7 +33,7 @@ std::string MultiProcessLockTest::GenerateLockName() { |
} |
void MultiProcessLockTest::ExpectLockIsLocked(const std::string &name) { |
- ScopedEnvironmentVariable var(kLockEnviromentVarName, name); |
+ base::ScopedEnvironmentVariable var(kLockEnviromentVarName, name); |
base::ProcessHandle handle = SpawnChild("MultiProcessLockTryFailMain", false); |
ASSERT_TRUE(handle); |
int exit_code = 0; |
@@ -59,7 +43,7 @@ void MultiProcessLockTest::ExpectLockIsLocked(const std::string &name) { |
void MultiProcessLockTest::ExpectLockIsUnlocked( |
const std::string &name) { |
- ScopedEnvironmentVariable var(kLockEnviromentVarName, name); |
+ base::ScopedEnvironmentVariable var(kLockEnviromentVarName, name); |
base::ProcessHandle handle = SpawnChild("MultiProcessLockTrySucceedMain", |
false); |
ASSERT_TRUE(handle); |