Index: net/disk_cache/simple/simple_index_file_unittest.cc |
diff --git a/net/disk_cache/simple/simple_index_file_unittest.cc b/net/disk_cache/simple/simple_index_file_unittest.cc |
index 4cedab2844a278aaf132d3a4fff43d24905e22e5..f848fa88df1c5c58bb682bab99558577bdec3ea2 100644 |
--- a/net/disk_cache/simple/simple_index_file_unittest.cc |
+++ b/net/disk_cache/simple/simple_index_file_unittest.cc |
@@ -50,9 +50,9 @@ TEST(IndexMetadataTest, Basics) { |
TEST(IndexMetadataTest, Serialize) { |
SimpleIndexFile::IndexMetadata index_metadata(123, 456); |
- Pickle pickle; |
+ base::Pickle pickle; |
index_metadata.Serialize(&pickle); |
- PickleIterator it(pickle); |
+ base::PickleIterator it(pickle); |
SimpleIndexFile::IndexMetadata new_index_metadata; |
new_index_metadata.Deserialize(&it); |
@@ -114,8 +114,8 @@ TEST_F(SimpleIndexFileTest, Serialize) { |
SimpleIndex::InsertInEntrySet(hash, metadata_entries[i], &entries); |
} |
- scoped_ptr<Pickle> pickle = WrappedSimpleIndexFile::Serialize( |
- index_metadata, entries); |
+ scoped_ptr<base::Pickle> pickle = |
+ WrappedSimpleIndexFile::Serialize(index_metadata, entries); |
EXPECT_TRUE(pickle.get() != NULL); |
base::Time now = base::Time::Now(); |
EXPECT_TRUE(WrappedSimpleIndexFile::SerializeFinalData(now, pickle.get())); |
@@ -274,11 +274,8 @@ TEST_F(SimpleIndexFileTest, SimpleCacheUpgrade) { |
ASSERT_TRUE(cache_thread.StartWithOptions( |
base::Thread::Options(base::MessageLoop::TYPE_IO, 0))); |
disk_cache::SimpleBackendImpl* simple_cache = |
- new disk_cache::SimpleBackendImpl(cache_path, |
- 0, |
- net::DISK_CACHE, |
- cache_thread.message_loop_proxy().get(), |
- NULL); |
+ new disk_cache::SimpleBackendImpl(cache_path, 0, net::DISK_CACHE, |
+ cache_thread.task_runner(), NULL); |
net::TestCompletionCallback cb; |
int rv = simple_cache->Init(cb.callback()); |
EXPECT_EQ(net::OK, cb.GetResult(rv)); |
@@ -291,7 +288,7 @@ TEST_F(SimpleIndexFileTest, SimpleCacheUpgrade) { |
// thread after that. |
MessageLoopHelper helper; |
CallbackTest cb_shutdown(&helper, false); |
- cache_thread.message_loop_proxy()->PostTask( |
+ cache_thread.task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&CallbackTest::Run, base::Unretained(&cb_shutdown), net::OK)); |
helper.WaitUntilCacheIoFinished(1); |