views: Fix a bunch of dchecks.

We should use DCHECK_EQ whenever possible.

R=pkasting@chromium.org

Review URL: https://codereview.chromium.org/11148007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162413 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 27 insertions, 28 deletions

diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index 4891f85..78cf4df 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -124,7 +124,7 @@ views::View* BookmarkBubbleView::GetInitiallyFocusedView() {
 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(
@@ -277,7 +277,7 @@ void BookmarkBubbleView::ButtonPressed(
 }
 
 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.
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
index f90a19b..d7535b2 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
@@ -184,7 +184,7 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
 }
 
 bool BookmarkContextMenuControllerViews::IsItemChecked(int id) const {
-  DCHECK(id == IDC_BOOKMARK_BAR_ALWAYS_SHOW);
+  DCHECK_EQ(IDC_BOOKMARK_BAR_ALWAYS_SHOW, id);
   return profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
 }
 
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
index d4ebe40..6272401 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
@@ -250,7 +250,7 @@ void BookmarkEditorView::ExecuteCommand(int command_id) {
     }
     tree_model_->Remove(node->parent(), node);
   } else {
-    DCHECK(command_id == IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM);
+    DCHECK_EQ(IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM, command_id);
     NewFolder();
   }
 }
@@ -274,7 +274,7 @@ void BookmarkEditorView::Close() {
 
 void BookmarkEditorView::ShowContextMenuForView(views::View* source,
                                                 const gfx::Point& point) {
-  DCHECK(source == tree_view_);
+  DCHECK_EQ(tree_view_, source);
   if (!tree_view_->GetSelectedNode())
     return;
   running_menu_for_root_ =
@@ -524,10 +524,10 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::CreateRootNode() {
   const BookmarkNode* bb_root_node = bb_model_->root_node();
   CreateNodes(bb_root_node, root_node);
   DCHECK(root_node->child_count() >= 2 && root_node->child_count() <= 3);
-  DCHECK(bb_root_node->GetChild(0)->type() == BookmarkNode::BOOKMARK_BAR);
-  DCHECK(bb_root_node->GetChild(1)->type() == BookmarkNode::OTHER_NODE);
+  DCHECK_EQ(BookmarkNode::BOOKMARK_BAR, bb_root_node->GetChild(0)->type());
+  DCHECK_EQ(BookmarkNode::OTHER_NODE, bb_root_node->GetChild(1)->type());
   if (root_node->child_count() == 3)
-    DCHECK(bb_root_node->GetChild(2)->type() == BookmarkNode::MOBILE);
+    DCHECK_EQ(BookmarkNode::MOBILE, bb_root_node->GetChild(2)->type());
   return root_node;
 }
 
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index 9bbf14f..721c14e 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -447,7 +447,7 @@ void BrowserActionsContainer::AnimationEnded(const ui::Animation* animation) {
 
 void BrowserActionsContainer::NotifyMenuDeleted(
     BrowserActionOverflowMenuController* controller) {
-  DCHECK(controller == overflow_menu_);
+  DCHECK_EQ(overflow_menu_, controller);
   overflow_menu_ = NULL;
 }
 
diff --git a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc
index 9755133..52b3faf 100644
--- a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc
+++ b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc
@@ -130,7 +130,7 @@ views::View* ChromeToMobileBubbleView::GetInitiallyFocusedView() {
 void ChromeToMobileBubbleView::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(bubble_ == this);
+  DCHECK_EQ(bubble_, this);
   bubble_ = NULL;
 
   // Instruct the service to delete the snapshot file.
diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc
index 9b1c38f..ee69ba0 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -525,6 +525,6 @@ void CollectedCookiesViews::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  DCHECK(type == chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN);
+  DCHECK_EQ(chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, type);
   window_->CloseConstrainedWindow();
 }
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index 7c71ccf..5281534 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -322,7 +322,7 @@ void ContentSettingBubbleContents::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  DCHECK(type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED);
+  DCHECK_EQ(content::NOTIFICATION_WEB_CONTENTS_DESTROYED, type);
   DCHECK(source == content::Source<WebContents>(web_contents_));
   web_contents_ = NULL;
 }
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
index d50da19..34696e8 100644
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -254,7 +254,7 @@ void DownloadItemView::OnExtractIconComplete(IconManager::Handle handle,
 // 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.
@@ -992,9 +992,9 @@ void DownloadItemView::SetState(State new_body_state, State new_drop_state) {
     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)
diff --git a/chrome/browser/ui/views/notifications/balloon_view_views.cc b/chrome/browser/ui/views/notifications/balloon_view_views.cc
index c9acf26..a9d7c66 100644
--- a/chrome/browser/ui/views/notifications/balloon_view_views.cc
+++ b/chrome/browser/ui/views/notifications/balloon_view_views.cc
@@ -174,10 +174,9 @@ void BalloonViewImpl::DeleteDelegate() {
   balloon_->OnClose(closed_by_user_);
 }
 
-void BalloonViewImpl::ButtonPressed(views::Button* sender,
-                                    const ui::Event&) {
+void BalloonViewImpl::ButtonPressed(views::Button* sender, const ui::Event&) {
   // The only button currently is the close button.
-  DCHECK(sender == close_button_);
+  DCHECK_EQ(close_button_, sender);
   Close(true);
 }
 
@@ -235,7 +234,7 @@ void BalloonViewImpl::Update() {
 }
 
 void BalloonViewImpl::AnimationProgressed(const ui::Animation* animation) {
-  DCHECK(animation == animation_.get());
+  DCHECK_EQ(animation_.get(), animation);
 
   // Linear interpolation from start to end position.
   gfx::Rect frame_position(animation_->CurrentValueBetween(
diff --git a/chrome/browser/ui/views/open_pdf_in_reader_bubble_view.cc b/chrome/browser/ui/views/open_pdf_in_reader_bubble_view.cc
index 7576e5c..5d65d49 100644
--- a/chrome/browser/ui/views/open_pdf_in_reader_bubble_view.cc
+++ b/chrome/browser/ui/views/open_pdf_in_reader_bubble_view.cc
@@ -64,8 +64,8 @@ void OpenPDFInReaderBubbleView::Init() {
 }
 
 void OpenPDFInReaderBubbleView::ButtonPressed(views::Button* sender,
-                                           const ui::Event& event) {
-  DCHECK(sender == close_button_);
+                                              const ui::Event& event) {
+  DCHECK_EQ(close_button_, sender);
 
   model_->Cancel();
   StartFade(false);
@@ -73,7 +73,7 @@ void OpenPDFInReaderBubbleView::ButtonPressed(views::Button* sender,
 
 void OpenPDFInReaderBubbleView::LinkClicked(views::Link* source,
                                             int event_flags) {
-  DCHECK(source == open_in_reader_link_);
+  DCHECK_EQ(open_in_reader_link_, source);
 
   model_->Accept();
   StartFade(false);
diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc
index c83efc6..dee417e 100644
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -123,10 +123,10 @@ void SadTabView::LinkClicked(views::Link* source, int event_flags) {
   }
 }
 
-void SadTabView::ButtonPressed(views::Button* source,
+void SadTabView::ButtonPressed(views::Button* sender,
                                const ui::Event& event) {
   DCHECK(web_contents_);
-  DCHECK(source == reload_button_);
+  DCHECK_EQ(reload_button_, sender);
   web_contents_->GetController().Reload(true);
 }
 
diff --git a/chrome/browser/ui/views/speech_recognition_bubble_views.cc b/chrome/browser/ui/views/speech_recognition_bubble_views.cc
index 7171460..40e7fc9 100644
--- a/chrome/browser/ui/views/speech_recognition_bubble_views.cc
+++ b/chrome/browser/ui/views/speech_recognition_bubble_views.cc
@@ -228,7 +228,7 @@ void SpeechRecognitionBubbleView::ButtonPressed(views::Button* source,
 
 void SpeechRecognitionBubbleView::LinkClicked(views::Link* source,
                                               int event_flags) {
-  DCHECK_EQ(source, mic_settings_);
+  DCHECK_EQ(mic_settings_, source);
   content::SpeechRecognitionManager::GetInstance()->ShowAudioInputSettings();
 }
 
diff --git a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc
index 3cb2a8a..8ffe361 100644
--- a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc
+++ b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc
@@ -148,7 +148,7 @@ void OneClickSigninBubbleView::WindowClosing() {
   // We have to reset |bubble_view_| here, not in our destructor, because
   // we'll be destroyed asynchronously and the shown state will be checked
   // before then.
-  DCHECK(bubble_view_ == this);
+  DCHECK_EQ(bubble_view_, this);
   bubble_view_ = NULL;
 
   if (!start_sync_callback_.is_null()) {
diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc
index 81e6038..845d95d 100644
--- a/chrome/browser/ui/views/tabs/base_tab.cc
+++ b/chrome/browser/ui/views/tabs/base_tab.cc
@@ -588,7 +588,7 @@ void BaseTab::ButtonPressed(views::Button* sender, const ui::Event& event) {
       (event.type() == ui::ET_MOUSE_RELEASED &&
        (event.flags() & ui::EF_FROM_TOUCH) == 0) ? CLOSE_TAB_FROM_MOUSE :
       CLOSE_TAB_FROM_TOUCH;
-  DCHECK(sender == close_button_);
+  DCHECK_EQ(close_button_, sender);
   controller()->CloseTab(this, source);
 }
 
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index 00a50d2..5a22107 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -715,7 +715,7 @@ void TaskManagerView::OnKeyDown(ui::KeyboardCode keycode) {
 }
 
 void TaskManagerView::LinkClicked(views::Link* source, int event_flags) {
-  DCHECK(source == about_memory_link_);
+  DCHECK_EQ(about_memory_link_, source);
   task_manager_->OpenAboutMemory();
 }