views: Fix a bunch of dchecks.

chrome/browser/ui/views/download/download_item_view.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 "chrome/browser/ui/views/download/download_item_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 236 matching lines @@
                                              gfx::Image* icon_bitmap) {
   if (icon_bitmap)
     parent()->SchedulePaint();
 }
 
 // DownloadObserver interface.
 
 // Update the progress graphic on the icon and our text status label
 // to reflect our current bytes downloaded, time remaining.
 void DownloadItemView::OnDownloadUpdated(DownloadItem* download) {
-  DCHECK(download == download_);
+  DCHECK_EQ(download_, download);
 
   if (IsShowingWarningDialog() && !model_->IsDangerous()) {
     // We have been approved.
     ClearWarningDialog();
   } else if (!IsShowingWarningDialog() && model_->IsDangerous()) {
     ShowWarningDialog();
     // Force the shelf to layout again as our size has changed.
     parent_->Layout();
     SchedulePaint();
   } else {
@@ skipping 717 matching lines @@
                        0, 0, bottom_image->width(), bottom_image->height(),
                        x, y, width, bottom_image->height(), false);
 }
 
 void DownloadItemView::SetState(State new_body_state, State new_drop_state) {
   // If we are showing a warning dialog, we don't change body state.
   if (IsShowingWarningDialog()) {
     new_body_state = NORMAL;
 
     // Current body_state_ should always be NORMAL for warning dialogs.
-    DCHECK(body_state_ == NORMAL);
+    DCHECK_EQ(NORMAL, body_state_);
     // We shouldn't be calling SetState if we are in DANGEROUS_MODE.
-    DCHECK(mode_ != DANGEROUS_MODE);
+    DCHECK_NE(DANGEROUS_MODE, mode_);
   }
   // Avoid extra SchedulePaint()s if the state is going to be the same.
   if (body_state_ == new_body_state && drop_down_state_ == new_drop_state)
     return;
 
   AnimateStateTransition(body_state_, new_body_state,
                          body_hover_animation_.get());
   AnimateStateTransition(drop_down_state_, new_drop_state,
                          drop_hover_animation_.get());
   body_state_ = new_body_state;
@@ skipping 218 matching lines @@
 void DownloadItemView::AnimateStateTransition(State from, State to,
                                               ui::SlideAnimation* animation) {
   if (from == NORMAL && to == HOT) {
     animation->Show();
   } else if (from == HOT && to == NORMAL) {
     animation->Hide();
   } else if (from != to) {
     animation->Reset((to == HOT) ? 1.0 : 0.0);
   }
 }