Remove "2" suffixes from options2 code.

chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.cc

Index: chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.cc
diff --git a/chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.cc
similarity index 96%
rename from chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.cc
rename to chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.cc
index 8887d5194d6f9e1bece9f474f7b34ed0e5f7d9f1..785715b54d2f1f366230015a05a7aa05833e7741 100644
--- a/chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.cc
@@ -1,14 +1,14 @@
-// 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.
 
-#include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/ui/webui/options2/chromeos/language_options_util2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/language_options_util.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"