Chromium Code Reviews| Index: chrome/service/service_process_prefs_unittest.cc |
| diff --git a/chrome/service/service_process_prefs_unittest.cc b/chrome/service/service_process_prefs_unittest.cc |
| index 0268395890dffb3531630b8cadb3dcc236f3a0a9..a2def88b58425e564c7d4e3e42cb93a48d2b13b3 100644 |
| --- a/chrome/service/service_process_prefs_unittest.cc |
| +++ b/chrome/service/service_process_prefs_unittest.cc |
| @@ -7,27 +7,29 @@ |
| #include "base/message_loop.h" |
| #include "base/message_loop_proxy.h" |
| #include "base/scoped_temp_dir.h" |
| +#include "base/threading/sequenced_worker_pool.h" |
|
akalin
2012/10/19 23:12:21
remove this include
zel
2012/10/21 20:03:19
Done.
|
| #include "chrome/service/service_process_prefs.h" |
| #include "testing/gmock/include/gmock/gmock.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| class ServiceProcessPrefsTest : public testing::Test { |
| protected: |
| - virtual void SetUp() { |
| - message_loop_proxy_ = base::MessageLoopProxy::current(); |
| - |
| + virtual void SetUp() OVERRIDE { |
| ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); |
| prefs_.reset(new ServiceProcessPrefs( |
| temp_dir_.path().AppendASCII("service_process_prefs.txt"), |
| - message_loop_proxy_.get())); |
| + message_loop_.message_loop_proxy())); |
| + } |
| + |
| + virtual void TearDown() OVERRIDE { |
| + prefs_.reset(NULL); |
|
akalin
2012/10/19 23:12:21
you can just go ".reset();" (and I think that's th
zel
2012/10/21 20:03:19
Done.
|
| } |
| // The path to temporary directory used to contain the test operations. |
| ScopedTempDir temp_dir_; |
| - // A message loop that we can use as the file thread message loop. |
| + // A message loop that we need for timers. |
| MessageLoop message_loop_; |
| - scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; |
| scoped_ptr<ServiceProcessPrefs> prefs_; |
| }; |
| @@ -36,7 +38,7 @@ TEST_F(ServiceProcessPrefsTest, RetrievePrefs) { |
| prefs_->SetBoolean("testb", true); |
| prefs_->SetString("tests", "testvalue"); |
| prefs_->WritePrefs(); |
| - MessageLoop::current()->RunAllPending(); |
| + message_loop_.RunAllPending(); |
| prefs_->SetBoolean("testb", false); // overwrite |
| prefs_->SetString("tests", ""); // overwrite |
| prefs_->ReadPrefs(); |