Fix incorrect guards in base/.

This doesn't change _H_ vs _H__, it just fixes guards that didn't properly match the filename.  Adds a guard to clipboard_util.h which was previously guardless.

Review URL: http://codereview.chromium.org/42278


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11856 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 22 insertions, 17 deletions

diff --git a/base/base_drag_source.h b/base/base_drag_source.h
index 1ca96dd..dea89af 100644
--- a/base/base_drag_source.h
+++ b/base/base_drag_source.h
@@ -43,4 +43,4 @@ class BaseDragSource : public IDropSource {
   DISALLOW_EVIL_CONSTRUCTORS(BaseDragSource);
 };
 
-#endif  // #ifndef BASE_DRAG_SOURCE_H_
+#endif  // BASE_BASE_DRAG_SOURCE_H_
diff --git a/base/base_switches.h b/base/base_switches.h
index 9353c31..97a3691 100644
--- a/base/base_switches.h
+++ b/base/base_switches.h
@@ -4,8 +4,8 @@
 
 // Defines all the "base" command-line switches.
 
-#ifndef BASE_SWITCHES_H_
-#define BASE_SWITCHES_H_
+#ifndef BASE_BASE_SWITCHES_H_
+#define BASE_BASE_SWITCHES_H_
 
 namespace switches {
 
@@ -20,4 +20,4 @@ extern const wchar_t kForceHTTPS[];
 
 }  // namespace switches
 
-#endif  // BASE_SWITCHES_H_
+#endif  // BASE_BASE_SWITCHES_H_
diff --git a/base/clipboard_util.h b/base/clipboard_util.h
index 9b55819..bed0eef 100644
--- a/base/clipboard_util.h
+++ b/base/clipboard_util.h
@@ -4,6 +4,9 @@
 //
 // Some helper functions for working with the clipboard and IDataObjects.
 
+#ifndef BASE_CLIPBOARD_UTIL_H_
+#define BASE_CLIPBOARD_UTIL_H_
+
 #include <shlobj.h>
 #include <string>
 #include <vector>
@@ -56,3 +59,5 @@ class ClipboardUtil {
   static void CFHtmlToHtml(const std::string& cf_html, std::string* html,
                            std::string* base_url);
 };
+
+#endif  // BASE_CLIPBOARD_UTIL_H_
diff --git a/base/no_windows2000_unittest.h b/base/no_windows2000_unittest.h
index 47246ab..58709254 100644
--- a/base/no_windows2000_unittest.h
+++ b/base/no_windows2000_unittest.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 BASE_NO_WINDOWS2000_UNITTEST_H__
-#define BASE_NO_WINDOWS2000_UNITTEST_H__
+#ifndef BASE_NO_WINDOWS2000_UNITTEST_H_
+#define BASE_NO_WINDOWS2000_UNITTEST_H_
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "base/win_util.h"
@@ -18,4 +18,4 @@ class NoWindows2000Test : public Parent {
   }
 };
 
-#endif  // BASE_NO_WINDOWS2000_UNITTEST_H__op
+#endif  // BASE_NO_WINDOWS2000_UNITTEST_H_
diff --git a/base/pe_image.h b/base/pe_image.h
index d03aec75..f2a929d 100644
--- a/base/pe_image.h
+++ b/base/pe_image.h
@@ -8,8 +8,8 @@
 // Win32 Portable Executable File Format" by Matt Pietrek:
 // http://msdn.microsoft.com/msdnmag/issues/02/02/PE/default.aspx
 
-#ifndef BASE_SRC_PE_IMAGE_H__
-#define BASE_SRC_PE_IMAGE_H__
+#ifndef BASE_PE_IMAGE_H_
+#define BASE_PE_IMAGE_H_
 
 #include <windows.h>
 #include <DelayIMP.h>
@@ -254,4 +254,4 @@ inline PIMAGE_EXPORT_DIRECTORY PEImage::GetExportDirectory() const {
              GetImageDirectoryEntryAddr(IMAGE_DIRECTORY_ENTRY_EXPORT));
 }
 
-#endif  // BASE_SRC_PE_IMAGE_H__
+#endif  // BASE_PE_IMAGE_H_
diff --git a/base/perftimer.h b/base/perftimer.h
index 81009dd..6274fee 100644
--- a/base/perftimer.h
+++ b/base/perftimer.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 BASE_PERFTTIMER_H_
-#define BASE_PERFTTIMER_H_
+#ifndef BASE_PERFTIMER_H_
+#define BASE_PERFTIMER_H_
 
 #include <string>
 #include "base/basictypes.h"
@@ -78,4 +78,4 @@ class PerfTimeLogger {
   PerfTimer timer_;
 };
 
-#endif  // BASE_PERFTTIMER_H_
+#endif  // BASE_PERFTIMER_H_
diff --git a/base/scoped_clipboard_writer.h b/base/scoped_clipboard_writer.h
index 16b0de85..85eeacf2 100644
--- a/base/scoped_clipboard_writer.h
+++ b/base/scoped_clipboard_writer.h
@@ -69,4 +69,4 @@ class ScopedClipboardWriter {
   DISALLOW_COPY_AND_ASSIGN(ScopedClipboardWriter);
 };
 
-#endif  // SCOPED_CLIPBOARD_WRITER_H_
+#endif  // BASE_SCOPED_CLIPBOARD_WRITER_H_
diff --git a/base/thread_collision_warner.h b/base/thread_collision_warner.h
index ed75732..509ee5d 100644
--- a/base/thread_collision_warner.h
+++ b/base/thread_collision_warner.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 THREAD_COLLISION_WARNER_H_
-#define THREAD_COLLISION_WARNER_H_
+#ifndef BASE_THREAD_COLLISION_WARNER_H_
+#define BASE_THREAD_COLLISION_WARNER_H_
 
 #include <memory>
 
@@ -239,4 +239,4 @@ class ThreadCollisionWarner {
 
 }  // namespace base
 
-#endif  // THREAD_COLLISION_WARNER_H_
+#endif  // BASE_THREAD_COLLISION_WARNER_H_