Begun the DCHECK() cleanup. Starting off with /src/chrome/a* and /src/chrome/...

chrome/browser/autocomplete/autocomplete_edit_view_win.cc

 // Copyright (c) 2011 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/autocomplete/autocomplete_edit_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 339 matching lines @@
 // Returns a lazily initialized property bag accessor for saving our state in a
 // TabContents.
 PropertyAccessor<AutocompleteEditState>* GetStateAccessor() {
   static PropertyAccessor<AutocompleteEditState> state;
   return &state;
 }
 
 class PaintPatcher {
  public:
   PaintPatcher() : refcount_(0) { }
-  ~PaintPatcher() { DCHECK(refcount_ == 0); }
+  ~PaintPatcher() { DCHECK_EQ(refcount_, 0); }

[Robert Sesek, 2011/02/17 19:57:02]

This needs to be '0U' instead of just 0. I'll make this change and try it once
more.

 
   void RefPatch() {
     if (refcount_ == 0) {
       DCHECK(!begin_paint_.is_patched());
       DCHECK(!end_paint_.is_patched());
       begin_paint_.Patch(L"riched20.dll", "user32.dll", "BeginPaint",
                          &BeginPaintIntercept);
       end_paint_.Patch(L"riched20.dll", "user32.dll", "EndPaint",
                        &EndPaintIntercept);
     }
@@ skipping 681 matching lines @@
 }
 
 bool AutocompleteEditViewWin::IsItemForCommandIdDynamic(int command_id) const {
   // No need to change the default IDS_PASTE_AND_GO label unless this is a
   // search.
   return command_id == IDS_PASTE_AND_GO;
 }
 
 string16 AutocompleteEditViewWin::GetLabelForCommandId(
     int command_id) const {
-  DCHECK(command_id == IDS_PASTE_AND_GO);
+  DCHECK_EQ(command_id, IDS_PASTE_AND_GO);
   return l10n_util::GetStringUTF16(model_->is_paste_and_search() ?
       IDS_PASTE_AND_SEARCH : IDS_PASTE_AND_GO);
 }
 
 void AutocompleteEditViewWin::ExecuteCommand(int command_id) {
   ScopedFreeze freeze(this, GetTextObjectModel());
   if (command_id == IDS_PASTE_AND_GO) {
     // This case is separate from the switch() below since we don't want to wrap
     // it in OnBefore/AfterPossibleChange() calls.
     model_->PasteAndGo();
@@ skipping 958 matching lines @@
 
 void AutocompleteEditViewWin::GetSelection(CHARRANGE& sel) const {
   GetSel(sel);
 
   // See if we need to reverse the direction of the selection.
   ITextDocument* const text_object_model = GetTextObjectModel();
   if (!text_object_model)
     return;
   ScopedComPtr<ITextSelection> selection;
   const HRESULT hr = text_object_model->GetSelection(selection.Receive());
-  DCHECK(hr == S_OK);
+  DCHECK_EQ(hr, S_OK);
   long flags;
   selection->GetFlags(&flags);
   if (flags & tomSelStartActive)
     std::swap(sel.cpMin, sel.cpMax);
 }
 
 string16 AutocompleteEditViewWin::GetSelectedText() const {
   // Figure out the length of the selection.
   CHARRANGE sel;
   GetSel(sel);
 
   // Grab the selected text.
   string16 str;
   GetSelText(WriteInto(&str, sel.cpMax - sel.cpMin + 1));
   return str;
 }
 
 void AutocompleteEditViewWin::SetSelection(LONG start, LONG end) {
   SetSel(start, end);
 
   if (start <= end)
     return;
 
   // We need to reverse the direction of the selection.
   ITextDocument* const text_object_model = GetTextObjectModel();
   if (!text_object_model)
     return;
   ScopedComPtr<ITextSelection> selection;
   const HRESULT hr = text_object_model->GetSelection(selection.Receive());
-  DCHECK(hr == S_OK);
+  DCHECK_EQ(hr, S_OK);
   selection->SetFlags(tomSelStartActive);
 }
 
 void AutocompleteEditViewWin::PlaceCaretAt(string16::size_type pos) {
   SetSelection(static_cast<LONG>(pos), static_cast<LONG>(pos));
 }
 
 bool AutocompleteEditViewWin::IsSelectAllForRange(const CHARRANGE& sel) const {
   const int text_length = GetTextLength();
   return ((sel.cpMin == 0) && (sel.cpMax >= text_length)) ||
@@ skipping 215 matching lines @@
 
   // Now copy what we drew to the target HDC.
   canvas.getTopPlatformDevice().drawToHDC(hdc,
       scheme_rect.left + canvas_paint_clip_rect.left - canvas_clip_rect.left,
       std::max(scheme_rect.top, client_rect.top) + canvas_paint_clip_rect.top -
           canvas_clip_rect.top, &canvas_paint_clip_rect);
 }
 
 void AutocompleteEditViewWin::DrawDropHighlight(
     HDC hdc, const CRect& client_rect, const CRect& paint_clip_rect) {
-  DCHECK(drop_highlight_position_ != -1);
+  DCHECK_NE(drop_highlight_position_, -1);
 
   const int highlight_y = client_rect.top + font_y_adjustment_;
   const int highlight_x = PosFromChar(drop_highlight_position_).x - 1;
   const CRect highlight_rect(highlight_x,
                              highlight_y,
                              highlight_x + 1,
                              highlight_y + font_.GetHeight());
 
   // Clip the highlight to the region being painted.
   CRect clip_rect;
@@ skipping 262 matching lines @@
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }
 
 bool AutocompleteEditViewWin::IsCaretAtEnd() const {
   long length = GetTextLength();
   CHARRANGE sel;
   GetSelection(sel);
   return sel.cpMin == sel.cpMax && sel.cpMin == length;
 }