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

Unified Diff: content/public/test/content_test_suite_base.cc

Issue 12088031: Revert 179189 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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/test/content_test_suite_base.cc
===================================================================
--- content/public/test/content_test_suite_base.cc (revision 179209)
+++ content/public/test/content_test_suite_base.cc (working copy)
@@ -15,14 +15,6 @@
#include "ui/base/ui_base_paths.h"
#include "ui/compositor/compositor_setup.h"
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#include "content/browser/android/browser_jni_registrar.h"
-#include "content/common/android/common_jni_registrar.h"
-#include "net/android/net_jni_registrar.h"
-#include "ui/android/ui_jni_registrar.h"
-#endif
-
namespace content {
ContentTestSuiteBase::ContentTestSuiteBase(int argc, char** argv)
@@ -33,15 +25,6 @@
void ContentTestSuiteBase::Initialize() {
base::TestSuite::Initialize();
-#if defined(OS_ANDROID)
- // Register JNI bindings for android.
- JNIEnv* env = base::android::AttachCurrentThread();
- content::android::RegisterCommonJni(env);
- content::android::RegisterBrowserJni(env);
- net::android::RegisterJni(env);
- ui::android::RegisterJni(env);
-#endif
-
if (external_libraries_enabled_)
media::InitializeMediaLibraryForTesting();

Powered by Google App Engine
This is Rietveld 408576698