Remove "2" suffixes from options2 code.

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

Index: chrome/browser/ui/webui/options2/import_data_handler.h
diff --git a/chrome/browser/ui/webui/options2/import_data_handler2.h b/chrome/browser/ui/webui/options2/import_data_handler.h
similarity index 87%
rename from chrome/browser/ui/webui/options2/import_data_handler2.h
rename to chrome/browser/ui/webui/options2/import_data_handler.h
index 14cc2fbc23553b25aeaf6fa64e28d67704764d0c..4117541f5d18d4673e9e0c92cd747bd9cd6aea92 100644
--- a/chrome/browser/ui/webui/options2/import_data_handler2.h
+++ b/chrome/browser/ui/webui/options2/import_data_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_IMPORT_DATA_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -12,7 +12,7 @@
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/importer_list_observer.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
-#include "chrome/browser/ui/webui/options2/options_ui2.h"
+#include "chrome/browser/ui/webui/options2/options_ui.h"
 
 class ImporterHost;
 class ImporterList;
@@ -61,4 +61,4 @@ class ImportDataHandler : public OptionsPageUIHandler,
 
 }  // namespace options2
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_IMPORT_DATA_HANDLER_H_