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..b1ad7f62c06f6452fc7fc88ff6c435f7fee6ad5b 100644 |
--- a/chrome/service/service_process_prefs_unittest.cc |
+++ b/chrome/service/service_process_prefs_unittest.cc |
@@ -5,29 +5,30 @@ |
#include <string> |
#include "base/message_loop.h" |
-#include "base/message_loop_proxy.h" |
#include "base/scoped_temp_dir.h" |
+#include "base/sequenced_task_runner.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 { |
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(); |
} |
// 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. |
MessageLoop message_loop_; |
- scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; |
scoped_ptr<ServiceProcessPrefs> prefs_; |
}; |
@@ -36,7 +37,7 @@ TEST_F(ServiceProcessPrefsTest, RetrievePrefs) { |
prefs_->SetBoolean("testb", true); |
prefs_->SetString("tests", "testvalue"); |
prefs_->WritePrefs(); |
- MessageLoop::current()->RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
prefs_->SetBoolean("testb", false); // overwrite |
prefs_->SetString("tests", ""); // overwrite |
prefs_->ReadPrefs(); |