Remove "2" suffixes from options2 code.

chrome/browser/ui/webui/options2/options_ui.cc

Index: chrome/browser/ui/webui/options2/options_ui.cc
diff --git a/chrome/browser/ui/webui/options2/options_ui2.cc b/chrome/browser/ui/webui/options2/options_ui.cc
similarity index 96%
rename from chrome/browser/ui/webui/options2/options_ui2.cc
rename to chrome/browser/ui/webui/options2/options_ui.cc
index 3042a4f266a58aadc9aa35011190066366eba5c6..7aae5e5ab42fc5b0902ae930c0154c22558018b9 100644
--- a/chrome/browser/ui/webui/options2/options_ui2.cc
+++ b/chrome/browser/ui/webui/options2/options_ui.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/options2/options_ui2.h"
+#include "chrome/browser/ui/webui/options2/options_ui.h"
 
 #include <algorithm>
 #include <vector>
@@ -23,24 +23,24 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "chrome/browser/ui/webui/options2/autofill_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/browser_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/clear_browser_data_handler2.h"
-#include "chrome/browser/ui/webui/options2/content_settings_handler2.h"
-#include "chrome/browser/ui/webui/options2/cookies_view_handler2.h"
-#include "chrome/browser/ui/webui/options2/core_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/font_settings_handler2.h"
-#include "chrome/browser/ui/webui/options2/handler_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/home_page_overlay_handler2.h"
-#include "chrome/browser/ui/webui/options2/import_data_handler2.h"
-#include "chrome/browser/ui/webui/options2/language_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/manage_profile_handler2.h"
+#include "chrome/browser/ui/webui/options2/autofill_options_handler.h"
+#include "chrome/browser/ui/webui/options2/browser_options_handler.h"
+#include "chrome/browser/ui/webui/options2/clear_browser_data_handler.h"
+#include "chrome/browser/ui/webui/options2/content_settings_handler.h"
+#include "chrome/browser/ui/webui/options2/cookies_view_handler.h"
+#include "chrome/browser/ui/webui/options2/core_options_handler.h"
+#include "chrome/browser/ui/webui/options2/font_settings_handler.h"
+#include "chrome/browser/ui/webui/options2/handler_options_handler.h"
+#include "chrome/browser/ui/webui/options2/home_page_overlay_handler.h"
+#include "chrome/browser/ui/webui/options2/import_data_handler.h"
+#include "chrome/browser/ui/webui/options2/language_options_handler.h"
+#include "chrome/browser/ui/webui/options2/manage_profile_handler.h"
 #include "chrome/browser/ui/webui/options2/media_gallery_handler.h"
 #include "chrome/browser/ui/webui/options2/options_sync_setup_handler.h"
-#include "chrome/browser/ui/webui/options2/password_manager_handler2.h"
-#include "chrome/browser/ui/webui/options2/search_engine_manager_handler2.h"
-#include "chrome/browser/ui/webui/options2/startup_pages_handler2.h"
-#include "chrome/browser/ui/webui/options2/web_intents_settings_handler2.h"
+#include "chrome/browser/ui/webui/options2/password_manager_handler.h"
+#include "chrome/browser/ui/webui/options2/search_engine_manager_handler.h"
+#include "chrome/browser/ui/webui/options2/startup_pages_handler.h"
+#include "chrome/browser/ui/webui/options2/web_intents_settings_handler.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/time_format.h"
@@ -63,31 +63,31 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
-#include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler.h"
 #include "chrome/browser/ui/webui/options2/chromeos/display_options_handler.h"
-#include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/keyboard_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/pointer_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/proxy_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h"
-#include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/keyboard_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/pointer_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/proxy_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/user_image_source.h"
+#include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source.h"
 #endif
 
 #if defined(OS_CHROMEOS) && defined(USE_ASH)
-#include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h"
 #endif
 
 #if defined(USE_NSS)
-#include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h"
+#include "chrome/browser/ui/webui/options2/certificate_manager_handler.h"
 #endif
 
 using content::RenderViewHost;