Remove "2" suffixes from options2 code.

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

Index: chrome/browser/ui/webui/options2/autofill_options_handler.h
diff --git a/chrome/browser/ui/webui/options2/autofill_options_handler2.h b/chrome/browser/ui/webui/options2/autofill_options_handler.h
similarity index 97%
rename from chrome/browser/ui/webui/options2/autofill_options_handler2.h
rename to chrome/browser/ui/webui/options2/autofill_options_handler.h
index 1a4a96ff804e1cd2335475db8cb00f9140c21e54..16b65f0b5471cbde6a8e9d77531a92b866c7e950 100644
--- a/chrome/browser/ui/webui/options2/autofill_options_handler2.h
+++ b/chrome/browser/ui/webui/options2/autofill_options_handler.h
@@ -2,14 +2,14 @@
 // 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_AUTOFILL_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_AUTOFILL_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_AUTOFILL_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_AUTOFILL_OPTIONS_HANDLER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/autofill/personal_data_manager_observer.h"
-#include "chrome/browser/ui/webui/options2/options_ui2.h"
+#include "chrome/browser/ui/webui/options2/options_ui.h"
 
 class PersonalDataManager;
 
@@ -94,4 +94,4 @@ class AutofillOptionsHandler : public OptionsPageUIHandler,
 
 }  // namespace options2
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_AUTOFILL_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_AUTOFILL_OPTIONS_HANDLER_H_