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

chrome/browser/search_engines/template_url_prepopulate_data.h

Index: chrome/browser/search_engines/template_url_prepopulate_data.h
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.h b/chrome/browser/search_engines/template_url_prepopulate_data.h
index 9de33285a160e50bef688170e662f55cc3089483..482620081e7679b8b9696d18e653f91277992128 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data.h
+++ b/chrome/browser/search_engines/template_url_prepopulate_data.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_PREPOPULATE_DATA_H__
-#define CHROME_BROWSER_TEMPLATE_URL_PREPOPULATE_DATA_H__
+#ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_
+#define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_
 
 #include <vector>
 
@@ -28,4 +28,4 @@ void GetPrepopulatedEngines(PrefService* prefs,
 
 }  // namespace TemplateURLPrepopulateData
 
-#endif  // CHROME_BROWSER_TEMPLATE_URL_PREPOPULATE_DATA_H__
+#endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_