Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/prefs/json_pref_store_unittest.cc

Issue 1100773004: base: Remove most uses of MessageLoopProxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« base/posix/unix_domain_socket_linux_unittest.cc ('K') | « base/prefs/json_pref_store.h ('k') | base/prefs/pref_member.h » ('j') | base/prefs/pref_member.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/prefs/json_pref_store_unittest.cc
diff --git a/base/prefs/json_pref_store_unittest.cc b/base/prefs/json_pref_store_unittest.cc
index ff68836014f65bcb780e8aac035224e79a61d655..77dd872e543d79969063d48d48de2ba8ae338be8 100644
--- a/base/prefs/json_pref_store_unittest.cc
+++ b/base/prefs/json_pref_store_unittest.cc
@@ -7,12 +7,13 @@
#include "base/bind.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/location.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
#include "base/prefs/pref_filter.h"
#include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -97,7 +98,8 @@ class JsonPrefStoreTest : public testing::Test {
void TearDown() override {
// Make sure all pending tasks have been processed (e.g., deleting the
// JsonPrefStore may post write tasks).
- message_loop_.PostTask(FROM_HERE, MessageLoop::QuitWhenIdleClosure());
+ message_loop_.task_runner()->PostTask(FROM_HERE,
+ MessageLoop::QuitWhenIdleClosure());
message_loop_.Run();
}
@@ -113,10 +115,9 @@ class JsonPrefStoreTest : public testing::Test {
TEST_F(JsonPrefStoreTest, NonExistentFile) {
base::FilePath bogus_input_file = data_dir_.AppendASCII("read.txt");
ASSERT_FALSE(PathExists(bogus_input_file));
- scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore(
- bogus_input_file,
- message_loop_.message_loop_proxy().get(),
- scoped_ptr<PrefFilter>());
+ scoped_refptr<JsonPrefStore> pref_store =
+ new JsonPrefStore(bogus_input_file, message_loop_.task_runner().get(),
danakj 2015/04/21 20:16:30 nit: no get, it's taking a refptr same for all ot
Sami 2015/04/23 17:48:24 Done.
+ scoped_ptr<PrefFilter>());
EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NO_FILE,
pref_store->ReadPrefs());
EXPECT_FALSE(pref_store->ReadOnly());
@@ -130,10 +131,8 @@ TEST_F(JsonPrefStoreTest, NonExistentFileAndAlternateFile) {
ASSERT_FALSE(PathExists(bogus_input_file));
ASSERT_FALSE(PathExists(bogus_alternate_input_file));
scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore(
- bogus_input_file,
- bogus_alternate_input_file,
- message_loop_.message_loop_proxy().get(),
- scoped_ptr<PrefFilter>());
+ bogus_input_file, bogus_alternate_input_file,
+ message_loop_.task_runner().get(), scoped_ptr<PrefFilter>());
EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NO_FILE,
pref_store->ReadPrefs());
EXPECT_FALSE(pref_store->ReadOnly());
@@ -145,8 +144,7 @@ TEST_F(JsonPrefStoreTest, InvalidFile) {
base::FilePath invalid_file = temp_dir_.path().AppendASCII("invalid.json");
ASSERT_TRUE(base::CopyFile(invalid_file_original, invalid_file));
scoped_refptr<JsonPrefStore> pref_store =
- new JsonPrefStore(invalid_file,
- message_loop_.message_loop_proxy().get(),
+ new JsonPrefStore(invalid_file, message_loop_.task_runner().get(),
scoped_ptr<PrefFilter>());
EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_JSON_PARSE,
pref_store->ReadPrefs());
@@ -233,9 +231,7 @@ TEST_F(JsonPrefStoreTest, Basic) {
base::FilePath input_file = temp_dir_.path().AppendASCII("write.json");
ASSERT_TRUE(PathExists(input_file));
scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore(
- input_file,
- message_loop_.message_loop_proxy().get(),
- scoped_ptr<PrefFilter>());
+ input_file, message_loop_.task_runner().get(), scoped_ptr<PrefFilter>());
ASSERT_EQ(PersistentPrefStore::PREF_READ_ERROR_NONE, pref_store->ReadPrefs());
EXPECT_FALSE(pref_store->ReadOnly());
EXPECT_TRUE(pref_store->IsInitializationComplete());
@@ -262,9 +258,7 @@ TEST_F(JsonPrefStoreTest, BasicAsync) {
base::FilePath input_file = temp_dir_.path().AppendASCII("write.json");
ASSERT_TRUE(PathExists(input_file));
scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore(
- input_file,
- message_loop_.message_loop_proxy().get(),
- scoped_ptr<PrefFilter>());
+ input_file, message_loop_.task_runner().get(), scoped_ptr<PrefFilter>());
{
MockPrefStoreObserver mock_observer;
@@ -301,9 +295,7 @@ TEST_F(JsonPrefStoreTest, PreserveEmptyValues) {
FilePath pref_file = temp_dir_.path().AppendASCII("empty_values.json");
scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore(
- pref_file,
- message_loop_.message_loop_proxy(),
- scoped_ptr<PrefFilter>());
+ pref_file, message_loop_.task_runner(), scoped_ptr<PrefFilter>());
// Set some keys with empty values.
pref_store->SetValue("list", new base::ListValue);
@@ -314,10 +306,8 @@ TEST_F(JsonPrefStoreTest, PreserveEmptyValues) {
MessageLoop::current()->RunUntilIdle();
// Reload.
- pref_store = new JsonPrefStore(
- pref_file,
- message_loop_.message_loop_proxy(),
- scoped_ptr<PrefFilter>());
+ pref_store = new JsonPrefStore(pref_file, message_loop_.task_runner(),
+ scoped_ptr<PrefFilter>());
ASSERT_EQ(PersistentPrefStore::PREF_READ_ERROR_NONE, pref_store->ReadPrefs());
ASSERT_FALSE(pref_store->ReadOnly());
@@ -335,9 +325,7 @@ TEST_F(JsonPrefStoreTest, RemoveClearsEmptyParent) {
FilePath pref_file = temp_dir_.path().AppendASCII("empty_values.json");
scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore(
- pref_file,
- message_loop_.message_loop_proxy(),
- scoped_ptr<PrefFilter>());
+ pref_file, message_loop_.task_runner(), scoped_ptr<PrefFilter>());
base::DictionaryValue* dict = new base::DictionaryValue;
dict->SetString("key", "value");
@@ -354,10 +342,9 @@ TEST_F(JsonPrefStoreTest, RemoveClearsEmptyParent) {
TEST_F(JsonPrefStoreTest, AsyncNonExistingFile) {
base::FilePath bogus_input_file = data_dir_.AppendASCII("read.txt");
ASSERT_FALSE(PathExists(bogus_input_file));
- scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore(
- bogus_input_file,
- message_loop_.message_loop_proxy().get(),
- scoped_ptr<PrefFilter>());
+ scoped_refptr<JsonPrefStore> pref_store =
+ new JsonPrefStore(bogus_input_file, message_loop_.task_runner().get(),
+ scoped_ptr<PrefFilter>());
MockPrefStoreObserver mock_observer;
pref_store->AddObserver(&mock_observer);
@@ -386,8 +373,7 @@ TEST_F(JsonPrefStoreTest, ReadWithInterceptor) {
InterceptingPrefFilter* raw_intercepting_pref_filter_ =
intercepting_pref_filter.get();
scoped_refptr<JsonPrefStore> pref_store =
- new JsonPrefStore(input_file,
- message_loop_.message_loop_proxy().get(),
+ new JsonPrefStore(input_file, message_loop_.task_runner().get(),
intercepting_pref_filter.Pass());
ASSERT_EQ(PersistentPrefStore::PREF_READ_ERROR_ASYNCHRONOUS_TASK_INCOMPLETE,
@@ -433,8 +419,7 @@ TEST_F(JsonPrefStoreTest, ReadAsyncWithInterceptor) {
InterceptingPrefFilter* raw_intercepting_pref_filter_ =
intercepting_pref_filter.get();
scoped_refptr<JsonPrefStore> pref_store =
- new JsonPrefStore(input_file,
- message_loop_.message_loop_proxy().get(),
+ new JsonPrefStore(input_file, message_loop_.task_runner().get(),
intercepting_pref_filter.Pass());
MockPrefStoreObserver mock_observer;
@@ -499,9 +484,7 @@ TEST_F(JsonPrefStoreTest, AlternateFile) {
ASSERT_FALSE(PathExists(input_file));
ASSERT_TRUE(PathExists(alternate_input_file));
scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore(
- input_file,
- alternate_input_file,
- message_loop_.message_loop_proxy().get(),
+ input_file, alternate_input_file, message_loop_.task_runner().get(),
scoped_ptr<PrefFilter>());
ASSERT_FALSE(PathExists(input_file));
@@ -545,9 +528,7 @@ TEST_F(JsonPrefStoreTest, AlternateFileIgnoredWhenMainFileExists) {
ASSERT_TRUE(PathExists(input_file));
ASSERT_TRUE(PathExists(alternate_input_file));
scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore(
- input_file,
- alternate_input_file,
- message_loop_.message_loop_proxy().get(),
+ input_file, alternate_input_file, message_loop_.task_runner().get(),
scoped_ptr<PrefFilter>());
ASSERT_TRUE(PathExists(input_file));
@@ -587,9 +568,7 @@ TEST_F(JsonPrefStoreTest, AlternateFileDNE) {
ASSERT_TRUE(PathExists(input_file));
ASSERT_FALSE(PathExists(alternate_input_file));
scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore(
- input_file,
- alternate_input_file,
- message_loop_.message_loop_proxy().get(),
+ input_file, alternate_input_file, message_loop_.task_runner().get(),
scoped_ptr<PrefFilter>());
ASSERT_TRUE(PathExists(input_file));
@@ -629,9 +608,7 @@ TEST_F(JsonPrefStoreTest, BasicAsyncWithAlternateFile) {
ASSERT_FALSE(PathExists(input_file));
ASSERT_TRUE(PathExists(alternate_input_file));
scoped_refptr<JsonPrefStore> pref_store = new JsonPrefStore(
- input_file,
- alternate_input_file,
- message_loop_.message_loop_proxy().get(),
+ input_file, alternate_input_file, message_loop_.task_runner().get(),
scoped_ptr<PrefFilter>());
ASSERT_FALSE(PathExists(input_file));
« base/posix/unix_domain_socket_linux_unittest.cc ('K') | « base/prefs/json_pref_store.h ('k') | base/prefs/pref_member.h » ('j') | base/prefs/pref_member.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698