| Index: chrome/android/shell/javatests/AndroidManifest.xml | 
| diff --git a/chrome/android/shell/javatests/AndroidManifest.xml b/chrome/android/shell/javatests/AndroidManifest.xml | 
| index 8bdb6446b2921f168c4a3ddd61edf7cd9e78ab4f..28e3c95b6d55b5432953f6e7a2ebddcb6214ae09 100644 | 
| --- a/chrome/android/shell/javatests/AndroidManifest.xml | 
| +++ b/chrome/android/shell/javatests/AndroidManifest.xml | 
| @@ -6,6 +6,12 @@ | 
| doesn't ignore this. --> | 
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 
| package="org.chromium.chrome.shell.tests"> | 
| +    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" /> | 
| +    <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" /> | 
| <!-- 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. --> | 
| @@ -13,9 +19,11 @@ | 
| <uses-library android:name="android.test.runner" /> | 
|  | 
| <provider android:name="org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsProvider" | 
| -            android:authorities="org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsProvider" /> | 
| +            android:authorities="org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsProvider" | 
| +            android:exported="true" /> | 
| <provider android:name="org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsDelayedProvider" | 
| -            android:authorities="org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsDelayedProvider" /> | 
| +            android:authorities="org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsDelayedProvider" | 
| +            android:exported="true" /> | 
|  | 
| <activity android:name="org.chromium.test.broker.OnDeviceInstrumentationBroker" | 
| android:exported="true"/> | 
| @@ -28,13 +36,7 @@ | 
| </intent-filter> | 
| </activity> | 
| </application> | 
| -    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" /> | 
| <instrumentation android:name="org.chromium.chrome.test.ChromeInstrumentationTestRunner" | 
| android:targetPackage="org.chromium.chrome.shell" | 
| android:label="Tests for org.chromium.chrome.shell"/> | 
| -    <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> | 
|  |