Android: renames pylib.constants.CHROME_DIR to DIR_SOURCE_ROOT.

Following comments from https://codereview.chromium.org/14882007/,
let's keep it consistent with base/base_paths.

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/15979032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204357 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 55 insertions, 48 deletions

diff --git a/build/android/bb_run_sharded_steps.py b/build/android/bb_run_sharded_steps.py
index 652a211..75bdee8 100755
--- a/build/android/bb_run_sharded_steps.py
+++ b/build/android/bb_run_sharded_steps.py
@@ -61,7 +61,7 @@ from pylib import constants
 from pylib import ports
 
 
-_OUTPUT_DIR = os.path.join(constants.CHROME_DIR, 'out', 'step_results')
+_OUTPUT_DIR = os.path.join(constants.DIR_SOURCE_ROOT, 'out', 'step_results')
 
 
 def _SaveResult(result):
@@ -76,7 +76,7 @@ def _RunStepsPerDevice(steps):
     print 'Starting %s: %s %s at %s' % (step['name'], step['cmd'],
                                         start_time, step['device'])
     output, exit_code  = pexpect.run(
-        step['cmd'], cwd=os.path.abspath(constants.CHROME_DIR),
+        step['cmd'], cwd=os.path.abspath(constants.DIR_SOURCE_ROOT),
         withexitstatus=True, logfile=sys.stdout, timeout=1800,
         env=os.environ)
     exit_code = exit_code or 0
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index 6ec9c87..db6616c 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -21,13 +21,13 @@ from pylib import constants
 from pylib.gtest import gtest_config
 
 sys.path.append(os.path.join(
-    constants.CHROME_DIR, 'third_party', 'android_testrunner'))
+    constants.DIR_SOURCE_ROOT, 'third_party', 'android_testrunner'))
 import errors
 
 
 TESTING = 'BUILDBOT_TESTING' in os.environ
 
-CHROME_SRC = constants.CHROME_DIR
+CHROME_SRC = constants.DIR_SOURCE_ROOT
 
 # Describes an instrumation test suite:
 #   test: Name of test we're running.
diff --git a/build/android/findbugs_diff.py b/build/android/findbugs_diff.py
index 4dc6742..eb117da 100755
--- a/build/android/findbugs_diff.py
+++ b/build/android/findbugs_diff.py
@@ -38,8 +38,8 @@ def main(argv):
   options, _ = parser.parse_args()
 
   if not options.base_dir:
-    options.base_dir = os.path.join(constants.CHROME_DIR, 'build', 'android',
-                                    'findbugs_filter')
+    options.base_dir = os.path.join(constants.DIR_SOURCE_ROOT, 'build',
+                                    'android', 'findbugs_filter')
   if not options.only_analyze:
     options.only_analyze = 'org.chromium.-'
 
diff --git a/build/android/provision_devices.py b/build/android/provision_devices.py
index 6646556..1573182 100755
--- a/build/android/provision_devices.py
+++ b/build/android/provision_devices.py
@@ -31,7 +31,7 @@ def LaunchHostHeartbeat():
     subprocess.call(['kill', str(pid)])
   # Launch a new host_heartbeat
   print 'Spawning host heartbeat...'
