Remove the obsolete function, RemoveDummyInputMethod.

Depends on http://codereview.chromium.org/1523019.

BUG=crosbug.com/2403
TEST=ran browser_tests.

Review URL: http://codereview.chromium.org/1519030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44232 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 22 deletions

diff --git a/chrome/browser/chromeos/cros/language_library.cc b/chrome/browser/chromeos/cros/language_library.cc
index 3277b08..712c1a8 100644
--- a/chrome/browser/chromeos/cros/language_library.cc
+++ b/chrome/browser/chromeos/cros/language_library.cc
@@ -113,23 +113,6 @@ void LanguageLibraryImpl::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-namespace {
-
-// Removes "US" input method. Older (v18 and earlier) cros might add the dummy
-// input method to |input_methods|, but we don't need it anymore.
-// TODO(yusukes): Remove this function when we finish migrating to v20.
-void RemoveDummyInputMethod(chromeos::InputMethodDescriptors* input_methods) {
-  chromeos::InputMethodDescriptors::iterator iter;
-  for (iter = input_methods->begin(); iter != input_methods->end(); ++iter) {
-    if ((iter->id == "USA") && (input_methods->size() > 1)) {
-      input_methods->erase(iter);
-      return;
-    }
-  }
-}
-
-}  // namespace
-
 chromeos::InputMethodDescriptors* LanguageLibraryImpl::GetActiveInputMethods() {
   chromeos::InputMethodDescriptors* result = NULL;
   if (EnsureLoadedAndStarted()) {
@@ -138,8 +121,6 @@ chromeos::InputMethodDescriptors* LanguageLibraryImpl::GetActiveInputMethods() {
   if (!result || result->empty()) {
     result = CreateFallbackInputMethodDescriptors();
   }
-  // TODO(yusukes): Remove this hack.
-  RemoveDummyInputMethod(result);
   return result;
 }
 
@@ -152,8 +133,6 @@ LanguageLibraryImpl::GetSupportedInputMethods() {
   if (!result || result->empty()) {
     result = CreateFallbackInputMethodDescriptors();
   }
-  // TODO(yusukes): Remove this hack.
-  RemoveDummyInputMethod(result);
   return result;
 }
 
@@ -247,7 +226,7 @@ bool LanguageLibraryImpl::EnsureStarted() {
             language_status_connection_)) {
       return true;
     }
-    DLOG(WARNING) << "IBus/XKB connection is closed. Trying to reconnect...";
+    DLOG(WARNING) << "IBus connection is closed. Trying to reconnect...";
     chromeos::DisconnectLanguageStatus(language_status_connection_);
   }
   chromeos::LanguageStatusMonitorFunctions monitor_functions;