[chrome-devtools-frontend] Use full Chromium checkout

gce/uploader_iteration.sh

Index: gce/uploader_iteration.sh
diff --git a/gce/uploader_iteration.sh b/gce/uploader_iteration.sh
index 4ad8c4fbf3b2c68ddcac922ee60967894b0a7900..a9ac7412e8c6d37bcf9ee10d533ca29ce9c85dfa 100755
--- a/gce/uploader_iteration.sh
+++ b/gce/uploader_iteration.sh
@@ -12,18 +12,33 @@ mark_step() {
   echo '====================='
 }
 
+unlock_git_repo() {
+  local git_index_lock=".git/index.lock"
+  if [ -e "$git_index_lock" ]; then
+    # Can be left over from an interrupted iteration.
+    # Safe to remove unless someone is trying to run two iterations in parallel.
+    echo "!!! Warning: removing Git index lock in $1 repo !!!"
+    rm -f "$git_index_lock"
+  fi
+}
+
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 mark_step 'Moving to the source code directory'
-SOURCE_DIR=/uploader/src
+SOURCE_DIR=/uploader/src/chrome
 cd "$SOURCE_DIR"
 
+mark_step 'Updating chromium'
+unlock_git_repo Chromium || exit $EXIT_CHROMIUM_UPDATE
+git reset --hard master || exit $EXIT_CHROMIUM_UPDATE
+git pull || exit $EXIT_CHROMIUM_UPDATE
+CHROMIUM_GYP_REVISION="$(cat DEPS | $SCRIPT_DIR/uploader_helper.py --find_project_revision='src/tools/gyp')"
+
 mark_step 'Updating gyp'
-pushd gyp
-CHROMIUM_DEPS=$(curl -fsS http://src.chromium.org/chrome/trunk/src/DEPS) || exit $EXIT_GYP_UPDATE
-CHROMIUM_GYP_REVISION="$(echo "$CHROMIUM_DEPS" | $SCRIPT_DIR/uploader_helper.py --find_project_revision='src/tools/gyp')"
-svn cleanup || exit $EXIT_GYP_UPDATE
-svn up -r $CHROMIUM_GYP_REVISION || exit $EXIT_GYP_UPDATE
+pushd tools/gyp
+unlock_git_repo Gyp
+git fetch || exit $EXIT_GYP_UPDATE
+git reset --hard $CHROMIUM_GYP_REVISION || exit $EXIT_GYP_UPDATE
 popd
 
 mark_step 'Getting the last Blink revision for which the frontend has been uploaded'
@@ -44,7 +59,7 @@ if gsutil ls "$BLINK_REVISIONS_BLACKLIST_FILE"; then
 fi
 
 mark_step 'Working out SVN revisions list'
-pushd blink
+pushd third_party/WebKit
 git fetch || exit $EXIT_BLINK_UPDATE
 HEAD_BLINK_REVISION=$(git log -n 1 --all --grep="git-svn-id:" --pretty=medium | grep -Po "git-svn-id:[^@]*@\d+" | grep -Po "@\d+" | grep -Po "\d+")
 popd
@@ -71,7 +86,7 @@ for REVISION in $REVISION_LIST; do
         continue
     fi
 
-    pushd blink
+    pushd third_party/WebKit
     REVISION_COMMIT=$(git log -n 1 --all --grep="git-svn-id:[^@]*@$REVISION" --pretty=oneline | awk '{ print $1; }')
     if [ -z "$REVISION_COMMIT" ]; then
         echo "@$REVISION ==> missing!"
@@ -79,13 +94,7 @@ for REVISION in $REVISION_LIST; do
         continue
     fi
     echo "@$REVISION ==> $REVISION_COMMIT"
-    GIT_INDEX_LOCK=".git/index.lock"
-    if [ -e "$GIT_INDEX_LOCK" ]; then
-        # Can be left over from an interrupted iteration.
-        # Safe to remove unless someone is trying to run two iterations in parallel.
-        echo "!!! Warning: removing Git index lock !!!"
-        rm -f "$GIT_INDEX_LOCK" || exit $EXIT_BLINK_UPDATE
-    fi
+    unlock_git_repo Blink || exit $EXIT_BLINK_UPDATE
     git reset --hard $REVISION_COMMIT || exit $EXIT_BLINK_UPDATE
 
     # Exclude "trunk" to work around branches that accidentally have a second
@@ -94,23 +103,22 @@ for REVISION in $REVISION_LIST; do
     if [ -z "$DEVTOOLS_GYP" ]; then
         exit $EXIT_DEVTOOLS_GYP_FILE
     fi
-    if [ -d ../devtools-frontend ]; then
-        rm -rf ../devtools-frontend
+    if [ -d ../../out ]; then
+        rm -rf ../../out
     fi
     DEVTOOLS_DIR=$(dirname "$DEVTOOLS_GYP")
-    GYP_GENERATORS=ninja ../gyp/gyp --toplevel-dir="$DEVTOOLS_DIR" --depth=../../../../devtools-frontend --generator-output=../../../../devtools-frontend "$DEVTOOLS_GYP" || exit $EXIT_GYP_DEVTOOLS
+    #TODO: need to calculate depth and output paths based on DEVTOOLS_DIR nesting level
+    GYP_GENERATORS=ninja ../../tools/gyp/gyp --toplevel-dir="$DEVTOOLS_DIR" --depth=../../../.. --generator-output=../../../.. "$DEVTOOLS_GYP" || exit $EXIT_GYP_DEVTOOLS
     popd
 
-    LASTCHANGE_DIR="$SOURCE_DIR/../build/util"
-    LASTCHANGE_FILE="$LASTCHANGE_DIR/LASTCHANGE.blink"
-    mkdir -p $LASTCHANGE_DIR
+    LASTCHANGE_FILE="build/util/LASTCHANGE.blink"
     echo "LASTCHANGE=$REVISION" > $LASTCHANGE_FILE
 
-    ninja -C devtools-frontend/out/Default devtools_frontend_resources || exit $EXIT_BUILD_FRONTEND
+    ninja -C out/Default devtools_frontend_resources || exit $EXIT_BUILD_FRONTEND
     ZIP_FILE_NAME=devtools_frontend.zip
-    ZIP_FILE=$(pwd)/devtools-frontend/$ZIP_FILE_NAME
+    ZIP_FILE=$(pwd)/out/$ZIP_FILE_NAME
 
-    pushd devtools-frontend/out/Default/resources/inspector
+    pushd out/Default/resources/inspector
     # Create an AppCache manifest and patch devtools.html and / or inspector.html to point to it
     MANIFEST_FILE_NAME=$REVISION.manifest
     FALLBACK_ENTRIES=