Update and stabilize login_ChromeProfileSanitary

client/bin/site_login.py

Index: client/bin/site_login.py
diff --git a/client/bin/site_login.py b/client/bin/site_login.py
index 15fa7862e7048139cb8748f10c9f31d55dae60ca..e6552c92382cafc8a4682af274d2fe31576b8cad 100644
--- a/client/bin/site_login.py
+++ b/client/bin/site_login.py
@@ -225,8 +225,23 @@ def nuke_login_manager():
 
 
 def nuke_process_by_name(name, with_prejudice=False):
-    pid = int(utils.system_output('pgrep -o ^%s$' % name))
+    pid = int(utils.system_output('pgrep -o ^%s$' % name).split()[0])
     if with_prejudice:
         utils.nuke_pid(pid, [signal.SIGKILL])
     else:
         utils.nuke_pid(pid)
+
+
+def refresh_window_manager(timeout=20):
+    """Clear state that tracks what WM has done, kill it, and wait until
+    the window manager is running.
+
+    Args:
+        timeout: float number of seconds to wait
+
+    Raises:
+        TimeoutError: window manager didn't start before timeout
+    """
+    os.unlink(chromeos_constants.CHROME_WINDOW_MAPPED_MAGIC_FILE)
+    utils.system('initctl restart windowmanager')
+    wait_for_window_manager()