Decouple l10n_util from InputMethodUtil.

chromeos/ime/mock_input_method_delegate.h

Index: chromeos/ime/mock_input_method_delegate.h
diff --git a/chromeos/ime/mock_input_method_delegate.h b/chromeos/ime/mock_input_method_delegate.h
index f7f2be94b205253c26896beae44acdf6d92a37e0..9a8d90d6c77dd203b2dab7dffa114189b4a878c4 100644
--- a/chromeos/ime/mock_input_method_delegate.h
+++ b/chromeos/ime/mock_input_method_delegate.h
@@ -6,6 +6,7 @@
 #define CHROMEOS_IME_MOCK_INPUT_METHOD_DELEGATE_H_
 
 #include "base/basictypes.h"
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/ime/input_method_delegate.h"
@@ -15,12 +16,19 @@ namespace input_method {
 
 class CHROMEOS_EXPORT MockInputMethodDelegate : public InputMethodDelegate {

[satorux1, 2013/04/18 06:09:26]

Rename this to FakeInputMethodDelegate? This class doesn't seem to be used for
interaction-based (expectation-based) tests.

[Seigo Nonaka, 2013/04/18 11:50:59]

Sure, Done.
On 2013/04/18 06:09:26, satorux1 wrote:

  public:
+  typedef base::Callback<string16 (const std::string& language_code)>
+      LanguageNameLocalizationCallback;
+  typedef base::Callback<string16 (int resource_id)>
+      GetLocalizedStringCallback;
+
   MockInputMethodDelegate();
   virtual ~MockInputMethodDelegate();
 
   // InputMethodDelegate implementation:
   virtual std::string GetHardwareKeyboardLayout() const OVERRIDE;
-  virtual std::string GetActiveLocale() const OVERRIDE;
+  virtual string16 GetLocalizedString(int resource_id) const OVERRIDE;
+  virtual string16 GetDisplayLanguageName(
+      const std::string& language_code) const OVERRIDE;
 
   void set_hardware_keyboard_layout(const std::string& value) {
     hardware_keyboard_layout_ = value;
@@ -30,9 +38,21 @@ class CHROMEOS_EXPORT MockInputMethodDelegate : public InputMethodDelegate {
     active_locale_ = value;
   }
 
+  void set_get_display_language_name_callback(
+      const LanguageNameLocalizationCallback& callback) {
+    get_display_language_name_callback_ = callback;
+  }
+
+  void set_get_localized_string_callback(
+      const GetLocalizedStringCallback& callback) {
+    get_localized_string_callback_ = callback;
+  }
+
  private:
   std::string hardware_keyboard_layout_;
   std::string active_locale_;
+  LanguageNameLocalizationCallback get_display_language_name_callback_;
+  GetLocalizedStringCallback get_localized_string_callback_;
   DISALLOW_COPY_AND_ASSIGN(MockInputMethodDelegate);
 };