Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/language_options_util.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_CHROMEOS_LANGUAGE_OPTIONS_UTIL_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_OPTIONS_UTIL_H_
 
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace base {
 class ListValue;
 }
 
 namespace chromeos {
-namespace options2 {
+namespace options {
 
 // Returns an i18n-content value corresponding to |preference|.
 template <typename T>
 std::string GetI18nContentValue(const T& preference, const char* prefix) {
   return std::string(prefix) + preference.ibus_config_name;
 }
 
 // Returns a property name of templateData corresponding to |preference|.
 template <typename T>
 std::string GetTemplateDataPropertyName(const T& preference,
@@ skipping 40 matching lines @@
     base::ListValue* option = new base::ListValue();
     option->Append(CreateValue(
         preference.values_and_ids[i].ibus_config_value));
     option->Append(base::Value::CreateStringValue(l10n_util::GetStringUTF16(
         preference.values_and_ids[i].item_message_id)));
     list_value->Append(option);
   }
   return list_value;
 }
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_LANGUAGE_OPTIONS_UTIL_H_