Reverts a commit that caused ASAN failures, and 2 dependent commits.

net/url_request/view_cache_helper_unittest.cc

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 e911fccd3be5517496e3769e5b17ee195780d3dc..17bad618e92681fecdf44838e19ac10d71306b98 100644
--- a/net/url_request/view_cache_helper_unittest.cc
+++ b/net/url_request/view_cache_helper_unittest.cc
@@ -5,7 +5,6 @@
 #include "net/url_request/view_cache_helper.h"
 
 #include "base/pickle.h"
-#include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/disk_cache/disk_cache.h"
@@ -86,10 +85,10 @@ void WriteToEntry(disk_cache::Backend* cache, const std::string key,
 }
 
 void FillCache(URLRequestContext* context) {
-  TestCompletionCallback cb;
+  TestOldCompletionCallback 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);
   ASSERT_EQ(OK, cb.GetResult(rv));
 
   std::string empty;
@@ -181,16 +180,15 @@ TEST(ViewCacheHelper, TruncatedFlag) {
   scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext());
   ViewCacheHelper helper;
 
-  TestCompletionCallback cb;
+  TestOldCompletionCallback 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);
   ASSERT_EQ(OK, cb.GetResult(rv));
 
   std::string key("the key");
   disk_cache::Entry* entry;
-  TestOldCompletionCallback cb2;
-  rv = cache->CreateEntry(key, &entry, &cb2);
+  rv = cache->CreateEntry(key, &entry, &cb);
   ASSERT_EQ(OK, cb.GetResult(rv));
 
   // RESPONSE_INFO_TRUNCATED defined on response_info.cc