NetLogEventParameter to Callback refactoring 11.

content/browser/download/base_file.cc

 // Copyright (c) 2012 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 "content/browser/download/base_file.h"
 
+#include "base/bind.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/download/download_net_log_parameters.h"
 #include "content/browser/download/download_stats.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 47 matching lines @@
       break;
   }
 
 #undef NET_ERROR
 
   VLOG(1) << " " << func << "(): " << operation
           << "() returned error " << error << " (" << err_string << ")";
 
   bound_net_log.AddEvent(
       net::NetLog::TYPE_DOWNLOAD_FILE_ERROR,
-      make_scoped_refptr(
-          new download_net_logs::FileErrorParameters(operation, net_error)));
+      base::Bind(&download_net_logs::FileErrorCallback, operation, net_error));
 
   return net_error;
 }
 
 #if defined(OS_WIN)
 
 #define SHFILE_TO_NET_ERROR(symbol, value, mapping, description) \
   case value: return net::ERR_##mapping;
 
 // Maps the result of a call to |SHFileOperation()| onto a |net::Error|.
@@ skipping 232 matching lines @@
 
 net::Error BaseFile::Rename(const FilePath& new_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Save the information whether the download is in progress because
   // it will be overwritten by closing the file.
   bool saved_in_progress = in_progress();
 
   bound_net_log_.AddEvent(
       net::NetLog::TYPE_DOWNLOAD_FILE_RENAMED,
-      make_scoped_refptr(
-          new download_net_logs::FileRenamedParameters(
-              full_path_.AsUTF8Unsafe(), new_path.AsUTF8Unsafe())));
+      base::Bind(&download_net_logs::FileRenamedCallback,
+                 &full_path_, &new_path));
 
   // If the new path is same as the old one, there is no need to perform the
   // following renaming logic.
   if (new_path == full_path_) {
     // Don't close the file if we're not done (finished or canceled).
     if (!saved_in_progress)
       Close();
 
     return net::OK;
   }
@@ skipping 48 matching lines @@
 
   // We don't need to re-open the file if we're done (finished or canceled).
   if (!saved_in_progress)
     return net::OK;
 
   return Open();
 }
 
 void BaseFile::Detach() {
   detached_ = true;
-  bound_net_log_.AddEvent(net::NetLog::TYPE_DOWNLOAD_FILE_DETACHED, NULL);
+  bound_net_log_.AddEvent(net::NetLog::TYPE_DOWNLOAD_FILE_DETACHED);
 }
 
 void BaseFile::Cancel() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(!detached_);
 
-  bound_net_log_.AddEvent(net::NetLog::TYPE_CANCELLED, NULL);
+  bound_net_log_.AddEvent(net::NetLog::TYPE_CANCELLED);
 
   Close();
 
   if (!full_path_.empty()) {
-    bound_net_log_.AddEvent(net::NetLog::TYPE_DOWNLOAD_FILE_DELETED, NULL);
+    bound_net_log_.AddEvent(net::NetLog::TYPE_DOWNLOAD_FILE_DELETED);
 
     file_util::Delete(full_path_, false);
   }
 }
 
 void BaseFile::Finish() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   if (calculate_hash_)
     secure_hash_->Finish(sha256_hash_, kSha256HashLen);
@@ skipping 57 matching lines @@
   file_stream_->SetBoundNetLogSource(bound_net_log_);
 }
 
 net::Error BaseFile::Open() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(!detached_);
   DCHECK(!full_path_.empty());
 
   bound_net_log_.BeginEvent(
       net::NetLog::TYPE_DOWNLOAD_FILE_OPENED,
-      make_scoped_refptr(
-          new download_net_logs::FileOpenedParameters(
-              full_path_.AsUTF8Unsafe(), bytes_so_far_)));
+      base::Bind(&download_net_logs::FileOpenedCallback,
+                 &full_path_, bytes_so_far_));
 
   // Create a new file stream if it is not provided.
   if (!file_stream_.get()) {
     CreateFileStream();
     file_stream_->EnableErrorStatistics();
     int open_result = file_stream_->OpenSync(
         full_path_,
         base::PLATFORM_FILE_OPEN_ALWAYS | base::PLATFORM_FILE_WRITE);
     if (open_result != net::OK)
       return ClearStream(LOG_ERROR("Open", open_result));
@@ skipping 10 matching lines @@
 #if defined(OS_WIN)
   AnnotateWithSourceInformation();
 #endif
 
   return net::OK;
 }
 
 void BaseFile::Close() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
-  bound_net_log_.AddEvent(net::NetLog::TYPE_DOWNLOAD_FILE_CLOSED, NULL);
+  bound_net_log_.AddEvent(net::NetLog::TYPE_DOWNLOAD_FILE_CLOSED);
 
   if (file_stream_.get()) {
 #if defined(OS_CHROMEOS)
     // Currently we don't really care about the return value, since if it fails
     // theres not much we can do.  But we might in the future.
     file_stream_->Flush();
 #endif
     file_stream_->CloseSync();
     ClearStream(net::OK);
   }
 }
 
 net::Error BaseFile::ClearStream(net::Error net_error) {
   // This should only be called when we have a stream.
   DCHECK(file_stream_.get() != NULL);
   file_stream_.reset();
-  bound_net_log_.EndEvent(net::NetLog::TYPE_DOWNLOAD_FILE_OPENED, NULL);
+  bound_net_log_.EndEvent(net::NetLog::TYPE_DOWNLOAD_FILE_OPENED);
   return net_error;
 }
 
 std::string BaseFile::DebugString() const {
   return base::StringPrintf("{ source_url_ = \"%s\""
                             " full_path_ = \"%" PRFilePath "\""
                             " bytes_so_far_ = %" PRId64
                             " detached_ = %c }",
                             source_url_.spec().c_str(),
                             full_path_.value().c_str(),
                             bytes_so_far_,
                             detached_ ? 'T' : 'F');
 }
 
 int64 BaseFile::CurrentSpeedAtTime(base::TimeTicks current_time) const {
   base::TimeDelta diff = current_time - start_tick_;
   int64 diff_ms = diff.InMilliseconds();
   return diff_ms == 0 ? 0 : bytes_so_far() * 1000 / diff_ms;
 }
 
 int64 BaseFile::CurrentSpeed() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   return CurrentSpeedAtTime(base::TimeTicks::Now());
 }