| Index: net/url_request/view_cache_helper_unittest.cc
|
| diff --git a/net/url_request/view_cache_helper_unittest.cc b/net/url_request/view_cache_helper_unittest.cc
|
| index 0fdd1938a1695d98b89d4816198f61df3747f3b4..b6358e34ad03a2bd514fedf0cb1083c6e508b1c6 100644
|
| --- a/net/url_request/view_cache_helper_unittest.cc
|
| +++ b/net/url_request/view_cache_helper_unittest.cc
|
| @@ -29,12 +29,14 @@ class TestURLRequestContext : public URLRequestContext {
|
| };
|
|
|
| TestURLRequestContext::TestURLRequestContext()
|
| - : cache_(reinterpret_cast<HttpTransactionFactory*>(NULL), NULL,
|
| + : cache_(reinterpret_cast<HttpTransactionFactory*>(NULL),
|
| + NULL,
|
| HttpCache::DefaultBackend::InMemory(0)) {
|
| set_http_transaction_factory(&cache_);
|
| }
|
|
|
| -void WriteHeaders(disk_cache::Entry* entry, int flags,
|
| +void WriteHeaders(disk_cache::Entry* entry,
|
| + int flags,
|
| const std::string& data) {
|
| if (data.empty())
|
| return;
|
| @@ -45,8 +47,8 @@ void WriteHeaders(disk_cache::Entry* entry, int flags,
|
| pickle.WriteInt64(0);
|
| pickle.WriteString(data);
|
|
|
| - scoped_refptr<WrappedIOBuffer> buf(new WrappedIOBuffer(
|
| - reinterpret_cast<const char*>(pickle.data())));
|
| + scoped_refptr<WrappedIOBuffer> buf(
|
| + new WrappedIOBuffer(reinterpret_cast<const char*>(pickle.data())));
|
| int len = static_cast<int>(pickle.size());
|
|
|
| net::TestCompletionCallback cb;
|
| @@ -67,8 +69,10 @@ void WriteData(disk_cache::Entry* entry, int index, const std::string& data) {
|
| ASSERT_EQ(len, cb.GetResult(rv));
|
| }
|
|
|
| -void WriteToEntry(disk_cache::Backend* cache, const std::string& key,
|
| - const std::string& data0, const std::string& data1,
|
| +void WriteToEntry(disk_cache::Backend* cache,
|
| + const std::string& key,
|
| + const std::string& data0,
|
| + const std::string& data1,
|
| const std::string& data2) {
|
| net::TestCompletionCallback cb;
|
| disk_cache::Entry* entry;
|
| @@ -89,9 +93,8 @@ void WriteToEntry(disk_cache::Backend* cache, const std::string& key,
|
| void FillCache(URLRequestContext* context) {
|
| net::TestCompletionCallback cb;
|
| disk_cache::Backend* cache;
|
| - int rv =
|
| - context->http_transaction_factory()->GetCache()->GetBackend(
|
| - &cache, cb.callback());
|
| + int rv = context->http_transaction_factory()->GetCache()->GetBackend(
|
| + &cache, cb.callback());
|
| ASSERT_EQ(OK, cb.GetResult(rv));
|
|
|
| std::string empty;
|
| @@ -185,9 +188,8 @@ TEST(ViewCacheHelper, TruncatedFlag) {
|
|
|
| net::TestCompletionCallback cb;
|
| disk_cache::Backend* cache;
|
| - int rv =
|
| - context.http_transaction_factory()->GetCache()->GetBackend(
|
| - &cache, cb.callback());
|
| + int rv = context.http_transaction_factory()->GetCache()->GetBackend(
|
| + &cache, cb.callback());
|
| ASSERT_EQ(OK, cb.GetResult(rv));
|
|
|
| std::string key("the key");
|
|
|