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

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/ClipboardTest.java

Issue 1123823002: Remove ICS support from Chromium code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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: content/public/android/javatests/src/org/chromium/content/browser/ClipboardTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ClipboardTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ClipboardTest.java
index 6198b117254ccb2927e7063bea49e1f2c4cec5a9..ad8933cad8288238b209bf635e5bc559502305ae 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ClipboardTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ClipboardTest.java
@@ -4,11 +4,9 @@
package org.chromium.content.browser;
-import android.annotation.TargetApi;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
-import android.os.Build;
import android.test.suitebuilder.annotation.LargeTest;
import android.text.TextUtils;
@@ -48,7 +46,6 @@ public class ClipboardTest extends ContentShellTestBase {
* the HTML representation of the fragment to be available.
*/
@LargeTest
- @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
@Feature({"Clipboard", "TextInput"})
@RerunWithUpdatedContainerView
public void testCopyDocumentFragment() throws Throwable {
@@ -82,13 +79,9 @@ public class ClipboardTest extends ContentShellTestBase {
final ClipData clip = clipboardManager.getPrimaryClip();
assertEquals(EXPECTED_TEXT_RESULT, clip.getItemAt(0).coerceToText(getActivity()));
- // Android JellyBean and higher should have a HTML representation on the clipboard as well.
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
- String htmlText = clip.getItemAt(0).getHtmlText();
-
- assertNotNull(htmlText);
- assertTrue(htmlText.contains(EXPECTED_HTML_NEEDLE));
- }
+ String htmlText = clip.getItemAt(0).getHtmlText();
+ assertNotNull(htmlText);
+ assertTrue(htmlText.contains(EXPECTED_HTML_NEEDLE));
}
private void copy(final ImeAdapter adapter) {

Powered by Google App Engine
This is Rietveld 408576698