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

chrome/browser/safe_browsing/malware_details_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 <algorithm>
 
 #include "base/bind.h"
 #include "base/pickle.h"
 #include "base/time.h"
 #include "chrome/browser/history/history.h"
@@ skipping 88 matching lines @@
     rv = cache->OpenEntry(key, &entry, &cb);
     ASSERT_EQ(net::OK, cb.GetResult(rv));
   }
 
   WriteHeaders(entry, headers);
   WriteData(entry, data);
   entry->Close();
 }
 
 void FillCache(net::URLRequestContextGetter* context_getter) {
-  net::TestCompletionCallback cb;
+  TestOldCompletionCallback cb;
   disk_cache::Backend* cache;
   int rv =
       context_getter->GetURLRequestContext()->http_transaction_factory()->
-      GetCache()->GetBackend(&cache, cb.callback());
+      GetCache()->GetBackend(&cache, &cb);
   ASSERT_EQ(net::OK, cb.GetResult(rv));
 
   std::string empty;
   WriteToEntry(cache, kMalwareURL, kMalwareHeaders, kMalwareData);
   WriteToEntry(cache, kLandingURL, kLandingHeaders, kLandingData);
 }
 
 void QuitUIMessageLoop() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   BrowserThread::PostTask(BrowserThread::UI,
@@ skipping 555 matching lines @@
   pb_resource = expected.add_resources();
   pb_resource->set_id(2);
   pb_resource->set_parent_id(3);
   pb_resource->set_url(kSecondRedirectURL);
   pb_resource = expected.add_resources();
   pb_resource->set_id(3);
   pb_resource->set_url(kFirstRedirectURL);
 
   VerifyResults(actual, expected);
 }