This patch is the rest of the lint cleanup minus the other open issue.

chrome/browser/search_engines/template_url_model.cc

 // Copyright (c) 2009 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/search_engines/template_url_model.h"
 
 
 #include "app/l10n_util.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 970 matching lines @@
       std::string value_string = url.spec().substr(value.begin, value.len);
       QueryTerms::iterator query_terms_iterator =
           query_terms->find(key_string);
       if (query_terms_iterator != query_terms->end()) {
         if (!query_terms_iterator->second.empty() &&
             query_terms_iterator->second != value_string) {
           // The term occurs in multiple places with different values. Treat
           // this as if the term doesn't occur by setting the value to an empty
           // string.
           (*query_terms)[key_string] = std::string();
-          DCHECK (valid_term_count > 0);
+          DCHECK(valid_term_count > 0);
           valid_term_count--;
         }
       } else {
         valid_term_count++;
         (*query_terms)[key_string] = value_string;
       }
     }
   }
   return (valid_term_count > 0);
 }
@@ skipping 10 matching lines @@
       AddToMaps(t_url);
       something_changed = true;
     }
   }
 
   if (something_changed && loaded_) {
     FOR_EACH_OBSERVER(TemplateURLModelObserver, model_observers_,
                       OnTemplateURLModelChanged());
   }
 }