Remove "2" suffixes from options2 code.

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

 // 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_CORE_OPTIONS_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER2_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER_H_
 #pragma once
 
 #include <map>
 #include <string>
 
 #include "base/values.h"
 #include "chrome/browser/plugin_status_pref_setter.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/ui/webui/options2/options_ui2.h"
+#include "chrome/browser/ui/webui/options2/options_ui.h"
 
 namespace options2 {
 
 // Core options UI handler.
 // Handles resource and JS calls common to all options sub-pages.
 class CoreOptionsHandler : public OptionsPageUIHandler {
  public:
   CoreOptionsHandler();
   virtual ~CoreOptionsHandler();
 
@@ skipping 123 matching lines @@
   OptionsPageUIHandlerHost* handlers_host_;
   PrefChangeRegistrar registrar_;
 
   PluginStatusPrefSetter plugin_status_pref_setter_;
 
   DISALLOW_COPY_AND_ASSIGN(CoreOptionsHandler);
 };
 
 }  // namespace options2
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER2_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CORE_OPTIONS_HANDLER_H_