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

chrome/browser/autofill/autofill_manager.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/autofill/autofill_manager.h"
 
 #include <limits>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 434 matching lines @@
   FormData result = form;
 
   // If the relevant section is auto-filled, we should fill |field| but not the
   // rest of the form.
   if (SectionIsAutoFilled(form_structure, form, section_start, section_end)) {
     for (std::vector<FormField>::iterator iter = result.fields.begin();
          iter != result.fields.end(); ++iter) {
       if ((*iter) == field) {
         AutoFillType autofill_type(autofill_field->type());
         if (profile) {
-          DCHECK(autofill_type.group() != AutoFillType::CREDIT_CARD);
+          DCHECK_NE(autofill_type.group(), AutoFillType::CREDIT_CARD);
           FillFormField(profile, autofill_type, &(*iter));
         } else {
-          DCHECK(autofill_type.group() == AutoFillType::CREDIT_CARD);
+          DCHECK_EQ(autofill_type.group(), AutoFillType::CREDIT_CARD);
           FillCreditCardFormField(credit_card, autofill_type, &(*iter));
         }
         break;
       }
     }
 
     host->Send(new AutoFillMsg_FormDataFilled(host->routing_id(), query_id,
                                               result));
     return;
   }
@@ skipping 15 matching lines @@
     }
 
     // If we've found a match then fill the |result| field with the found
     // field in the |form_structure|.
     if (k >= section_end)
       continue;
 
     AutoFillType autofill_type(form_structure->field(k)->type());
     if (autofill_type.group() != AutoFillType::NO_GROUP) {
       if (profile) {
-        DCHECK(autofill_type.group() != AutoFillType::CREDIT_CARD);
+        DCHECK_NE(autofill_type.group(), AutoFillType::CREDIT_CARD);
         FillFormField(profile, autofill_type, &result.fields[j]);
       } else {
-        DCHECK(autofill_type.group() == AutoFillType::CREDIT_CARD);
+        DCHECK_EQ(autofill_type.group(), AutoFillType::CREDIT_CARD);
         FillCreditCardFormField(credit_card, autofill_type, &result.fields[j]);
       }
     }
 
     // We found a matching field in the |form_structure| so we
     // proceed to the next |result| field, and the next |form_structure|.
     ++i;
   }
   autofilled_forms_signatures_.push_front(form_structure->FormSignature());
 
@@ skipping 358 matching lines @@
       icons->push_back(credit_card->type());
       unique_ids->push_back(PackGUIDs(credit_card->guid(), std::string()));
     }
   }
 }
 
 void AutoFillManager::FillCreditCardFormField(const CreditCard* credit_card,
                                               AutoFillType type,
                                               webkit_glue::FormField* field) {
   DCHECK(credit_card);
-  DCHECK(type.group() == AutoFillType::CREDIT_CARD);
+  DCHECK_EQ(type.group(), AutoFillType::CREDIT_CARD);
   DCHECK(field);
 
   if (field->form_control_type() == ASCIIToUTF16("select-one")) {
     autofill::FillSelectControl(*credit_card, type, field);
   } else if (field->form_control_type() == ASCIIToUTF16("month")) {
     // HTML5 input="month" consists of year-month.
     string16 year = credit_card->GetFieldText(
         AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR));
     string16 month = credit_card->GetFieldText(
         AutoFillType(CREDIT_CARD_EXP_MONTH));
     if (!year.empty() && !month.empty()) {
       // Fill the value only if |credit_card| includes both year and month
       // information.
       field->set_value(year + ASCIIToUTF16("-") + month);
     }
   } else {
     field->set_value(credit_card->GetFieldText(type));
   }
 }
 
 void AutoFillManager::FillFormField(const AutoFillProfile* profile,
                                     AutoFillType type,
                                     webkit_glue::FormField* field) {
   DCHECK(profile);
-  DCHECK(type.group() != AutoFillType::CREDIT_CARD);
+  DCHECK_NE(type.group(), AutoFillType::CREDIT_CARD);
   DCHECK(field);
 
   if (type.subgroup() == AutoFillType::PHONE_NUMBER) {
     FillPhoneNumberField(profile, type, field);
   } else {
     if (field->form_control_type() == ASCIIToUTF16("select-one"))
       autofill::FillSelectControl(*profile, type, field);
     else
       field->set_value(profile->GetFieldText(type));
   }
@@ skipping 99 matching lines @@
     return std::string();
 
   std::map<int, std::string>::const_iterator iter = id_guid_map_.find(id);
   if (iter == id_guid_map_.end()) {
     NOTREACHED();
     return std::string();
   }
 
   return iter->second;
 }