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

chrome/browser/search_engines/template_url_fetcher.h

Index: chrome/browser/search_engines/template_url_fetcher.h
diff --git a/chrome/browser/search_engines/template_url_fetcher.h b/chrome/browser/search_engines/template_url_fetcher.h
index bbd314f447237fecc1dee0ee1b01bd8921cb1460..911ceeb1ca9f5bdbd6b9e7bfe667a23f53cd4711 100644
--- a/chrome/browser/search_engines/template_url_fetcher.h
+++ b/chrome/browser/search_engines/template_url_fetcher.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_FETCHER_H_
-#define CHROME_BROWSER_TEMPLATE_URL_FETCHER_H_
+#ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_FETCHER_H_
+#define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_FETCHER_H_
 
 #include "app/gfx/native_widget_types.h"
 #include "base/scoped_vector.h"
@@ -52,4 +52,4 @@ class TemplateURLFetcher {
   DISALLOW_COPY_AND_ASSIGN(TemplateURLFetcher);
 };
 
-#endif  // CHROME_BROWSER_OSDD_FETCHER_H_
+#endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_FETCHER_H_