Remove "2" suffixes from options2 code.

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

-// 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;
 
 namespace options2 {
 
 // Manage setting up the backing data for the web intents options page.
 class WebIntentsSettingsHandler : public OptionsPageUIHandler,
                                   public WebIntentsModel::Observer {
  public:
   WebIntentsSettingsHandler();
@@ skipping 48 matching lines @@
   scoped_ptr<WebIntentsModel> intents_tree_model_;
 
   // Flag to indicate whether there is a batch update in progress.
   bool batch_update_;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentsSettingsHandler);
 };
 
 }  // namespace options2
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_WEB_INTENTS_SETTINGS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_WEB_INTENTS_SETTINGS_HANDLER_H_