Reorganizing few DCHECKs for better catching of failure.

content/browser/download/save_item.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/save_item.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "content/browser/download/save_file.h"
 #include "content/browser/download/save_file_manager.h"
@@ skipping 28 matching lines @@
       is_success_(false),
       save_source_(save_source),
       package_(package) {
   DCHECK(package);
 }
 
 SaveItem::~SaveItem() {}
 
 // Set start state for save item.
 void SaveItem::Start() {
-  DCHECK(state_ == WAIT_START);
+  DCHECK_EQ(state_, WAIT_START);
   state_ = IN_PROGRESS;
 }
 
 // If we've received more data than we were expecting (bad server info?),
 // revert to 'unknown size mode'.
 void SaveItem::UpdateSize(int64_t bytes_so_far) {
   received_bytes_ = bytes_so_far;
   if (received_bytes_ >= total_bytes_)
     total_bytes_ = 0;
 }
@@ skipping 26 matching lines @@
 
 // Set finish state for a save item
 void SaveItem::Finish(int64_t size, bool is_success) {
   DCHECK(has_final_name() || !is_success_);
   state_ = COMPLETE;
   is_success_ = is_success;
   UpdateSize(size);
 }
 
 void SaveItem::SetTargetPath(const base::FilePath& full_path) {
-  DCHECK(!full_path.empty() && !has_final_name());
+  DCHECK(!full_path.empty());
+  DCHECK(!has_final_name());
   full_path_ = full_path;
 }
 
 void SaveItem::SetTotalBytes(int64_t total_bytes) {
   DCHECK_EQ(0, total_bytes_);
   total_bytes_ = total_bytes;
 }
 
 }  // namespace content