From 9adb1ff9439aecf4e8ac3972a631bb74df2b6868 Mon Sep 17 00:00:00 2001
From: henrika <henrika@webrtc.org>
Date: Fri, 16 Sep 2016 04:11:51 -0700
Subject: [PATCH] Revert of Fix android_junit_tests and add a GN target for
 them. (patchset #1 id:20001 of https://codereview.webrtc.org/2346793002/ )

Reason for revert:
Breaks WebRTC in Chrome on Android:

https://build.chromium.org/p/chromium.webrtc.fyi/waterfall?builder=Android%20Builder%20(dbg)

Original issue's description:
> Fix android_junit_tests and add a GN target for them.
>
> BUG=webrtc:6365
> NOTRY=True
>
> Committed: https://crrev.com/bb716daea73889517f996aa29f867563ed63d58a
> Cr-Commit-Position: refs/heads/master@{#14241}

TBR=magjed@webrtc.org,kjellander@webrtc.org,sakal@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6365

Review-Url: https://codereview.webrtc.org/2341213003
Cr-Commit-Position: refs/heads/master@{#14253}
---
 webrtc/BUILD.gn                                   | 15 ---------------
 .../src/org/webrtc/CameraEnumerationTest.java     |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index d61bbd845c..88c4e09c72 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -12,10 +12,6 @@ import("//build/config/linux/pkg_config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("build/webrtc.gni")
 import("//third_party/protobuf/proto_library.gni")
-if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
-}
 
 # Contains the defines and includes in common.gypi that are duplicated both as
 # target_defaults and direct_dependent_settings.
@@ -832,14 +828,3 @@ if (rtc_include_tests) {
     }
   }
 }
-
-if (is_android) {
-  junit_binary("android_junit_tests") {
-    java_files = [ "androidjunit/src/org/webrtc/CameraEnumerationTest.java" ]
-
-    deps = [
-      "//webrtc/api:libjingle_peerconnection_java",
-      "//webrtc/api:libjingle_peerconnection_jni",
-    ]
-  }
-}
diff --git a/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java b/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java
index 5ec2ac4d90..031cdfd5c9 100644
--- a/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java
+++ b/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java
@@ -15,9 +15,9 @@ import static org.webrtc.CameraEnumerationAndroid.getClosestSupportedFramerateRa
 
 import org.webrtc.CameraEnumerationAndroid.CaptureFormat.FramerateRange;
 
-import org.chromium.testing.local.LocalRobolectricTestRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.util.Arrays;
@@ -25,7 +25,7 @@ import java.util.Arrays;
 /**
  * Tests for CameraEnumerationAndroid.
  */
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class CameraEnumerationTest {
   @Test