Remove "2" suffixes from options2 code.

chrome/browser/ui/webui/options2/password_manager_handler.h

Index: chrome/browser/ui/webui/options2/password_manager_handler.h
diff --git a/chrome/browser/ui/webui/options2/password_manager_handler2.h b/chrome/browser/ui/webui/options2/password_manager_handler.h
similarity index 98%
rename from chrome/browser/ui/webui/options2/password_manager_handler2.h
rename to chrome/browser/ui/webui/options2/password_manager_handler.h
index df382c7afa823fa974781ed89c7f3cbad0a212c4..b6e58778dfd68ad7444a5917e90325ec58ed7ff5 100644
--- a/chrome/browser/ui/webui/options2/password_manager_handler2.h
+++ b/chrome/browser/ui/webui/options2/password_manager_handler.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_UI_WEBUI_OPTIONS2_PASSWORD_MANAGER_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_PASSWORD_MANAGER_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_PASSWORD_MANAGER_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_PASSWORD_MANAGER_HANDLER_H_
 
 #include <string>
 #include <vector>
@@ -12,7 +12,7 @@
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/password_manager/password_store_consumer.h"
 #include "chrome/browser/prefs/pref_member.h"
-#include "chrome/browser/ui/webui/options2/options_ui2.h"
+#include "chrome/browser/ui/webui/options2/options_ui.h"
 
 namespace webkit {
 namespace forms {
@@ -136,4 +136,4 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
 
 }  // namespace options2
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_PASSWORD_MANAGER_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_PASSWORD_MANAGER_HANDLER_H_