[android] Remove deprecated package constants.

build/android/pylib/constants.py

 # Copyright (c) 2012 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.
 
 """Defines a set of constants shared by test runners and other scripts."""
 
 import collections
 import os
 import subprocess
 import sys
 
 
 DIR_SOURCE_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                                os.pardir, os.pardir, os.pardir))
 ISOLATE_DEPS_DIR = os.path.join(DIR_SOURCE_ROOT, 'isolate_deps_dir')
 EMULATOR_SDK_ROOT = os.path.abspath(os.path.join(DIR_SOURCE_ROOT, os.pardir,
                                                  os.pardir))
 
-# TODO(craigdh): Remove these once references have been removed downstream.
-CHROME_PACKAGE = 'com.google.android.apps.chrome'
-CHROME_ACTIVITY = 'com.google.android.apps.chrome.Main'
-
-CHROME_STABLE_PACKAGE = 'com.android.chrome'
-CHROME_BETA_PACKAGE = 'com.chrome.beta'
-
-LEGACY_BROWSER_PACKAGE = 'com.google.android.browser'
-LEGACY_BROWSER_ACTIVITY = 'com.android.browser.BrowserActivity'
-
-CONTENT_SHELL_PACKAGE = 'org.chromium.content_shell_apk'
-CONTENT_SHELL_ACTIVITY = 'org.chromium.content_shell_apk.ContentShellActivity'
-
-CHROMIUM_TEST_SHELL_PACKAGE = 'org.chromium.chrome.testshell'
-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(
     DIR_SOURCE_ROOT, 'chrome', 'android')
 
 
 PackageInfo = collections.namedtuple('PackageInfo',
     ['package', 'activity', 'cmdline_file', 'devtools_socket',
      'test_package'])
 
 PACKAGE_INFO = {
     'chrome': PackageInfo(
-        CHROME_PACKAGE,
-        CHROME_ACTIVITY,
+        'com.google.android.apps.chrome',
+        'com.google.android.apps.chrome.Main',
         '/data/local/chrome-command-line',
         'chrome_devtools_remote',
         'com.google.android.apps.chrome.tests'),
+    'chrome_beta': PackageInfo(
+        'com.chrome.beta',
+        'com.chrome.beta.Main',
+        '/data/local/chrome-command-line',
+        'chrome_devtools_remote',
+        None),
+    'chrome_stable': PackageInfo(
+        'com.android.chrome',
+        'com.android.chrome.Main',
+        '/data/local/chrome-command-line',
+        'chrome_devtools_remote',
+        None),
     'legacy_browser': PackageInfo(
-        LEGACY_BROWSER_PACKAGE,
-        LEGACY_BROWSER_ACTIVITY,
+        'com.google.android.browser',
+        'com.android.browser.BrowserActivity',
         None,
         None,
         None),
     'content_shell': PackageInfo(
-        CONTENT_SHELL_PACKAGE,
-        CONTENT_SHELL_ACTIVITY,
+        'org.chromium.content_shell_apk',
+        'org.chromium.content_shell_apk.ContentShellActivity',
         '/data/local/tmp/content-shell-command-line',
         None,
         None),
     'chromium_test_shell': PackageInfo(
-        CHROMIUM_TEST_SHELL_PACKAGE,
-        CHROMIUM_TEST_SHELL_ACTIVITY,
+        'org.chromium.chrome.testshell',
+        'org.chromium.chrome.testshell.ChromiumTestShellActivity',
         '/data/local/tmp/chromium-testshell-command-line',
-        CHROMIUM_TEST_SHELL_DEVTOOLS_SOCKET,
+        'chromium_testshell_devtools_remote',
         'org.chromium.chrome.testshell.tests'),
     'gtest': PackageInfo(
         'org.chromium.native_test',
         'org.chromium.native_test.ChromeNativeTestActivity',
         '/data/local/tmp/chrome-native-tests-command-line',
         None,
         None),
     'content_browsertests': PackageInfo(
         'org.chromium.content_browsertests_apk',
         'org.chromium.content_browsertests_apk.ContentBrowserTestsActivity',
@@ skipping 23 matching lines @@
 
 TEST_EXECUTABLE_DIR = '/data/local/tmp'
 # Directories for common java libraries for SDK build.
 # These constants are defined in build/android/ant/common.xml
 SDK_BUILD_JAVALIB_DIR = 'lib.java'
 SDK_BUILD_TEST_JAVALIB_DIR = 'test.lib.java'
 SDK_BUILD_APKS_DIR = 'apks'
 
 PERF_OUTPUT_DIR = os.path.join(DIR_SOURCE_ROOT, 'out', 'step_results')
 # The directory on the device where perf test output gets saved to.
-DEVICE_PERF_OUTPUT_DIR = '/data/data/' + CHROME_PACKAGE + '/files'
+DEVICE_PERF_OUTPUT_DIR = (
+    '/data/data/' + PACKAGE_INFO['chrome'].package + '/files')
 
 SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
 
 ANDROID_SDK_VERSION = 18
 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'
@@ skipping 34 matching lines @@
   except OSError:
     print >> sys.stderr, 'No adb found in $PATH, fallback to checked in binary.'
     return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
 
 
 ADB_PATH = _GetADBPath()
 
 # Exit codes
 ERROR_EXIT_CODE = 1
 WARNING_EXIT_CODE = 88