Refactor NetLog::LogLevel --> NetLogCaptureMode.

net/disk_cache/blockfile/sparse_control.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 "net/disk_cache/blockfile/sparse_control.h"
 
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 143 matching lines @@
       NOTREACHED();
       return net::NetLog::TYPE_CANCELLED;
   }
 }
 
 // Logs the end event for |operation| on a child entry.  Range operations log
 // no events for each child they search through.
 void LogChildOperationEnd(const net::BoundNetLog& net_log,
                           disk_cache::SparseControl::SparseOperation operation,
                           int result) {
-  if (net_log.IsLogging()) {
-    net::NetLog::EventType event_type;
-    switch (operation) {
-      case disk_cache::SparseControl::kReadOperation:
-        event_type = net::NetLog::TYPE_SPARSE_READ_CHILD_DATA;
-        break;
-      case disk_cache::SparseControl::kWriteOperation:
-        event_type = net::NetLog::TYPE_SPARSE_WRITE_CHILD_DATA;
-        break;
-      case disk_cache::SparseControl::kGetRangeOperation:
-        return;
-      default:
-        NOTREACHED();
-        return;
-    }
-    net_log.EndEventWithNetErrorCode(event_type, result);
+  net::NetLog::EventType event_type;

[eroman, 2015/04/09 00:08:19]

changed this

+  switch (operation) {
+    case disk_cache::SparseControl::kReadOperation:
+      event_type = net::NetLog::TYPE_SPARSE_READ_CHILD_DATA;
+      break;
+    case disk_cache::SparseControl::kWriteOperation:
+      event_type = net::NetLog::TYPE_SPARSE_WRITE_CHILD_DATA;
+      break;
+    case disk_cache::SparseControl::kGetRangeOperation:
+      return;
+    default:
+      NOTREACHED();
+      return;
   }
+  net_log.EndEventWithNetErrorCode(event_type, result);
 }
 
 }  // namespace.
 
 namespace disk_cache {
 
 SparseControl::SparseControl(EntryImpl* entry)
     : entry_(entry),
       child_(NULL),
       operation_(kNoOperation),
@@ skipping 77 matching lines @@
   offset_ = offset;
   user_buf_ = buf ? new net::DrainableIOBuffer(buf, buf_len) : NULL;
   buf_len_ = buf_len;
   user_callback_ = callback;
 
   result_ = 0;
   pending_ = false;
   finished_ = false;
   abort_ = false;
 
-  if (entry_->net_log().IsLogging()) {
+  if (entry_->net_log().GetCaptureMode().enabled()) {
     entry_->net_log().BeginEvent(
         GetSparseEventType(operation_),
         CreateNetLogSparseOperationCallback(offset_, buf_len_));
   }
   DoChildrenIO();
 
   if (!pending_) {
     // Everything was done synchronously.
     operation_ = kNoOperation;
     user_buf_ = NULL;
@@ skipping 383 matching lines @@
     DLOG(ERROR) << "Failed to save child data";
   SetChildBit(true);
 }
 
 void SparseControl::DoChildrenIO() {
   while (DoChildIO()) continue;
 
   // Range operations are finished synchronously, often without setting
   // |finished_| to true.
   if (kGetRangeOperation == operation_ &&
-      entry_->net_log().IsLogging()) {
+      entry_->net_log().GetCaptureMode().enabled()) {
     entry_->net_log().EndEvent(
         net::NetLog::TYPE_SPARSE_GET_RANGE,
         CreateNetLogGetAvailableRangeResultCallback(offset_, result_));
   }
   if (finished_) {
     if (kGetRangeOperation != operation_ &&
-        entry_->net_log().IsLogging()) {
+        entry_->net_log().GetCaptureMode().enabled()) {
       entry_->net_log().EndEvent(GetSparseEventType(operation_));
     }
     if (pending_)
       DoUserCallback();  // Don't touch this object after this point.
   }
 }
 
 bool SparseControl::DoChildIO() {
   finished_ = true;
   if (!buf_len_ || result_ < 0)
     return false;
 
   if (!OpenChild())
     return false;
 
   if (!VerifyRange())
     return false;
 
   // We have more work to do. Let's not trigger a callback to the caller.
   finished_ = false;
   CompletionCallback callback;
   if (!user_callback_.is_null()) {
     callback =
         base::Bind(&SparseControl::OnChildIOCompleted, base::Unretained(this));
   }
 
   int rv = 0;
   switch (operation_) {
     case kReadOperation:
-      if (entry_->net_log().IsLogging()) {
+      if (entry_->net_log().GetCaptureMode().enabled()) {
         entry_->net_log().BeginEvent(
             net::NetLog::TYPE_SPARSE_READ_CHILD_DATA,
             CreateNetLogSparseReadWriteCallback(child_->net_log().source(),
                                                 child_len_));
       }
       rv = child_->ReadDataImpl(kSparseData, child_offset_, user_buf_.get(),
                                 child_len_, callback);
       break;
     case kWriteOperation:
-      if (entry_->net_log().IsLogging()) {
+      if (entry_->net_log().GetCaptureMode().enabled()) {
         entry_->net_log().BeginEvent(
             net::NetLog::TYPE_SPARSE_WRITE_CHILD_DATA,
             CreateNetLogSparseReadWriteCallback(child_->net_log().source(),
                                                 child_len_));
       }
       rv = child_->WriteDataImpl(kSparseData, child_offset_, user_buf_.get(),
                                  child_len_, callback, false);
       break;
     case kGetRangeOperation:
       rv = DoGetAvailableRange();
@@ skipping 109 matching lines @@
 }
 
 void SparseControl::OnChildIOCompleted(int result) {
   DCHECK_NE(net::ERR_IO_PENDING, result);
   DoChildIOCompleted(result);
 
   if (abort_) {
     // We'll return the current result of the operation, which may be less than
     // the bytes to read or write, but the user cancelled the operation.
     abort_ = false;
-    if (entry_->net_log().IsLogging()) {
+    if (entry_->net_log().GetCaptureMode().enabled()) {
       entry_->net_log().AddEvent(net::NetLog::TYPE_CANCELLED);
       entry_->net_log().EndEvent(GetSparseEventType(operation_));
     }
     // We have an indirect reference to this object for every callback so if
     // there is only one callback, we may delete this object before reaching
     // DoAbortCallbacks.
     bool has_abort_callbacks = !abort_callbacks_.empty();
     DoUserCallback();
     if (has_abort_callbacks)
       DoAbortCallbacks();
@@ skipping 24 matching lines @@
     CompletionCallback cb = abort_callbacks_[i];
     if (i == abort_callbacks_.size() - 1)
       abort_callbacks_.clear();
 
     entry_->Release();  // Don't touch object after this line.
     cb.Run(net::OK);
   }
 }
 
 }  // namespace disk_cache