cleanup: Use the new libcros API StopInputMethodProcess() to terminate ibus-daemon instead of kill()

chrome/browser/chromeos/cros/input_method_library.cc

 // Copyright (c) 2010 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/chromeos/cros/input_method_library.h"
 
 #include <glib.h>
 #include <signal.h>
 
 #include "unicode/uloc.h"
@@ skipping 560 matching lines @@
   void StopInputMethodProcesses() {
     should_launch_ime_ = false;
     if (ibus_daemon_process_id_) {
       const std::string xkb_engine_name =
           chromeos::GetHardwareKeyboardLayoutName();
       // We should not use chromeos::ChangeInputMethod() here since without the
       // ibus-daemon process, ChangeCurrentInputMethod() callback function which
       // actually changes the XKB layout will not be called.
       CrosLibrary::Get()->GetKeyboardLibrary()->SetCurrentKeyboardLayoutByName(
           chromeos::input_method::GetKeyboardLayoutName(xkb_engine_name));
-      kill(ibus_daemon_process_id_, SIGTERM);
+      if (!chromeos::StopInputMethodProcess(input_method_status_connection_)) {
+        LOG(ERROR) << "StopInputMethodProcess IPC failed. Sending SIGTERM to "
+                   << "PID " << ibus_daemon_process_id_;
+        kill(ibus_daemon_process_id_, SIGTERM);
+      }
+      LOG(INFO) << "ibus-daemon (PID=" << ibus_daemon_process_id_ << ") is "

[satorux1, 2011/01/11 07:02:30]

Use of LOG(INFO) is discouraged. VLOG(1) would be nicer.

[Yusuke Sato, 2011/01/11 07:51:01]

Done.

+                << "terminated";
       ibus_daemon_process_id_ = 0;
     }
     if (candidate_window_process_id_) {
       kill(candidate_window_process_id_, SIGTERM);
+      LOG(INFO) << "candidate_window (PID=" << candidate_window_process_id_

[satorux1, 2011/01/11 07:02:30]

ditto

[Yusuke Sato, 2011/01/11 07:51:01]

Done.

+                << ") is terminated";
       candidate_window_process_id_ = 0;
     }
   }
 
   void SetDeferImeStartup(bool defer) {
     VLOG(1) << "Setting DeferImeStartup to " << defer;
     defer_ime_startup_ = defer;
   }
 
   void SetEnableAutoImeShutdown(bool enable) {
@@ skipping 274 matching lines @@
     return new InputMethodLibraryStubImpl();
   else
     return new InputMethodLibraryImpl();
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::InputMethodLibraryImpl);