Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4099)

Unified Diff: chrome/android/testshell/javatests/AndroidManifest.xml

Issue 186843002: Move ChromeShell files from chrome/android/testshell to chrome/android/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/testshell/javatests/AndroidManifest.xml
diff --git a/chrome/android/testshell/javatests/AndroidManifest.xml b/chrome/android/testshell/javatests/AndroidManifest.xml
deleted file mode 100644
index 2b1473c04ec18d3be3d16cc5b1d311dff47b9235..0000000000000000000000000000000000000000
--- a/chrome/android/testshell/javatests/AndroidManifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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. -->
- <!-- package name must be unique so suffix with "tests" so package loader
- doesn't ignore this. -->
- <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.chromium.chrome.shell.tests">
- <!-- 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>
- <uses-library android:name="android.test.runner" />
- <activity android:name="org.chromium.sync.test.util.MockGrantCredentialsPermissionActivity"
- android:exported="false">
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
- </application>
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" />
- <instrumentation android:name="android.test.InstrumentationTestRunner"
- 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>

Powered by Google App Engine
This is Rietveld 408576698