Update Channel ID API to use a callback.

import_from_android.sh

 #!/bin/sh
 #
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Sanitize environment.
 set -e
 export LANG=C
 export LC_ALL=C
@@ skipping 321 matching lines @@
 # directory and replace it with something completely new. This is a problem
 # when using subversion because this also gets rid of all .svn
 # subdirectories. This makes it impossible to commit the right set of
 # changes with "gcl commit".
 #
 # To work-around this, copy all the .svn subdirectories into a temporary
 # tarball, which will be extracted after the import process.
 #
 dump "Saving .svn subdirectories"
 SAVED_SVN_TARBALL=$BUILD_DIR/saved-svn-subdirs.tar.gz
-#run tar czf $SAVED_SVN_TARBALL $(find . -type d -name ".svn")
+run tar czf $SAVED_SVN_TARBALL $(find . -type d -name ".svn")
 
 # Re-run the import_openssl.sh script.
 dump "Re-running the 'import_openssl.sh' script to reconfigure all sources."
 (
   cd $ANDROID_SRC_DIR
   run ./import_openssl.sh import $DOWNLOAD_DIR/$OPENSSL_PACKAGE
 )
 
 dump "Copying new Android sources to final location."
 clean_openssl_new () {
   rm -rf "$PROGDIR/openssl.new"
 }
 atexit clean_openssl_new
 
 run cp -rp "$ANDROID_SRC_DIR" "$PROGDIR/openssl.new"
 run mv "$PROGDIR/openssl" "$PROGDIR/openssl.old"
 run mv "$PROGDIR/openssl.new" "$PROGDIR/openssl"
 run rm -rf "$PROGDIR/openssl.old"
 
 dump "Restoring .svn subdirectores"
-# run tar xzf $SAVED_SVN_TARBALL
+run tar xzf $SAVED_SVN_TARBALL
 
 # Extract list of source files or compiler defines from openssl.config
 # variable definition. This assumes that the lists are in variables that
 # are named as <prefix><suffix> or <prefix><suffix><arch>.
 #
 # A few examples:
 #   get_gyp_list "FOO BAR" _SOURCES
 #     -> returns '$FOO_SOURCES $BAR_SOURCES'
 #
 #   get_gyp_list FOO _SOURCES_ "arm x86"
@@ skipping 87 matching lines @@
   > $PROGDIR/config/x64/openssl/opensslconf.h
 
 dump "Generating .gypi file."
 . $ANDROID_SRC_DIR/openssl.config
 generate_gyp_file > $PROGDIR/openssl.gypi.new
 run mv $PROGDIR/openssl.gypi $PROGDIR/openssl.gypi.old
 run mv $PROGDIR/openssl.gypi.new $PROGDIR/openssl.gypi
 run rm $PROGDIR/openssl.gypi.old
 
 dump "Done."