Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/language_options_handler_unittest.cc

 // 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/language_options_handler.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 43 matching lines @@
 
 }  // namespace
 #else
 typedef testing::Test LanguageOptionsHandlerTest;
 #endif
 
 #if defined(OS_CHROMEOS)
 TEST_F(LanguageOptionsHandlerTest, GetInputMethodList) {
   InputMethodDescriptors descriptors = CreateInputMethodDescriptors();
   scoped_ptr<ListValue> list(
-      chromeos::options2::CrosLanguageOptionsHandler::GetInputMethodList(
+      chromeos::options::CrosLanguageOptionsHandler::GetInputMethodList(
           descriptors));
   ASSERT_EQ(4U, list->GetSize());
 
   DictionaryValue* entry = NULL;
   DictionaryValue *language_code_set = NULL;
   std::string input_method_id;
   std::string display_name;
   std::string language_code;
 
   // As shown below, the list should be input method ids should appear in
@@ skipping 34 matching lines @@
   ASSERT_TRUE(entry->GetDictionary("languageCodeSet", &language_code_set));
   EXPECT_EQ("mozc", input_method_id);
   // Commented out. See above.
   // EXPECT_EQ("Japanese input method (for US keyboard)", display_name);
   ASSERT_TRUE(language_code_set->HasKey("ja"));
 }
 
 TEST_F(LanguageOptionsHandlerTest, GetLanguageList) {
   InputMethodDescriptors descriptors = CreateInputMethodDescriptors();
   scoped_ptr<ListValue> list(
-      chromeos::options2::CrosLanguageOptionsHandler::GetLanguageList(
+      chromeos::options::CrosLanguageOptionsHandler::GetLanguageList(
           descriptors));
   ASSERT_EQ(9U, list->GetSize());
 
   DictionaryValue* entry = NULL;
   std::string language_code;
   std::string display_name;
   std::string native_display_name;
 
   // As shown below, the list should be sorted by the display names,
   // and these names should not have duplicates.
@@ skipping 74 matching lines @@
   ASSERT_TRUE(entry->GetString("nativeDisplayName", &native_display_name));
   EXPECT_EQ("es-419", language_code);
   EXPECT_EQ("Spanish (Latin America)", display_name);
   EXPECT_EQ("espa\u00F1ol (Latinoam\u00E9rica)", native_display_name);
 }
 #endif  // defined(OS_CHROMEOS)
 
 #if !defined(OS_MACOSX)
 TEST_F(LanguageOptionsHandlerTest, GetUILanguageCodeSet) {
   scoped_ptr<DictionaryValue> dictionary(
-      options2::LanguageOptionsHandler::GetUILanguageCodeSet());
+      options::LanguageOptionsHandler::GetUILanguageCodeSet());
   EXPECT_TRUE(dictionary->HasKey("en-US"));
   // Note that we don't test a false case, as such an expectation will
   // fail when we add support for the language.
   // EXPECT_FALSE(dictionary->HasKey("no"));
 }
 #endif  // !defined(OS_MACOSX)
 
 TEST_F(LanguageOptionsHandlerTest, GetSpellCheckLanguageCodeSet) {
   scoped_ptr<DictionaryValue> dictionary(
-      options2::LanguageOptionsHandler::GetSpellCheckLanguageCodeSet());
+      options::LanguageOptionsHandler::GetSpellCheckLanguageCodeSet());
   EXPECT_TRUE(dictionary->HasKey("en-US"));
 }