views: Fix a bunch of dchecks.

chrome/browser/ui/views/bookmarks/bookmark_bubble_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/bookmarks/bookmark_bubble_view.h"
 
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 106 matching lines @@
   }
 }
 
 views::View* BookmarkBubbleView::GetInitiallyFocusedView() {
   return title_tf_;
 }
 
 void BookmarkBubbleView::WindowClosing() {
   // We have to reset |bubble_| here, not in our destructor, because we'll be
   // destroyed asynchronously and the shown state will be checked before then.
-  DCHECK(bookmark_bubble_ == this);
+  DCHECK_EQ(bookmark_bubble_, this);
   bookmark_bubble_ = NULL;
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BOOKMARK_BUBBLE_HIDDEN,
       content::Source<Profile>(profile_->GetOriginalProfile()),
       content::NotificationService::NoDetails());
  }
 
 bool BookmarkBubbleView::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
@@ skipping 132 matching lines @@
     NOTREACHED();
   return string16();
 }
 
 void BookmarkBubbleView::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
   HandleButtonPressed(sender);
 }
 
 void BookmarkBubbleView::LinkClicked(views::Link* source, int event_flags) {
-  DCHECK(source == remove_link_);
+  DCHECK_EQ(remove_link_, source);
   content::RecordAction(UserMetricsAction("BookmarkBubble_Unstar"));
 
   // Set this so we remove the bookmark after the window closes.
   remove_bookmark_ = true;
   apply_edits_ = false;
   StartFade(false);
 }
 
 void BookmarkBubbleView::OnSelectedIndexChanged(views::Combobox* combobox) {
   if (combobox->selected_index() + 1 == parent_model_.GetItemCount()) {
@@ skipping 46 matching lines @@
       const BookmarkNode* new_parent =
           parent_model_.GetNodeAt(parent_combobox_->selected_index());
       if (new_parent != node->parent()) {
         content::RecordAction(
             UserMetricsAction("BookmarkBubble_ChangeParent"));
         model->Move(node, new_parent, new_parent->child_count());
       }
     }
   }
 }