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

chrome/browser/about_flags.cc

 // Copyright (c) 2010 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/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 310 matching lines @@
   experiments_list->Clear();
   for (std::set<std::string>::const_iterator it = enabled_experiments.begin();
        it != enabled_experiments.end();
        ++it) {
     experiments_list->Append(new StringValue(*it));
   }
 }
 
 // Returns the name used in prefs for the choice at the specified index.
 std::string NameForChoice(const Experiment& e, int index) {
-  DCHECK(e.type == Experiment::MULTI_VALUE);
+  DCHECK_EQ(e.type, Experiment::MULTI_VALUE);
   DCHECK(index < e.num_choices);
   return std::string(e.internal_name) + about_flags::testing::kMultiSeparator +
       base::IntToString(index);
 }
 
 // Adds the internal names for the specified experiment to |names|.
 void AddInternalName(const Experiment& e, std::set<std::string>* names) {
   if (e.type == Experiment::SINGLE_VALUE) {
     names->insert(e.internal_name);
   } else {
-    DCHECK(e.type == Experiment::MULTI_VALUE);
+    DCHECK_EQ(e.type, Experiment::MULTI_VALUE);
     for (int i = 0; i < e.num_choices; ++i)
       names->insert(NameForChoice(e, i));
   }
 }
 
 // Confirms that an experiment is valid, used in a DCHECK in
 // SanitizeList below.
 bool ValidateExperiment(const Experiment& e) {
   switch (e.type) {
     case Experiment::SINGLE_VALUE:
@@ skipping 61 matching lines @@
       platform_experiments.begin(), platform_experiments.end(),
       result->begin(), result->end(),
       std::inserter(new_enabled_experiments, new_enabled_experiments.begin()));
 
   result->swap(new_enabled_experiments);
 }
 
 // Returns the Value representing the choice data in the specified experiment.
 Value* CreateChoiceData(const Experiment& experiment,
                         const std::set<std::string>& enabled_experiments) {
-  DCHECK(experiment.type == Experiment::MULTI_VALUE);
+  DCHECK_EQ(experiment.type, Experiment::MULTI_VALUE);
   ListValue* result = new ListValue;
   for (int i = 0; i < experiment.num_choices; ++i) {
     const Experiment::Choice& choice = experiment.choices[i];
     DictionaryValue* value = new DictionaryValue;
     std::string name = NameForChoice(experiment, i);
     value->SetString("description",
                      l10n_util::GetStringUTF16(choice.description_id));
     value->SetString("internal_name", name);
     value->SetBoolean("selected", enabled_experiments.count(name) > 0);
     result->Append(value);
@@ skipping 250 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags