Decouple l10n_util from InputMethodUtil.

chrome/browser/chromeos/input_method/input_method_util_unittest.cc

Index: chrome/browser/chromeos/input_method/input_method_util_unittest.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
index acaa2772b8b2a97554c400e8083fc6a61c78dc9e..6a1e5210ea401012d44b6e2c6536a3d0be6637a8 100644
--- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
@@ -6,11 +6,12 @@
 
 #include <string>
 
+#include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
+#include "chromeos/ime/fake_input_method_delegate.h"
 #include "chromeos/ime/input_method_whitelist.h"
-#include "chromeos/ime/mock_input_method_delegate.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -42,6 +43,10 @@ class InputMethodUtilTest : public testing::Test {
  public:
   InputMethodUtilTest()
       : util_(&delegate_, whitelist_.GetSupportedInputMethods()) {
+    delegate_.set_get_localized_string_callback(
+        base::Bind(&l10n_util::GetStringUTF16));
+    delegate_.set_get_display_language_name_callback(
+        base::Bind(&InputMethodUtilTest::GetDisplayLanguageName));
   }
 
   InputMethodDescriptor GetDesc(const std::string& id,
@@ -55,7 +60,11 @@ class InputMethodUtilTest : public testing::Test {
                                  false);
   }
 
-  MockInputMethodDelegate delegate_;
+  static string16 GetDisplayLanguageName(const std::string& language_code) {
+    return l10n_util::GetDisplayNameForLocale(language_code, "en", true);
+  }
+
+  FakeInputMethodDelegate delegate_;
   InputMethodWhitelist whitelist_;
   TestableInputMethodUtil util_;
 };
@@ -342,11 +351,6 @@ TEST_F(InputMethodUtilTest, TestGetInputMethodDescriptorFromId) {
   EXPECT_EQ("zh-CN", descriptor->language_code());
 }
 
-TEST_F(InputMethodUtilTest, TestGetLanguageNativeDisplayNameFromCode) {
-  EXPECT_EQ(UTF8ToUTF16("suomi"),
-            InputMethodUtil::GetLanguageNativeDisplayNameFromCode("fi"));
-}
-
 TEST_F(InputMethodUtilTest, TestGetInputMethodIdsForLanguageCode) {
   std::multimap<std::string, std::string> language_code_to_ids_map;
   language_code_to_ids_map.insert(std::make_pair("ja", "mozc"));