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

Unified Diff: components/devtools_bridge/android/javatests2/AndroidManifest.xml

Issue 704613003: Beginning implementation of SessionDependencyFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed dependency on libjingle Created 6 years, 1 month 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: components/devtools_bridge/android/javatests2/AndroidManifest.xml
diff --git a/content/shell/android/javatests/AndroidManifest.xml b/components/devtools_bridge/android/javatests2/AndroidManifest.xml
similarity index 61%
copy from content/shell/android/javatests/AndroidManifest.xml
copy to components/devtools_bridge/android/javatests2/AndroidManifest.xml
index fccf3f8497bb6137a44c07e3f340ff10440f3313..4a2fd3b8cdb240124d6f62807c24b0850c38ad76 100644
--- a/content/shell/android/javatests/AndroidManifest.xml
+++ b/components/devtools_bridge/android/javatests2/AndroidManifest.xml
@@ -1,21 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
- <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. Use of
+ <!-- Copyright 2014 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.content_shell_apk.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. -->
+ package="org.chromium.components.devtools_bridge.tests2">
<application>
<uses-library android:name="android.test.runner" />
</application>
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
<instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="org.chromium.content_shell_apk"
- android:label="Tests for org.chromium.content_shell_apk"/>
+ android:targetPackage="org.chromium.components.devtools_bridge.tests2"
+ android:label="Tests for org.chromium.components.devtools_bridge"/>
+
<uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
<uses-permission android:name="android.permission.INJECT_EVENTS" />
+ <uses-permission android:name="android.permission.INTERNET" />
</manifest>

Powered by Google App Engine
This is Rietveld 408576698