Options: Rename options2 namespace to options.

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

Index: chrome/browser/ui/webui/options2/language_options_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/options2/language_options_handler_unittest.cc b/chrome/browser/ui/webui/options2/language_options_handler_unittest.cc
index 560af3cbd52fc103f7cac8b01f0a0767be86cb2e..ec4b3213b6340a9a25d189703cc5254e01ea58f6 100644
--- a/chrome/browser/ui/webui/options2/language_options_handler_unittest.cc
+++ b/chrome/browser/ui/webui/options2/language_options_handler_unittest.cc
@@ -61,7 +61,7 @@ typedef testing::Test LanguageOptionsHandlerTest;
 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());
 
@@ -116,7 +116,7 @@ TEST_F(LanguageOptionsHandlerTest, GetInputMethodList) {
 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());
 
@@ -211,7 +211,7 @@ TEST_F(LanguageOptionsHandlerTest, GetLanguageList) {
 #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.
@@ -221,6 +221,6 @@ TEST_F(LanguageOptionsHandlerTest, GetUILanguageCodeSet) {
 
 TEST_F(LanguageOptionsHandlerTest, GetSpellCheckLanguageCodeSet) {
   scoped_ptr<DictionaryValue> dictionary(
-      options2::LanguageOptionsHandler::GetSpellCheckLanguageCodeSet());
+      options::LanguageOptionsHandler::GetSpellCheckLanguageCodeSet());
   EXPECT_TRUE(dictionary->HasKey("en-US"));
 }