<?xml version="1.0" encoding="utf-8"?>
  <!-- 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. -->
  <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="org.chromium.android_webview.test">
    <!-- We add an application tag here just so that we can indicate that this
         package needs to link against the android.test library, which is
         needed when building test cases. -->
    <application android:hardwareAccelerated="false">
        <uses-library android:name="android.test.runner" />
    </application>
    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="21" />
    <instrumentation android:name="android.test.InstrumentationTestRunner"
        android:targetPackage="org.chromium.android_webview.shell"
        android:label="Tests for org.chromium.android_webview"/>
    <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
    <uses-permission android:name="android.permission.INJECT_EVENTS" />
    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
    <uses-permission android:name="android.permission.READ_LOGS"/>
    <uses-permission android:name="android.permission.WAKE_LOCK" />
</manifest>

<?xml version="1.0" encoding="utf-8"?>
  <!-- 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. -->
  <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="org.chromium.android_webview.test">
    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="21" />
    <instrumentation android:name="android.test.InstrumentationTestRunner"
        android:targetPackage="org.chromium.android_webview.shell"
        android:label="Tests for org.chromium.android_webview"/>
    <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
    <uses-permission android:name="android.permission.READ_LOGS"/>
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <!-- We add an application tag here just so that we can indicate that this
         package needs to link against the android.test library, which is
         needed when building test cases. -->
    <application android:hardwareAccelerated="false">
        <uses-library android:name="android.test.runner" />
    </application>
</manifest>

Fix some lint warnings for android_webview_test_apk
Fix some lint warnings for android_webview_test_apk

Reorder uses-sdk and uses-permission to above application tag.
Remove INJECT_EVENTS permission since we don't need it.

BUG=

Review URL: https://codereview.chromium.org/998003002

Cr-Commit-Position: 972c6d2dc6dd5efdad1377c0d224e03eb8f276f7@{#320132}
