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..7f47a40164b199ae146bf6b391b0ce2cabc9c31b 100644 |
--- a/chrome/service/service_process_prefs_unittest.cc |
+++ b/chrome/service/service_process_prefs_unittest.cc |
@@ -7,27 +7,34 @@ |
#include "base/message_loop.h" |
#include "base/message_loop_proxy.h" |
#include "base/scoped_temp_dir.h" |
+#include "base/threading/sequenced_worker_pool.h" |
#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 { |
+ blocking_pool_ = new base::SequencedWorkerPool(1, "TestBlocking"); |
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); |
prefs_.reset(new ServiceProcessPrefs( |
temp_dir_.path().AppendASCII("service_process_prefs.txt"), |
- message_loop_proxy_.get())); |
+ blocking_pool_.get())); |
+ } |
+ |
+ virtual void TearDown() OVERRIDE { |
+ prefs_.reset(NULL); |
+ blocking_pool_->Shutdown(); |
} |
// 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_; |
+ // A blocking pool that we can use for file operations. |
+ scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
scoped_ptr<ServiceProcessPrefs> prefs_; |
}; |
@@ -36,7 +43,7 @@ TEST_F(ServiceProcessPrefsTest, RetrievePrefs) { |
prefs_->SetBoolean("testb", true); |
prefs_->SetString("tests", "testvalue"); |
prefs_->WritePrefs(); |
- MessageLoop::current()->RunAllPending(); |
+ blocking_pool_->FlushForTesting(); |
prefs_->SetBoolean("testb", false); // overwrite |
prefs_->SetString("tests", ""); // overwrite |
prefs_->ReadPrefs(); |