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

Unified Diff: ui/base/clipboard/clipboard_android_unittest.cc

Issue 2231923002: Make GetApplicationContext return a JavaRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also fix not-currently-compiled unit test Created 4 years, 4 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
« no previous file with comments | « ui/base/clipboard/clipboard_android.cc ('k') | ui/base/touch/touch_device_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_android_unittest.cc
diff --git a/ui/base/clipboard/clipboard_android_unittest.cc b/ui/base/clipboard/clipboard_android_unittest.cc
index b6744a2b36ef08daf69b9d29f323cb6c4a7ff264..d52013d4bcbe3bb9dac6a34450e025994956279c 100644
--- a/ui/base/clipboard/clipboard_android_unittest.cc
+++ b/ui/base/clipboard/clipboard_android_unittest.cc
@@ -44,9 +44,6 @@ TEST_F(ClipboardAndroidTest, InternalClipboardInvalidation) {
JNIEnv* env = base::android::AttachCurrentThread();
ASSERT_TRUE(env);
- jobject context = base::android::GetApplicationContext();
- ASSERT_TRUE(context);
Theresa 2016/08/15 17:54:14 Why is this check no longer necessary?
-
ScopedJavaLocalRef<jclass> context_class =
base::android::GetClass(env, "android/content/Context");
@@ -59,7 +56,8 @@ TEST_F(ClipboardAndroidTest, InternalClipboardInvalidation) {
ConvertUTF8ToJavaString(env, "clipboard");
ScopedJavaLocalRef<jobject> clipboard_manager(
env,
- env->CallObjectMethod(context, get_system_service, service_name.obj()));
+ env->CallObjectMethod(base::android::GetApplicationContext(),
+ get_system_service, service_name.obj()));
ASSERT_TRUE(clipboard_manager.obj() && !base::android::ClearException(env));
ScopedJavaLocalRef<jclass> clipboard_class =
« no previous file with comments | « ui/base/clipboard/clipboard_android.cc ('k') | ui/base/touch/touch_device_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698