Remove "2" suffixes from options2 code.

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

Index: chrome/browser/ui/webui/options2/handler_options_handler.h
diff --git a/chrome/browser/ui/webui/options2/handler_options_handler2.h b/chrome/browser/ui/webui/options2/handler_options_handler.h
similarity index 97%
rename from chrome/browser/ui/webui/options2/handler_options_handler2.h
rename to chrome/browser/ui/webui/options2/handler_options_handler.h
index 911c477d10c4f28700572bb9206dd9e5c1728395..3a2f89b9a023a1f53ad05f05a7977bcdf89204e6 100644
--- a/chrome/browser/ui/webui/options2/handler_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/handler_options_handler.h
@@ -2,13 +2,13 @@
 // 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_HANDLER_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_HANDLER_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_HANDLER_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_HANDLER_OPTIONS_HANDLER_H_
 
 #include <string>
 
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
-#include "chrome/browser/ui/webui/options2/options_ui2.h"
+#include "chrome/browser/ui/webui/options2/options_ui.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
 #include "content/public/browser/notification_registrar.h"
 
@@ -85,4 +85,4 @@ class HandlerOptionsHandler : public OptionsPageUIHandler {
 
 }  // namespace options2
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_HANDLER_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_HANDLER_OPTIONS_HANDLER_H_