Fixes almost all of the rest of lint errors in the chrome/ directory (minus the really hard ones which will need actual review instead of rubber-stamping.)

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

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

8 files changed, 19 insertions, 18 deletions

diff --git a/chrome/installer/gcapi/gcapi.h b/chrome/installer/gcapi/gcapi.h
index 8c6f74a..d5ec020 100644
--- a/chrome/installer/gcapi/gcapi.h
+++ b/chrome/installer/gcapi/gcapi.h
@@ -50,4 +50,4 @@ typedef BOOL (__stdcall * GCCC_LaunchGC)(HANDLE *);
 typedef BOOL (__stdcall * GCCC_LaunchGCWithDimensions)(int, int, int, int);
 }  // extern "C"
 
-#endif  // # CHROME_INSTALLER_GCAPI_GCAPI_H_
+#endif  // CHROME_INSTALLER_GCAPI_GCAPI_H_
diff --git a/chrome/installer/mini_installer/mini_installer.h b/chrome/installer/mini_installer/mini_installer.h
index 9cce8d2..45dc09b 100644
--- a/chrome/installer/mini_installer/mini_installer.h
+++ b/chrome/installer/mini_installer/mini_installer.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_INSTALLER_MINI_INSTALLER_
-#define CHROME_INSTALLER_MINI_INSTALLER_
+#ifndef CHROME_INSTALLER_MINI_INSTALLER_MINI_INSTALLER_H_
+#define CHROME_INSTALLER_MINI_INSTALLER_MINI_INSTALLER_H_
 
 // The windows command line to uncompress a LZ compressed file. It is a define
 // because we need the string to be writable. We don't need the full path
@@ -64,4 +64,5 @@ const wchar_t kManifestFilename[] = L"packed_files.txt";
 
 }  // namespace mini_installer
 
-#endif  // CHROME_INSTALLER_MINI_INSTALLER_
+#endif  // CHROME_INSTALLER_MINI_INSTALLER_MINI_INSTALLER_H_
+
diff --git a/chrome/installer/mini_installer/pe_resource.h b/chrome/installer/mini_installer/pe_resource.h
index 1f4dbac..288bdfc 100644
--- a/chrome/installer/mini_installer/pe_resource.h
+++ b/chrome/installer/mini_installer/pe_resource.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_INSTALLER_MINI_INSTALLER_PE_RESOURCE_
-#define CHROME_INSTALLER_MINI_INSTALLER_PE_RESOURCE_
+#ifndef CHROME_INSTALLER_MINI_INSTALLER_PE_RESOURCE_H_
+#define CHROME_INSTALLER_MINI_INSTALLER_PE_RESOURCE_H_
 
 #include <windows.h>
 
@@ -38,4 +38,4 @@ class PEResource {
   HMODULE module_;
 };
 
-#endif  // CHROME_INSTALLER_MINI_INSTALLER_PE_RESOURCE_
+#endif  // CHROME_INSTALLER_MINI_INSTALLER_PE_RESOURCE_H_
diff --git a/chrome/installer/setup/setup_util.h b/chrome/installer/setup/setup_util.h
index 3f646db..a2f1ee9 100644
--- a/chrome/installer/setup/setup_util.h
+++ b/chrome/installer/setup/setup_util.h
@@ -23,7 +23,7 @@ namespace setup_util {
   // distribution related install options. Merge them if any command line
   // options present (command line value takes precedence).
   DictionaryValue* GetInstallPreferences(const CommandLine& cmd_line);
-                     
+
   // Find the version of Chrome from an install source directory.
   // Chrome_path should contain a version folder.
   // Returns the first version found or NULL if no version is found.
diff --git a/chrome/installer/util/helper.h b/chrome/installer/util/helper.h
index afbbf17..132d718 100644
--- a/chrome/installer/util/helper.h
+++ b/chrome/installer/util/helper.h
@@ -4,8 +4,8 @@
 //
 // This file contains helper functions used by setup.
 
-#ifndef CHROME_INSTALLER_UTIL_HELPER_H__
-#define CHROME_INSTALLER_UTIL_HELPER_H__
+#ifndef CHROME_INSTALLER_UTIL_HELPER_H_
+#define CHROME_INSTALLER_UTIL_HELPER_H_
 
 #include <string>
 
@@ -47,4 +47,4 @@ void RemoveOldVersionDirs(const std::wstring& chrome_path,
 
 }  // namespace installer
 
-#endif
+#endif  // CHROME_INSTALLER_UTIL_HELPER_H_
diff --git a/chrome/installer/util/logging_installer.h b/chrome/installer/util/logging_installer.h
index b14c2a3..336d0c4 100644
--- a/chrome/installer/util/logging_installer.h
+++ b/chrome/installer/util/logging_installer.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_INSTALLER_LOGGING_INSTALLER_H__
-#define CHROME_INSTALLER_LOGGING_INSTALLER_H__
+#ifndef CHROME_INSTALLER_UTIL_LOGGING_INSTALLER_H_
+#define CHROME_INSTALLER_UTIL_LOGGING_INSTALLER_H_
 
 #include <string>
 
@@ -24,4 +24,4 @@ std::wstring GetLogFilePath(const CommandLine& command_line);
 
 } // namespace installer
 
-#endif
+#endif  // CHROME_INSTALLER_UTIL_LOGGING_INSTALLER_H_
diff --git a/chrome/installer/util/lzma_util.h b/chrome/installer/util/lzma_util.h
index e680444..01bd29e 100644
--- a/chrome/installer/util/lzma_util.h
+++ b/chrome/installer/util/lzma_util.h
@@ -14,7 +14,7 @@
 class LzmaUtil {
  public:
   // Utility method that does the job of calling OpenArchive(), UnPack()
-  // and CloseArchive() in order. Returns error code (NO_ERROR if successful). 
+  // and CloseArchive() in order. Returns error code (NO_ERROR if successful).
   static int32 UnPackArchive(const std::wstring& archive,
                              const std::wstring& output_dir,
                              std::wstring* output_file);
diff --git a/chrome/installer/util/version.h b/chrome/installer/util/version.h
index 8bbabce..1f02e00 100644
--- a/chrome/installer/util/version.h
+++ b/chrome/installer/util/version.h
@@ -12,7 +12,7 @@
 namespace installer {
 
 class Version {
-public:
+ public:
   virtual ~Version();
 
   // Check if the current version is higher than the version object passed
@@ -29,7 +29,7 @@ public:
   // Caller is responsible for freeing the Version object once done.
   static Version* GetVersionFromString(const std::wstring& version_str);
 
-private:
+ private:
   int64 major_;
   int64 minor_;
   int64 build_;
@@ -43,4 +43,4 @@ private:
 
 }  // namespace installer
 
-#endif
+#endif  // CHROME_INSTALLER_UTIL_VERSION_H_