Remove "2" suffixes from options2 code.

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

Index: chrome/browser/ui/webui/options2/browser_options_handler.h
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.h b/chrome/browser/ui/webui/options2/browser_options_handler.h
similarity index 99%
rename from chrome/browser/ui/webui/options2/browser_options_handler2.h
rename to chrome/browser/ui/webui/options2/browser_options_handler.h
index f55ba5a23677426924b799f94e24699c5e3f7047..4431d675437fb3ddabf752c4977739aaaaac526f 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/browser_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_BROWSER_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
@@ -15,7 +15,7 @@
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/ui/select_file_dialog.h"
-#include "chrome/browser/ui/webui/options2/options_ui2.h"
+#include "chrome/browser/ui/webui/options2/options_ui.h"
 #include "ui/base/models/table_model_observer.h"
 
 #if defined(OS_CHROMEOS)
@@ -325,4 +325,4 @@ class BrowserOptionsHandler
 
 }  // namespace options2
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER_H_