Index: chrome/service/cloud_print/connector_settings_unittest.cc |
diff --git a/chrome/service/cloud_print/connector_settings_unittest.cc b/chrome/service/cloud_print/connector_settings_unittest.cc |
index 6aaa6c486eaf2a73ed58b55df525732255a09852..e05acb5eccb24ef0c5997fa076d30144e71ae639 100644 |
--- a/chrome/service/cloud_print/connector_settings_unittest.cc |
+++ b/chrome/service/cloud_print/connector_settings_unittest.cc |
@@ -9,6 +9,7 @@ |
#include "base/file_util.h" |
#include "base/message_loop.h" |
#include "base/message_loop_proxy.h" |
+#include "base/threading/sequenced_worker_pool.h" |
#include "base/scoped_temp_dir.h" |
#include "base/values.h" |
#include "chrome/service/service_process_prefs.h" |
@@ -41,11 +42,16 @@ const char kServiceStateContent[] = |
class ConnectorSettingsTest : public testing::Test { |
protected: |
- virtual void SetUp() { |
+ virtual void SetUp() OVERRIDE { |
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); |
+ blocking_pool_ = new base::SequencedWorkerPool(1, "TestBlocking"); |
message_loop_proxy_ = base::MessageLoopProxy::current(); |
} |
+ virtual void TearDown() OVERRIDE { |
+ blocking_pool_->Shutdown(); |
+ } |
+ |
ServiceProcessPrefs* CreateTestFile(const char* json) { |
FilePath file_name = temp_dir_.path().AppendASCII("file.txt"); |
file_util::Delete(file_name, false); |
@@ -55,7 +61,7 @@ class ConnectorSettingsTest : public testing::Test { |
file_util::WriteFile(file_name, content.c_str(), content.size()); |
} |
ServiceProcessPrefs* prefs = |
- new ServiceProcessPrefs(file_name, message_loop_proxy_.get()); |
+ new ServiceProcessPrefs(file_name, blocking_pool_); |
prefs->ReadPrefs(); |
return prefs; |
} |
@@ -63,6 +69,7 @@ class ConnectorSettingsTest : public testing::Test { |
ScopedTempDir temp_dir_; |
MessageLoop message_loop_; |
scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; |
+ scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
}; |
TEST_F(ConnectorSettingsTest, InitFromEmpty) { |