Move the android library loader from content to base

build/android/pylib/linker/test_case.py

 # Copyright 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.
 
 """Base class for linker-specific test cases.
 
    The custom dynamic linker can only be tested through a custom test case
    for various technical reasons:
 
      - It's an 'invisible feature', i.e. it doesn't expose a new API or
@@ skipping 11 matching lines @@
 
          - Enabling test support in the Linker code requires building a special
            APK with a flag to activate special test-only support code in the
            Linker code itself.
 
        Host-driven tests have also been tried, but since they're really
        sub-classes of instrumentation tests, they didn't work well either.
 
    To build and run the linker tests, do the following:
 
-     ninja -C out/Debug content_linker_test_apk
+     ninja -C out/Debug chromium_linker_test_apk
      build/android/test_runner.py linker
 
 """
 
 import logging
 import os
 import re
 import StringIO
 import subprocess
 import tempfile
 import time
 
 from pylib import constants
 from pylib import android_commands
 from pylib import flag_changer
 from pylib.base import base_test_result
 
 ResultType = base_test_result.ResultType
 
-_PACKAGE_NAME='org.chromium.content_linker_test_apk'
-_ACTIVITY_NAME='.ContentLinkerTestActivity'
-_COMMAND_LINE_FILE='/data/local/tmp/content-linker-test-command-line'
+_PACKAGE_NAME='org.chromium.chromium_linker_test_apk'
+_ACTIVITY_NAME='.ChromiumLinkerTestActivity'
+_COMMAND_LINE_FILE='/data/local/tmp/chromium-linker-test-command-line'
 
 # Path to the Linker.java source file.
 _LINKER_JAVA_SOURCE_PATH = \
-    'content/public/android/java/src/org/chromium/content/app/Linker.java'
+    'base/android/java/src/org/chromium/base/library_loader/Linker.java'
 
 # A regular expression used to extract the browser shared RELRO configuration
 # from the Java source file above.
 _RE_LINKER_BROWSER_CONFIG = \
     re.compile(r'.*BROWSER_SHARED_RELRO_CONFIG\s+=\s+' + \
                'BROWSER_SHARED_RELRO_CONFIG_(\S+)\s*;.*',
                re.MULTILINE | re.DOTALL)
 
 # Logcat filters used during each test. Only the 'chromium' one is really
 # needed, but the logs are added to the TestResult in case of error, and
-# it is handy to have the 'content_android_linker' ones as well when
+# it is handy to have the 'chromium_android_linker' ones as well when
 # troubleshooting.
-_LOGCAT_FILTERS = [ '*:s', 'chromium:v', 'content_android_linker:v' ]
+_LOGCAT_FILTERS = [ '*:s', 'chromium:v', 'chromium_android_linker:v' ]
 #_LOGCAT_FILTERS = [ '*:v' ]  ## DEBUG
 
 # Regular expression used to match status lines in logcat.
 re_status_line = re.compile(r'(BROWSER|RENDERER)_LINKER_TEST: (FAIL|SUCCESS)')
 
 # Regular expression used to mach library load addresses in logcat.
 re_library_address = re.compile(
     r'(BROWSER|RENDERER)_LIBRARY_ADDRESS: (\S+) ([0-9A-Fa-f]+)')
 
 
@@ skipping 465 matching lines @@
       # Note that this behaviour doesn't seem to happen when starting an
       # application 'normally', i.e. when using the application launcher to
       # start the activity.
       logging.info('Ignoring system\'s low randomization of browser libraries' +
                    ' for regular devices')
 
     if not renderer_status:
       return ResultType.FAIL, renderer_logs
 
     return ResultType.PASS, logs