Revert 70618 - First pass at adding http/backend cache events to the NetLog. ...

net/tools/dump_cache/upgrade.cc

 // Copyright (c) 2010 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 "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 308 matching lines @@
 
   if (dump_to_disk_) {
     writer_ = new DiskDumper(path_);
   } else {
     disk_cache::Backend* cache;
     TestCompletionCallback cb;
     int rv = disk_cache::CreateCacheBackend(net::DISK_CACHE,
                                             FilePath::FromWStringHack(path_), 0,
                                             false,
                                             cache_thread_.message_loop_proxy(),
-                                            NULL, &cache, &cb);
+                                            &cache, &cb);
     if (cb.GetResult(rv) != net::OK) {
       printf("Unable to initialize new files\n");
       return false;
     }
     cache_.reset(cache);
     writer_ = new CacheDumper(cache_.get());
   }
   if (!writer_)
     return false;
 
@@ skipping 260 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(
           read_callback_(this, &SlaveSM::DoReadDataComplete)),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           next_callback_(this, &SlaveSM::DoGetEntryComplete)) {
   disk_cache::Backend* cache;
   TestCompletionCallback cb;
   int rv = disk_cache::CreateCacheBackend(net::DISK_CACHE,
                                           FilePath::FromWStringHack(path), 0,
                                           false,
                                           cache_thread_.message_loop_proxy(),
-                                          NULL, &cache, &cb);
+                                          &cache, &cb);
   if (cb.GetResult(rv) != net::OK) {
     printf("Unable to open cache files\n");
     return;
   }
   cache_.reset(reinterpret_cast<disk_cache::BackendImpl*>(cache));
   cache_->SetUpgradeMode();
 }
 
 SlaveSM::~SlaveSM() {
   if (iterator_)
@@ skipping 299 matching lines @@
 
   SlaveSM slave(input_path, pipe);
   if (!slave.DoInit()) {
     printf("Unable to talk with the main process\n");
     return -1;
   }
 
   loop.Run();
   return 0;
 }