Make Linker.isUsed() static, and clean up the fallout.

content/content_tests.gypi

 # 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.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 1936 matching lines @@
             'jinja_inputs': ['shell/android/linker_test_apk/AndroidManifest.xml.jinja2'],
             'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/chromium_linker_test_manifest/AndroidManifest.xml',
           },
           'includes': [ '../build/android/jinja_template.gypi' ],
         },
         {
           # GN: //content/shell/android:chromium_linker_test_apk
           'target_name': 'chromium_linker_test_apk',
           'type': 'none',
           'conditions': [
-            ['target_arch != "x64" and target_arch != "arm64"', {
+            ['target_arch != "x64"', {

[rmcilroy, 2015/08/28 13:24:08]

Is there still a bug on x64 or can we remove this too? (Fine to do this in a
seperate CL).

[simonb (inactive), 2015/08/28 14:00:41]

Just not tested on x64 yet (lack of time). It's on my todo list...

               'dependencies': [
                 'chromium_android_linker_test',
                 'content.gyp:content_icudata',
                 'content.gyp:content_java',
                 'content.gyp:content_v8_external_data',
                 'content_shell_java',
               ],
               'variables': {
                 'apk_name': 'ChromiumLinkerTest',
                 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/chromium_linker_test_manifest/AndroidManifest.xml',
@@ skipping 144 matching lines @@
             ],
           },
           'includes': [
             '../build/host_jar.gypi',
           ],
         },
       ],
     }],
   ],
 }