Change google3 sync scripts to sync latest rather than LKGR.

tools/sync_google3.sh

Index: tools/sync_google3.sh
diff --git a/tools/sync_google3.sh b/tools/sync_google3.sh
index 1d330ec573d34000feec04d04db2805d041a39ec..7978f1986349fd24468e0e337d5a39b387d5c99d 100755
--- a/tools/sync_google3.sh
+++ b/tools/sync_google3.sh
@@ -4,9 +4,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Syncs //depot/google3/third_party/skia/HEAD to the last known good revision of
-# Skia. If this script is not run from a Piper client, creates a new CitC
-# client. Also updates README.google.
+# Syncs //depot/google3/third_party/skia/HEAD to the latest revision of Skia.
+# If this script is not run from a Piper client, creates a new CitC client. Also
+# updates README.google.
 #
 # Usage:
 #      ./tools/sync_google3.sh
@@ -17,7 +17,7 @@ source gbash.sh || exit 2
 set -e
 
 MY_DIR="$(gbash::get_absolute_caller_dir)"
-LKGR="$(${MY_DIR}/get_skia_lkgr.sh)"
+SKIA_REV="$(git ls-remote https://skia.googlesource.com/skia refs/heads/master | cut -f 1)"
 
 gbash::get_google3_dir && GOOGLE3="$(gbash::get_google3_dir)"
 if [ -z "${GOOGLE3}" ]; then
@@ -26,20 +26,20 @@ if [ -z "${GOOGLE3}" ]; then
   GOOGLE3="/google/src/cloud/${USER}/${CLIENT_NAME}/google3"
 fi
 cd "${GOOGLE3}/third_party/skia/HEAD"
-${MY_DIR}/git_clone_to_google3.sh --skia_rev "${LKGR}"
+${MY_DIR}/git_clone_to_google3.sh --skia_rev "${SKIA_REV}"
 
-echo "Synced client ${CLIENT_NAME} to ${LKGR}"
+echo "Synced client ${CLIENT_NAME} to ${SKIA_REV}"
 
 # Update README.google.
-sed --in-place "s/^Version: .*/Version: ${LKGR}/" README.google
-sed --in-place "s/URL: http:\/\/skia.googlesource.com\/skia\/+archive\/.*\.tar\.gz/URL: http:\/\/skia.googlesource.com\/skia\/+archive\/${LKGR}.tar.gz/" README.google
+sed --in-place "s/^Version: .*/Version: ${SKIA_REV}/" README.google
+sed --in-place "s/URL: http:\/\/skia.googlesource.com\/skia\/+archive\/.*\.tar\.gz/URL: http:\/\/skia.googlesource.com\/skia\/+archive\/${SKIA_REV}.tar.gz/" README.google
 CURRENT_DATE=`date '+%d %B %Y'`
 echo "Updated using sync_google3.sh on $CURRENT_DATE by $USER@google.com" >> README.google
 
 # Add README.google to the default change.
 g4 reopen
 # Create a new CL.
-CHANGE="$(g4 change --desc "Update skia HEAD to ${LKGR}.")"
+CHANGE="$(g4 change --desc "Update skia HEAD to ${SKIA_REV}.")"
 CL="$(echo "${CHANGE}" | sed "s/Change \([0-9]\+\) created.*/\1/")"
 
 echo "Created CL ${CL} (http://cl/${CL})"