-  subprocess.Popen([os.path.join(constants.CHROME_DIR,
+  subprocess.Popen([os.path.join(constants.DIR_SOURCE_ROOT,
                                  'build/android/host_heartbeat.py')])
 
 
@@ -51,7 +51,7 @@ def PushAndLaunchAdbReboot(devices, target):
     android_cmd.KillAllBlocking('adb_reboot', 2)
     # Push adb_reboot
     print '  Pushing adb_reboot ...'
-    adb_reboot = os.path.join(constants.CHROME_DIR,
+    adb_reboot = os.path.join(constants.DIR_SOURCE_ROOT,
                               'out/%s/adb_reboot' % target)
     android_cmd.PushIfNeeded(adb_reboot, '/data/local/')
     # Launch adb_reboot
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index 45a5f75..f260639 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -27,7 +27,7 @@ except:
   pexpect = None
 
 sys.path.append(os.path.join(
-    constants.CHROME_DIR, 'third_party', 'android_testrunner'))
+    constants.DIR_SOURCE_ROOT, 'third_party', 'android_testrunner'))
 import adb_interface
 import am_instrument_parser
 import errors
diff --git a/build/android/pylib/base/base_test_runner.py b/build/android/pylib/base/base_test_runner.py
index 559fa38f4..662cb34 100644
--- a/build/android/pylib/base/base_test_runner.py
+++ b/build/android/pylib/base/base_test_runner.py
@@ -98,12 +98,12 @@ class BaseTestRunner(object):
     Args:
       test_data_paths: A list of files or directories relative to |dest_dir|
           which should be copied to the device. The paths must exist in
-          |CHROME_DIR|.
+          |DIR_SOURCE_ROOT|.
       dest_dir: Absolute path to copy to on the device.
     """
     for p in test_data_paths:
       self.adb.PushIfNeeded(
-          os.path.join(constants.CHROME_DIR, p),
+          os.path.join(constants.DIR_SOURCE_ROOT, p),
           os.path.join(dest_dir, p))
 
   def LaunchTestHttpServer(self, document_root, port=None,
diff --git a/build/android/pylib/chrome_test_server_spawner.py b/build/android/pylib/chrome_test_server_spawner.py
index ec10180..ebd986f 100644
--- a/build/android/pylib/chrome_test_server_spawner.py
+++ b/build/android/pylib/chrome_test_server_spawner.py
@@ -26,11 +26,12 @@ import ports
 
 # Path that are needed to import necessary modules when launching a testserver.
 os.environ['PYTHONPATH'] = os.environ.get('PYTHONPATH', '') + (':%s:%s:%s:%s:%s'
-    % (os.path.join(constants.CHROME_DIR, 'third_party'),
-       os.path.join(constants.CHROME_DIR, 'third_party', 'tlslite'),
-       os.path.join(constants.CHROME_DIR, 'third_party', 'pyftpdlib', 'src'),
-       os.path.join(constants.CHROME_DIR, 'net', 'tools', 'testserver'),
-       os.path.join(constants.CHROME_DIR, 'sync', 'tools', 'testserver')))
+    % (os.path.join(constants.DIR_SOURCE_ROOT, 'third_party'),
+       os.path.join(constants.DIR_SOURCE_ROOT, 'third_party', 'tlslite'),
+       os.path.join(constants.DIR_SOURCE_ROOT, 'third_party', 'pyftpdlib',
+                    'src'),
+       os.path.join(constants.DIR_SOURCE_ROOT, 'net', 'tools', 'testserver'),
+       os.path.join(constants.DIR_SOURCE_ROOT, 'sync', 'tools', 'testserver')))
 
 
 SERVER_TYPES = {
@@ -191,7 +192,7 @@ class TestServerThread(threading.Thread):
     self.command_line.append('--host=%s' % self.arguments['host'])
     data_dir = self.arguments['data-dir'] or 'chrome/test/data'
     if not os.path.isabs(data_dir):
-      data_dir = os.path.join(constants.CHROME_DIR, data_dir)
+      data_dir = os.path.join(constants.DIR_SOURCE_ROOT, data_dir)
     self.command_line.append('--data-dir=%s' % data_dir)
     # The following arguments are optional depending on the individual test.
     if self.arguments.has_key('log-to-console'):
@@ -202,7 +203,7 @@ class TestServerThread(threading.Thread):
       self.command_line.append('--https')
       if self.arguments.has_key('cert-and-key-file'):
         self.command_line.append('--cert-and-key-file=%s' % os.path.join(
-            constants.CHROME_DIR, self.arguments['cert-and-key-file']))
+            constants.DIR_SOURCE_ROOT, self.arguments['cert-and-key-file']))
       if self.arguments.has_key('ocsp'):
         self.command_line.append('--ocsp=%s' % self.arguments['ocsp'])
       if self.arguments.has_key('https-record-resume'):
@@ -215,7 +216,7 @@ class TestServerThread(threading.Thread):
       if self.arguments.has_key('ssl-client-ca'):
         for ca in self.arguments['ssl-client-ca']:
           self.command_line.append('--ssl-client-ca=%s' %
-                                   os.path.join(constants.CHROME_DIR, ca))
+                                   os.path.join(constants.DIR_SOURCE_ROOT, ca))
       if self.arguments.has_key('ssl-bulk-cipher'):
         for bulk_cipher in self.arguments['ssl-bulk-cipher']:
           self.command_line.append('--ssl-bulk-cipher=%s' % bulk_cipher)
@@ -224,7 +225,7 @@ class TestServerThread(threading.Thread):
     logging.info('Start running the thread!')
     self.wait_event.clear()
     self._GenerateCommandLineArguments()
-    command = constants.CHROME_DIR
+    command = constants.DIR_SOURCE_ROOT
     if self.arguments['server-type'] == 'sync':
       command = [os.path.join(command, 'sync', 'tools', 'testserver',
                               'sync_testserver.py')] + self.command_line
diff --git a/build/android/pylib/cmd_helper.py b/build/android/pylib/cmd_helper.py
index daa4c71..de091ef 100644
--- a/build/android/pylib/cmd_helper.py
+++ b/build/android/pylib/cmd_helper.py
@@ -100,7 +100,7 @@ def GetCmdStatusAndOutput(args, cwd=None, shell=False):
 
 
 class OutDirectory(object):
-  _out_directory = os.path.join(constants.CHROME_DIR, 'out')
+  _out_directory = os.path.join(constants.DIR_SOURCE_ROOT, 'out')
   @staticmethod
   def set(out_directory):
     OutDirectory._out_directory = out_directory
diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py
index dfafa71..3812fc2 100644
--- a/build/android/pylib/constants.py
+++ b/build/android/pylib/constants.py
@@ -9,9 +9,11 @@ import subprocess
 import sys
 
 
-CHROME_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                          os.pardir, os.pardir, os.pardir))
-EMULATOR_SDK_ROOT = os.path.abspath(os.path.join(CHROME_DIR, os.pardir,
+DIR_SOURCE_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                               os.pardir, os.pardir, os.pardir))
+# TODO(bulach): remove this.
+CHROME_DIR = DIR_SOURCE_ROOT
+EMULATOR_SDK_ROOT = os.path.abspath(os.path.join(DIR_SOURCE_ROOT, os.pardir,
                                                  os.pardir))
 
 CHROME_PACKAGE = 'com.google.android.apps.chrome'
@@ -33,7 +35,7 @@ CHROMIUM_TEST_SHELL_ACTIVITY = (
     'org.chromium.chrome.testshell.ChromiumTestShellActivity')
 CHROMIUM_TEST_SHELL_DEVTOOLS_SOCKET = 'chromium_testshell_devtools_remote'
 CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR = os.path.join(
-    CHROME_DIR, 'chrome', 'android')
+    DIR_SOURCE_ROOT, 'chrome', 'android')
 
 GTEST_TEST_PACKAGE_NAME = 'org.chromium.native_test'
 GTEST_TEST_ACTIVITY_NAME = 'org.chromium.native_test.ChromeNativeTestActivity'
@@ -72,11 +74,13 @@ SDK_BUILD_APKS_DIR = 'apks'
 # The directory on the device where perf test output gets saved to.
 DEVICE_PERF_OUTPUT_DIR = '/data/data/' + CHROME_PACKAGE + '/files'
 
-SCREENSHOTS_DIR = os.path.join(CHROME_DIR, 'out_screenshots')
+SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
 
 ANDROID_SDK_VERSION = 17
-ANDROID_SDK_ROOT = os.path.join(CHROME_DIR, 'third_party/android_tools/sdk')
-ANDROID_NDK_ROOT = os.path.join(CHROME_DIR, 'third_party/android_tools/ndk')
+ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
+                                'third_party/android_tools/sdk')
+ANDROID_NDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
+                                'third_party/android_tools/ndk')
 
 UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com'
 
diff --git a/build/android/pylib/device_stats_monitor.py b/build/android/pylib/device_stats_monitor.py
index f0e87a5..000632b 100644
--- a/build/android/pylib/device_stats_monitor.py
+++ b/build/android/pylib/device_stats_monitor.py
@@ -32,7 +32,7 @@ class DeviceStatsMonitor(object):
   def __init__(self, adb, hz, build_type):
     self._adb = adb
     host_path = os.path.abspath(os.path.join(
-        constants.CHROME_DIR, 'out', build_type, 'device_stats_monitor'))
+        constants.DIR_SOURCE_ROOT, 'out', build_type, 'device_stats_monitor'))
     self._adb.PushIfNeeded(host_path, DeviceStatsMonitor.DEVICE_PATH)
     self._hz = hz
 
diff --git a/build/android/pylib/fake_dns.py b/build/android/pylib/fake_dns.py
index 1c64490..b119d76 100644
--- a/build/android/pylib/fake_dns.py
+++ b/build/android/pylib/fake_dns.py
@@ -32,7 +32,8 @@ class FakeDns(object):
       subprocess instance connected to the fake_dns process on the device.
     """
     self._adb.PushIfNeeded(
-        os.path.join(constants.CHROME_DIR, 'out', self._build_type, 'fake_dns'),
+        os.path.join(constants.DIR_SOURCE_ROOT, 'out', self._build_type,
+                     'fake_dns'),
         FakeDns._FAKE_DNS_PATH)
     return subprocess.Popen(
         ['adb', '-s', self._adb._adb.GetSerialNumber(),
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
index 5e501e3a..4c14762 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -73,7 +73,7 @@ def _GetDataFilesForTestSuite(test_suite_basename):
     # The following are spell check data. Now only list the data under
     # third_party/hunspell_dictionaries which are used by unit tests.
     old_cwd = os.getcwd()
-    os.chdir(constants.CHROME_DIR)
+    os.chdir(constants.DIR_SOURCE_ROOT)
     test_files += glob.glob('third_party/hunspell_dictionaries/*.bdic')
     os.chdir(old_cwd)
     return test_files
@@ -276,7 +276,7 @@ class TestRunner(base_test_runner.BaseTestRunner):
     else:
       # Put a copy into the android out/target directory, to allow stack trace
       # generation.
-      symbols_dir = os.path.join(constants.CHROME_DIR, 'out', build_type,
+      symbols_dir = os.path.join(constants.DIR_SOURCE_ROOT, 'out', build_type,
                                  'lib.target')
       self.test_package = test_package_executable.TestPackageExecutable(
           self.adb,
@@ -314,9 +314,10 @@ class TestRunner(base_test_runner.BaseTestRunner):
     The path of this directory is different when the suite is being run as
     part of a WebKit check-out.
     """
-    webkit_src = os.path.join(constants.CHROME_DIR, 'third_party', 'WebKit')
+    webkit_src = os.path.join(constants.DIR_SOURCE_ROOT, 'third_party',
+                              'WebKit')
     if self.in_webkit_checkout:
-      webkit_src = os.path.join(constants.CHROME_DIR, '..', '..', '..')
+      webkit_src = os.path.join(constants.DIR_SOURCE_ROOT, '..', '..', '..')
 
     self.adb.PushIfNeeded(
         os.path.join(webkit_src, 'Source/WebKit/chromium/tests/data'),
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py
index 1dc164c..9e6e62e 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -108,7 +108,7 @@ class TestRunner(base_test_runner.BaseTestRunner):
       dst_src = dest_host_pair.split(':',1)
       dst_layer = dst_src[0]
       host_src = dst_src[1]
-      host_test_files_path = constants.CHROME_DIR + '/' + host_src
+      host_test_files_path = constants.DIR_SOURCE_ROOT + '/' + host_src
       if os.path.exists(host_test_files_path):
         self.adb.PushIfNeeded(host_test_files_path,
                               self.adb.GetExternalStorage() + '/' +
@@ -144,7 +144,7 @@ class TestRunner(base_test_runner.BaseTestRunner):
     # because it may have race condition when multiple processes are trying to
     # launch lighttpd with same port at same time.
     http_server_ports = self.LaunchTestHttpServer(
-        os.path.join(constants.CHROME_DIR), self._lighttp_port)
+        os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port)
     if self.ports_to_forward:
       port_pairs = [(port, port) for port in self.ports_to_forward]
       # We need to remember which ports the HTTP server is using, since the
diff --git a/build/android/pylib/utils/emulator.py b/build/android/pylib/utils/emulator.py
index 535be20..a2343a1 100755
--- a/build/android/pylib/utils/emulator.py
+++ b/build/android/pylib/utils/emulator.py
@@ -214,7 +214,7 @@ class Emulator(object):
     avd_process.expect('Created AVD \'%s\'' % self.avd_name)
 
     # Setup test device as default Galaxy Nexus AVD
-    avd_config_dir = os.path.join(constants.CHROME_DIR, 'build', 'android',
+    avd_config_dir = os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'android',
                                   'avd_configs')
     avd_config_ini = os.path.join(avd_config_dir,
                                   'AVD_for_Galaxy_Nexus_by_Google_%s.avd' %
diff --git a/build/android/pylib/utils/findbugs.py b/build/android/pylib/utils/findbugs.py
index 995801a..bcc98c9 100755
--- a/build/android/pylib/utils/findbugs.py
+++ b/build/android/pylib/utils/findbugs.py
@@ -72,7 +72,7 @@ def _GetChromeClasses(release_version):
   version = 'Debug'
   if release_version:
     version = 'Release'
-  path = os.path.join(constants.CHROME_DIR, 'out', version)
+  path = os.path.join(constants.DIR_SOURCE_ROOT, 'out', version)
   cmd = 'find %s -name "*.class"' % path
   out = cmd_helper.GetCmdOutput(shlex.split(cmd))
   if not out:
@@ -98,7 +98,7 @@ def _Run(exclude, known_bugs, classes_to_analyze, auxiliary_classes,
     findbug_args: addtional command line options needs pass to Findbugs.
   """
 
-  chrome_src = constants.CHROME_DIR
+  chrome_src = constants.DIR_SOURCE_ROOT
   sdk_root = constants.ANDROID_SDK_ROOT
   sdk_version = constants.ANDROID_SDK_VERSION
 
diff --git a/build/android/pylib/utils/flakiness_dashboard_results_uploader.py b/build/android/pylib/utils/flakiness_dashboard_results_uploader.py
index d0ec910..e74145f 100644
--- a/build/android/pylib/utils/flakiness_dashboard_results_uploader.py
+++ b/build/android/pylib/utils/flakiness_dashboard_results_uploader.py
@@ -88,11 +88,11 @@ class JSONResultsGenerator(json_results_generator.JSONResultsGeneratorBase):
       if os.path.exists(os.path.join(in_directory, '.git')):
         return True
       parent = os.path.dirname(in_directory)
-      if parent == constants.CHROME_DIR or parent == in_directory:
+      if parent == constants.DIR_SOURCE_ROOT or parent == in_directory:
         return False
       return _is_git_directory(parent)
 
-    in_directory = os.path.join(constants.CHROME_DIR, in_directory)
+    in_directory = os.path.join(constants.DIR_SOURCE_ROOT, in_directory)
 
     if not os.path.exists(os.path.join(in_directory, '.svn')):
       if _is_git_directory(in_directory):
@@ -126,7 +126,7 @@ class ResultsUploader(object):
       # This requires passing the actual master name (e.g. 'ChromiumFYI' not
       # 'chromium.fyi').
       from slave import slave_utils
-      self._build_name = slave_utils.SlaveBuildName(constants.CHROME_DIR)
+      self._build_name = slave_utils.SlaveBuildName(constants.DIR_SOURCE_ROOT)
       self._master_name = slave_utils.GetActiveMaster()
     else:
       self._build_name = 'chromium-android'
diff --git a/build/android/pylib/utils/report_results.py b/build/android/pylib/utils/report_results.py
index 34bae52..83b80de 100644
--- a/build/android/pylib/utils/report_results.py
+++ b/build/android/pylib/utils/report_results.py
@@ -16,7 +16,7 @@ import flakiness_dashboard_results_uploader
 
 def _LogToFile(results, test_type, test_suite, build_type):
   """Log results to local files which can be used for aggregation later."""
-  log_file_path = os.path.join(constants.CHROME_DIR, 'out',
+  log_file_path = os.path.join(constants.DIR_SOURCE_ROOT, 'out',
                                build_type, 'test_logs')
   if not os.path.exists(log_file_path):
     os.mkdir(log_file_path)
diff --git a/build/android/pylib/utils/test_options_parser.py b/build/android/pylib/utils/test_options_parser.py
index f1177ed..eecfb71 100644
--- a/build/android/pylib/utils/test_options_parser.py
+++ b/build/android/pylib/utils/test_options_parser.py
@@ -11,7 +11,7 @@ import optparse
 import os
 import sys
 
-_SDK_OUT_DIR = os.path.join(constants.CHROME_DIR, 'out')
+_SDK_OUT_DIR = os.path.join(constants.DIR_SOURCE_ROOT, 'out')
 
 
 def AddBuildTypeOption(option_parser):
@@ -49,7 +49,7 @@ def ValidateInstallAPKOption(option_parser, options):
   if not options.apk:
     option_parser.error('--apk is mandatory.')
   if not os.path.exists(options.apk):
-    options.apk = os.path.join(constants.CHROME_DIR,
+    options.apk = os.path.join(constants.DIR_SOURCE_ROOT,
                                'out', options.build_type,
                                'apks', options.apk)
 
diff --git a/build/android/pylib/valgrind_tools.py b/build/android/pylib/valgrind_tools.py
index 0e98193..c0eff12 100644
--- a/build/android/pylib/valgrind_tools.py
+++ b/build/android/pylib/valgrind_tools.py
@@ -25,7 +25,7 @@ import os.path
 import sys
 from glob import glob
 
-from constants import CHROME_DIR
+from constants import DIR_SOURCE_ROOT
 
 
 def SetChromeTimeoutScale(adb, scale):
@@ -106,7 +106,7 @@ class AddressSanitizerTool(BaseTool):
               glob('third_party/llvm-build/Release+Asserts/lib/clang/*/lib/'
                    'linux/libclang_rt.asan-arm-android.so'))
     for f in files:
-      self._adb.PushIfNeeded(os.path.join(CHROME_DIR, f),
+      self._adb.PushIfNeeded(os.path.join(DIR_SOURCE_ROOT, f),
                              os.path.join(AddressSanitizerTool.TMP_DIR,
                                           os.path.basename(f)))
 
@@ -160,7 +160,7 @@ class ValgrindTool(BaseTool):
                                ValgrindTool.VGLOGS_DIR))
     files = self.GetFilesForTool()
     for f in files:
-      self._adb.PushIfNeeded(os.path.join(CHROME_DIR, f),
+      self._adb.PushIfNeeded(os.path.join(DIR_SOURCE_ROOT, f),
                              os.path.join(ValgrindTool.VG_DIR,
                                           os.path.basename(f)))