summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authortorne <torne@chromium.org>2015-11-25 10:25:50 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-25 18:27:27 +0000
commitda6e7c9eab6317710168ba6a2588f68621c8668f (patch)
treec1a4e357e2067a7d2983a0656420fd21febec6d5 /testing
parent5f97c7a06a9b78797754a3fdd83d1f6169fb13c9 (diff)
downloadchromium_src-da6e7c9eab6317710168ba6a2588f68621c8668f.zip
chromium_src-da6e7c9eab6317710168ba6a2588f68621c8668f.tar.gz
chromium_src-da6e7c9eab6317710168ba6a2588f68621c8668f.tar.bz2
Add context_utils.h includes where needed.
base::android::GetApplicationContext is now defined in context_utils.h. Update includes for files that use this, and stop including it in jni_android.h. BUG=552419 TBR=jochen@chromium.org,sky@chromium.org,xhwang@chromium.org,davidben@chromium.org,tedchoc@chromium.org,scheib@chromium.org,qinmin@chromium.org,halliwell@chromium.org,thakis@chromium.org Review URL: https://codereview.chromium.org/1475773002 Cr-Commit-Position: refs/heads/master@{#361701}
Diffstat (limited to 'testing')
-rw-r--r--testing/android/native_test/native_test_launcher.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/android/native_test/native_test_launcher.cc b/testing/android/native_test/native_test_launcher.cc
index 9ff995c..eb652d9 100644
--- a/testing/android/native_test/native_test_launcher.cc
+++ b/testing/android/native_test/native_test_launcher.cc
@@ -13,8 +13,8 @@
#include <signal.h>
#include "base/android/base_jni_registrar.h"
+#include "base/android/context_utils.h"
#include "base/android/fifo_utils.h"
-#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
#include "base/at_exit.h"