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

9 files changed, 24 insertions, 24 deletions

diff --git a/chrome/browser/password_manager/ie7_password.h b/chrome/browser/password_manager/ie7_password.h
index 44ff972..91c81ab 100644
--- a/chrome/browser/password_manager/ie7_password.h
+++ b/chrome/browser/password_manager/ie7_password.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_IE7_PASSWORD_H__
-#define CHROME_BROWSER_IE7_PASSWORD_H__
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_IE7_PASSWORD_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_IE7_PASSWORD_H_
 
 #include <windows.h>
 #include <string>
@@ -43,4 +43,4 @@ std::wstring GetUrlHash(const std::wstring& url);
 
 }  // namespace ie7_password
 
-#endif  // CHROME_BROWSER_IE7_PASSWORD_H__
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_IE7_PASSWORD_H_
diff --git a/chrome/browser/password_manager/password_form_manager.h b/chrome/browser/password_manager/password_form_manager.h
index 058d4d6..fe6ceee 100644
--- a/chrome/browser/password_manager/password_form_manager.h
+++ b/chrome/browser/password_manager/password_form_manager.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_PASSWORD_FORM_MANAGER_H__
-#define CHROME_BROWSER_PASSWORD_FORM_MANAGER_H__
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_
 
 #include "build/build_config.h"
 
@@ -160,4 +160,4 @@ class PasswordFormManager : public PasswordStoreConsumer {
 
   DISALLOW_EVIL_CONSTRUCTORS(PasswordFormManager);
 };
-#endif  // CHROME_BROWSER_PASSWORD_FORM_MANAGER_H__
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_
diff --git a/chrome/browser/password_manager/password_form_manager_win.cc b/chrome/browser/password_manager/password_form_manager_win.cc
deleted file mode 100644
index e69de29..0000000
--- a/chrome/browser/password_manager/password_form_manager_win.cc
+++ /dev/null
diff --git a/chrome/browser/password_manager/password_manager.h b/chrome/browser/password_manager/password_manager.h
index 085366f..285b459 100644
--- a/chrome/browser/password_manager/password_manager.h
+++ b/chrome/browser/password_manager/password_manager.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_PASSWORD_MANAGER_H__
-#define CHROME_BROWSER_PASSWORD_MANAGER_H__
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_H_
 
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
@@ -101,4 +101,4 @@ class PasswordManager : public LoginModel {
   DISALLOW_EVIL_CONSTRUCTORS(PasswordManager);
 };
 
-#endif
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_H_
diff --git a/chrome/browser/password_manager/password_store.h b/chrome/browser/password_manager/password_store.h
index 5749824..193a8a6 100644
--- a/chrome/browser/password_manager/password_store.h
+++ b/chrome/browser/password_manager/password_store.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_PASSWORD_MANAGER_PASSWORD_STORE
-#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_H_
 
 #include <set>
 #include <vector>
@@ -145,4 +145,4 @@ class PasswordStore : public base::RefCountedThreadSafe<PasswordStore> {
   DISALLOW_COPY_AND_ASSIGN(PasswordStore);
 };
 
-#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_H_
diff --git a/chrome/browser/password_manager/password_store_default.h b/chrome/browser/password_manager/password_store_default.h
index 6b93481..2c26a7b 100644
--- a/chrome/browser/password_manager/password_store_default.h
+++ b/chrome/browser/password_manager/password_store_default.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_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT
-#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT_H_
 
 #include <map>
 
@@ -88,4 +88,4 @@ class PasswordStoreDefault : public PasswordStore,
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreDefault);
 };
 
-#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT_H_
diff --git a/chrome/browser/password_manager/password_store_gnome.h b/chrome/browser/password_manager/password_store_gnome.h
index efaafc0..f448ad1 100644
--- a/chrome/browser/password_manager/password_store_gnome.h
+++ b/chrome/browser/password_manager/password_store_gnome.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_PASSWORD_MANAGER_PASSWORD_STORE_GNOME
-#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_GNOME
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_GNOME_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_GNOME_H_
 
 extern "C" {
 #include <gnome-keyring.h>
@@ -38,4 +38,4 @@ class PasswordStoreGnome : public PasswordStore {
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreGnome);
 };
 
-#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_GNOME
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_GNOME_H_
diff --git a/chrome/browser/password_manager/password_store_kwallet.h b/chrome/browser/password_manager/password_store_kwallet.h
index b60d374..317cbdb 100644
--- a/chrome/browser/password_manager/password_store_kwallet.h
+++ b/chrome/browser/password_manager/password_store_kwallet.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_PASSWORD_MANAGER_PASSWORD_STORE_KWALLET
-#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_KWALLET
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_KWALLET_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_KWALLET_H_
 
 #include <dbus/dbus-glib.h>
 #include <glib.h>
@@ -109,4 +109,4 @@ class PasswordStoreKWallet : public PasswordStore {
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreKWallet);
 };
 
-#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_KWALLET
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_KWALLET_H_
diff --git a/chrome/browser/password_manager/password_store_win.h b/chrome/browser/password_manager/password_store_win.h
index 7a11dae..924fc07 100644
--- a/chrome/browser/password_manager/password_store_win.h
+++ b/chrome/browser/password_manager/password_store_win.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_PASSWORD_MANAGER_PASSWORD_STORE_WIN
-#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN_H_
 
 #include <map>
 #include <vector>
@@ -55,4 +55,4 @@ class PasswordStoreWin : public PasswordStoreDefault {
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreWin);
 };
 
-#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN_H_