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

chrome/browser/search_engines/template_url.h

Index: chrome/browser/search_engines/template_url.h
diff --git a/chrome/browser/search_engines/template_url.h b/chrome/browser/search_engines/template_url.h
index 2d8228bddcccbc9d93ebadc9b0d339fb94381a0c..94623637dce742420d98934b1bc123101fa081ca 100644
--- a/chrome/browser/search_engines/template_url.h
+++ b/chrome/browser/search_engines/template_url.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_TEMPLATE_URL_H__
-#define CHROME_BROWSER_TEMPLATE_URL_H__
+#ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
+#define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
 
 #include <vector>
 
@@ -439,4 +439,4 @@ class TemplateURL {
   // TODO(sky): Add date last parsed OSD file.
 };
 
-#endif // CHROME_BROWSER_TEMPLATE_URL_PARSER_H__
+#endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_