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

net/url_request/view_cache_helper_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "net/http/http_cache.h"
 #include "net/url_request/url_request_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
@@ skipping 60 matching lines @@
   }
 
   WriteHeaders(entry, 0, data0);
   WriteData(entry, 1, data1);
   WriteData(entry, 2, data2);
 
   entry->Close();
 }
 
 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;
   WriteToEntry(cache, "first", "some", empty, empty);
   WriteToEntry(cache, "second", "only hex_dumped", "same", "kind");
   WriteToEntry(cache, "third", empty, "another", "thing");
 }
 
 }  // namespace.
 
@@ skipping 71 matching lines @@
   EXPECT_NE(std::string::npos, data.find("</html>"));
   EXPECT_NE(std::string::npos, data.find("<a href=\"prefix:first\">"));
   EXPECT_NE(std::string::npos, data.find("<a href=\"prefix:second\">"));
   EXPECT_NE(std::string::npos, data.find("<a href=\"prefix:third\">"));
 }
 
 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
   int flags = 1 << 12;
   WriteHeaders(entry, flags, "something");
   entry->Close();
 
   std::string data;
   TestCompletionCallback cb1;
   rv = helper.GetEntryInfoHTML(key, context, &data, cb1.callback());
   EXPECT_EQ(OK, cb1.GetResult(rv));
 
   EXPECT_NE(std::string::npos, data.find("RESPONSE_INFO_TRUNCATED"));
 }
 
 }  // namespace net