Use chromeos::Process in libchromeos.a instead of g_spawn_async.

chromeos_keyboard.cc

 // Copyright (c) 2010 The Chromium OS 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 "chromeos_keyboard.h"
 
 #include <utility>
 
 #include <X11/XKBlib.h>
 #include <X11/Xlib.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <xkeyboard_config_version.h>
 
 #include "base/logging.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
+#include "chromeos/process.h"
 
 namespace {
 
 // The default keyboard layout name in the xorg config file.
 const char kDefaultLayoutName[] = "us";
 // The command we use to set the current XKB layout and modifier key mapping.
 // TODO(yusukes): Use libxkbfile.so instead of the command (crosbug.com/13105)
 const char kSetxkbmapCommand[] = "/usr/bin/setxkbmap";
 // See the comment at ModifierKey in the .h file.
 chromeos::ModifierKey kCustomizableKeys[] = {
@@ skipping 183 matching lines @@
       chromeos::SetCapsLockEnabled(false);
     }
 
     ExecuteSetLayoutCommand(layouts_to_set);
     return true;
   }
 
   // Executes 'setxkbmap -layout ...' command asynchronously.
   // TODO(yusukes): Use libxkbfile.so instead of the command (crosbug.com/13105)
   void ExecuteSetLayoutCommand(const std::string& layouts_to_set) {
-    gchar* argv[] = {
-      g_strdup(kSetxkbmapCommand), g_strdup("-layout"),
-      g_strdup(layouts_to_set.c_str()), NULL
-    };
+    chromeos::ProcessImpl process;
+    process.AddArg(kSetxkbmapCommand);
+    process.AddStringOption("-layout", layouts_to_set);
+    if (!process.Start()) {
+      LOG(ERROR) << "Failed to execute setxkbmap: " << layouts_to_set;
+      return;
+    }
+    // g_child_watch_add is necessary to prevent the process from becoming a
+    // zombie.
+    g_child_watch_add(process.pid(),
+                      reinterpret_cast<GChildWatchFunc>(OnSetLayoutFinish),
+                      this);
+    process.Release();  // do not kill the setxkbmap process on function exit.
+  }
 
-    const GSpawnFlags flags = static_cast<GSpawnFlags>(
-        G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL);
-    GError* error = NULL;
-    g_spawn_async(NULL,  // working_directory
-                  argv,
-                  NULL,  // envp
-                  flags,
-                  NULL,  // child_setup
-                  NULL,  // user_data
-                  NULL,  // child_pid
-                  &error);
-
-    for (size_t i = 0; argv[i] != NULL; ++i) {
-      g_free(argv[i]);
-    }
-    if (error) {
-      if (error->message) {
-        LOG(ERROR) << "Failed to execute setxkbmap: " << error->message;
-      }
-      g_error_free(error);
-    }
+  static void OnSetLayoutFinish(GPid pid, gint status, XKeyboard* self) {
+    DLOG(INFO) << "OnSetLayoutFinish: pid=" << pid;
   }
 
   // The XKB layout name which we set last time like "us" and "us(dvorak)".
   std::string current_layout_name_;
   // The mapping of modifier keys we set last time.
   chromeos::ModifierMap current_modifier_map_;
 
   DISALLOW_COPY_AND_ASSIGN(XKeyboard);
 };
 
@@ skipping 139 matching lines @@
 // TODO(yusukes): Remove this function.
 extern "C"
 bool ChromeOSGetAutoRepeatRate(chromeos::AutoRepeatRate* out_rate) {
   return XKeyboard::Get()->GetAutoRepeatRate(out_rate);
 }
 
 extern "C"
 bool ChromeOSSetAutoRepeatRate(const chromeos::AutoRepeatRate& rate) {
   return XKeyboard::Get()->SetAutoRepeatRate(rate);
 }