Cleanup and merge autotest wrappers.

src/scripts/remote_access.sh

Index: src/scripts/remote_access.sh
diff --git a/src/scripts/remote_access.sh b/src/scripts/remote_access.sh
index de44ac45ad73c47e526b167c7748ce760c4c5a1b..45a27f09adfa960a8d82f4b966d0325ac14c65af 100644
--- a/src/scripts/remote_access.sh
+++ b/src/scripts/remote_access.sh
@@ -4,17 +4,15 @@
 
 # Library for setting up remote access and running remote commands.
 
-DEFAULT_PRIVATE_KEY="$SRC_ROOT/platform/testing/testing_rsa"
+DEFAULT_PRIVATE_KEY="${GCLIENT_ROOT}/scripts/mod_for_test_scripts/ssh_keys/\
+testing_rsa"
 
 DEFINE_string remote "" "remote hostname/IP of running Chromium OS instance"
 DEFINE_string private_key "$DEFAULT_PRIVATE_KEY" \
   "Private key of root account on remote host"
 
 function remote_sh() {
-  # Disable strict host checking so that we don't prompt the user when
-  # the host key file is removed and just go ahead and add it.
-  REMOTE_OUT=$(ssh -o StrictHostKeyChecking=no -o \
-    UserKnownHostsFile=$TMP_KNOWN_HOSTS root@$FLAGS_remote "$@")
+  REMOTE_OUT=$(ssh root@$FLAGS_remote "$@")
   return ${PIPESTATUS[0]}
 }
 
@@ -25,7 +23,7 @@ function remote_sh_allow_changed_host_key() {
 
 function set_up_remote_access() {
   if [ -z "$SSH_AGENT_PID" ]; then
-    eval `ssh-agent`
+    eval $(ssh-agent)
   fi
   cp $FLAGS_private_key $TMP_PRIVATE_KEY
   chmod 0400 $TMP_PRIVATE_KEY