Remove "2" suffixes from options2 code.

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

Index: chrome/browser/ui/webui/options2/core_options_handler.h
diff --git a/chrome/browser/ui/webui/options2/core_options_handler2.h b/chrome/browser/ui/webui/options2/core_options_handler.h
similarity index 96%
rename from chrome/browser/ui/webui/options2/core_options_handler2.h
rename to chrome/browser/ui/webui/options2/core_options_handler.h
index f8efbe80b0c46cbc5d17d1872cb1dcb19fbe1ed0..4d8112db10f2b279b239a5e5d01912ff4a78c078 100644
--- a/chrome/browser/ui/webui/options2/core_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/core_options_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_CORE_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER_H_
 #pragma once
 
 #include <map>
@@ -13,7 +13,7 @@
 #include "chrome/browser/plugin_status_pref_setter.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/ui/webui/options2/options_ui2.h"
+#include "chrome/browser/ui/webui/options2/options_ui.h"
 
 namespace options2 {
 
@@ -157,4 +157,4 @@ class CoreOptionsHandler : public OptionsPageUIHandler {
 
 }  // namespace options2
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER_H_