Remove "2" suffixes from options2 code.

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

Index: chrome/browser/ui/webui/options2/web_intents_settings_handler.h
diff --git a/chrome/browser/ui/webui/options2/web_intents_settings_handler2.h b/chrome/browser/ui/webui/options2/web_intents_settings_handler.h
similarity index 94%
rename from chrome/browser/ui/webui/options2/web_intents_settings_handler2.h
rename to chrome/browser/ui/webui/options2/web_intents_settings_handler.h
index 2f2d19accab023ac8ed2fc227cbcae556729d2ae..d6bdd287039b073d2dc9145f319f53d832f6941e 100644
--- a/chrome/browser/ui/webui/options2/web_intents_settings_handler2.h
+++ b/chrome/browser/ui/webui/options2/web_intents_settings_handler.h
@@ -1,15 +1,15 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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_WEB_INTENTS_SETTINGS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_WEB_INTENTS_SETTINGS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_WEB_INTENTS_SETTINGS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_WEB_INTENTS_SETTINGS_HANDLER_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/intents/web_intents_model.h"
-#include "chrome/browser/ui/webui/options2/options_ui2.h"
+#include "chrome/browser/ui/webui/options2/options_ui.h"
 
 class WebIntentsRegistry;
 
@@ -78,4 +78,4 @@ class WebIntentsSettingsHandler : public OptionsPageUIHandler,
 
 }  // namespace options2
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_WEB_INTENTS_SETTINGS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_WEB_INTENTS_SETTINGS_HANDLER_H_