summaryrefslogtreecommitdiffstats
path: root/chrome/service/cloud_print
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-08 04:40:59 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-08 04:40:59 +0000
commit0de615a09db2bc15d4395063ec9683c1499c59a1 (patch)
treecadb1ae00204ebd53756a6dbb19d17832cb9fa84 /chrome/service/cloud_print
parent667be6ec365f627ba2a5628cfc8de0054a111b2f (diff)
downloadchromium_src-0de615a09db2bc15d4395063ec9683c1499c59a1.zip
chromium_src-0de615a09db2bc15d4395063ec9683c1499c59a1.tar.gz
chromium_src-0de615a09db2bc15d4395063ec9683c1499c59a1.tar.bz2
Moved JsonPrefStore to use SequencedWorkerPool instead of FILE thread. The pool also ensures that the same file requests are written in order received and that they block on shutdown.
BUG=153367 TEST=existing unit/browser tests Review URL: https://codereview.chromium.org/11027070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service/cloud_print')
-rw-r--r--chrome/service/cloud_print/connector_settings_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/service/cloud_print/connector_settings_unittest.cc b/chrome/service/cloud_print/connector_settings_unittest.cc
index 09ceeef..b86c315 100644
--- a/chrome/service/cloud_print/connector_settings_unittest.cc
+++ b/chrome/service/cloud_print/connector_settings_unittest.cc
@@ -44,7 +44,7 @@ const char kServiceStateContent[] =
class ConnectorSettingsTest : public testing::Test {
protected:
- virtual void SetUp() {
+ virtual void SetUp() OVERRIDE {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
message_loop_proxy_ = base::MessageLoopProxy::current();
}
@@ -58,7 +58,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, message_loop_proxy_);
prefs->ReadPrefs();
return prefs;
}