Revert of Add APK targets to build libjingle tests for Android. (patchset #10 id:180001 of https://codereview.webrtc.org/1511633002/ )

Reason for revert:
Breaks bots.

Original issue's description:
> Add APK targets to build libjingle_peerconnection_unittests for Android.
>
> BUG=webrtc:2365
>
> The work started from the work by kjellander@ in https://codereview.webrtc.org/1413663003/
>
> Committed: https://crrev.com/a78c0211fd50369a75a962385db6163bd8ded239
> Cr-Commit-Position: refs/heads/master@{#11007}

TBR=kjellander@webrtc.org,tommi@webrtc.org,perkj@webrtc.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:2365

Review URL: https://codereview.webrtc.org/1521993002

Cr-Commit-Position: refs/heads/master@{#11009}

10 files changed, 24 insertions, 86 deletions

diff --git a/webrtc/build/android/test_runner.py b/webrtc/build/android/test_runner.py
index 78a7a190b2..5b3f3d9e74 100755
--- a/webrtc/build/android/test_runner.py
+++ b/webrtc/build/android/test_runner.py
@@ -38,8 +38,6 @@ def main():
         'webrtc/common_audio/common_audio_unittests.isolate',
     'common_video_unittests':
         'webrtc/common_video/common_video_unittests.isolate',
-    'libjingle_peerconnection_unittest':
-        'talk/libjingle_peerconnection_unittest.isolate',
     'modules_tests': 'webrtc/modules/modules_tests.isolate',
     'modules_unittests': 'webrtc/modules/modules_unittests.isolate',
     'rtc_unittests': 'webrtc/rtc_unittests.isolate',
diff --git a/webrtc/build/apk_test.gypi b/webrtc/build/apk_test.gypi
deleted file mode 100644
index a41e436a48..0000000000
--- a/webrtc/build/apk_test.gypi
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-# This is almost an identical copy of src/build/apk_test.gypi with minor
-# modifications to allow test executables starting with "lib".
-# See http://crbug.com/543820 for more details.
-
-{
-  'dependencies': [
-    '<(DEPTH)/base/base.gyp:base_java',
-    '<(DEPTH)/build/android/pylib/device/commands/commands.gyp:chromium_commands',
-    '<(DEPTH)/build/android/pylib/remote/device/dummy/dummy.gyp:remote_device_dummy_apk',
-    '<(DEPTH)/testing/android/appurify_support.gyp:appurify_support_java',
-    '<(DEPTH)/testing/android/on_device_instrumentation.gyp:reporter_java',
-    '<(DEPTH)/tools/android/android_tools.gyp:android_tools',
-  ],
-  'conditions': [
-     ['OS == "android"', {
-       'variables': {
-         # These are used to configure java_apk.gypi included below.
-         'test_type': 'gtest',
-         'apk_name': '<(test_suite_name)',
-         'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk',
-         'final_apk_path': '<(intermediate_dir)/<(test_suite_name)-debug.apk',
-         'java_in_dir': '<(DEPTH)/testing/android/native_test/java',
-         'native_lib_target': '<(test_suite_name)',
-         'gyp_managed_install': 0,
-       },
-       'includes': [
-         '../../build/java_apk.gypi',
-         '../../build/android/test_runner.gypi',
-       ],
-     }],  # 'OS == "android"
-  ],  # conditions
-}
diff --git a/webrtc/build/apk_tests.gyp b/webrtc/build/apk_tests.gyp
index 02a13421f9..fe05c0848a 100644
--- a/webrtc/build/apk_tests.gyp
+++ b/webrtc/build/apk_tests.gyp
@@ -61,23 +61,6 @@
       ],
     },
     {
-      'target_name': 'libjingle_peerconnection_unittest_apk',
-      'type': 'none',
-      'variables': {
-        'test_suite_name': 'libjingle_peerconnection_unittest',
-        'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)libjingle_peerconnection_unittest<(SHARED_LIB_SUFFIX)',
-      },
-      'dependencies': [
-        '<(DEPTH)/talk/libjingle_tests.gyp:libjingle_peerconnection_unittest',
-        '<(DEPTH)/talk/libjingle.gyp:libjingle_peerconnection_java',
-      ],
-      'includes': [
-        # Use webrtc copy of apk_test.gypi to allow test executables starting
-        # with "lib". See http://crbug.com/543820 for more details.
-        '../build/apk_test.gypi',
-      ],
-    },
-    {
       'target_name': 'modules_tests_apk',
       'type': 'none',
       'variables': {
diff --git a/webrtc/build/apk_tests_noop.gyp b/webrtc/build/apk_tests_noop.gyp
index ed9249aec5..489f2eea63 100644
--- a/webrtc/build/apk_tests_noop.gyp
+++ b/webrtc/build/apk_tests_noop.gyp
@@ -22,10 +22,6 @@
       'type': 'none',
     },
     {
-      'target_name': 'libjingle_peerconnection_unittest_apk',
-      'type': 'none',
-    },
-    {
       'target_name': 'modules_tests_apk',
       'type': 'none',
     },
diff --git a/webrtc/system_wrappers/include/field_trial_default.h b/webrtc/system_wrappers/include/field_trial_default.h
index 7417ced39d..d098ea1d91 100644
--- a/webrtc/system_wrappers/include/field_trial_default.h
+++ b/webrtc/system_wrappers/include/field_trial_default.h
@@ -20,8 +20,6 @@ namespace field_trial {
 // Note: trials_string must never be destroyed.
 void InitFieldTrialsFromString(const char* trials_string);
 
-const char* GetFieldTrialString();
-
 }  // namespace field_trial
 }  // namespace webrtc
 
diff --git a/webrtc/system_wrappers/source/field_trial_default.cc b/webrtc/system_wrappers/source/field_trial_default.cc
index 0e2c286117..1a9bd6bc79 100644
--- a/webrtc/system_wrappers/source/field_trial_default.cc
+++ b/webrtc/system_wrappers/source/field_trial_default.cc
@@ -58,9 +58,5 @@ void InitFieldTrialsFromString(const char* trials_string) {
   trials_init_string = trials_string;
 }
 
-const char* GetFieldTrialString() {
-  return trials_init_string;
-}
-
 }  // namespace field_trial
 }  // namespace webrtc
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index 45913a9bc3..2fbd6df58a 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -27,7 +27,6 @@ source_set("field_trial") {
   deps = [
     "..:webrtc_common",
     "../system_wrappers",
-    "../system_wrappers:field_trial_default",
   ]
 
   configs += [ "..:common_config" ]
diff --git a/webrtc/test/field_trial.cc b/webrtc/test/field_trial.cc
index c40d0783d8..613fb67679 100644
--- a/webrtc/test/field_trial.cc
+++ b/webrtc/test/field_trial.cc
@@ -18,13 +18,27 @@
 #include <string>
 
 #include "webrtc/system_wrappers/include/field_trial.h"
-#include "webrtc/system_wrappers/include/field_trial_default.h"
 
 namespace webrtc {
 namespace {
+// Clients of this library have show a clear intent to setup field trials by
+// linking with it. As so try to crash if they forget to call
+// InitFieldTrialsFromString before webrtc tries to access a field trial.
 bool field_trials_initiated_ = false;
+std::map<std::string, std::string> field_trials_;
 }  // namespace
 
+namespace field_trial {
+std::string FindFullName(const std::string& trial_name) {
+  assert(field_trials_initiated_);
+  std::map<std::string, std::string>::const_iterator it =
+      field_trials_.find(trial_name);
+  if (it == field_trials_.end())
+    return std::string();
+  return it->second;
+}
+}  // namespace field_trial
+
 namespace test {
 // Note: this code is copied from src/base/metrics/field_trial.cc since the aim
 // is to mimic chromium --force-fieldtrials.
@@ -39,7 +53,6 @@ void InitFieldTrialsFromString(const std::string& trials_string) {
     return;
 
   size_t next_item = 0;
-  std::map<std::string, std::string> field_trials;
   while (next_item < trials_string.length()) {
     size_t name_end = trials_string.find(kPersistentStringSeparator, next_item);
     if (name_end == trials_string.npos || next_item == name_end)
@@ -54,18 +67,15 @@ void InitFieldTrialsFromString(const std::string& trials_string) {
     next_item = group_name_end + 1;
 
     // Fail if duplicate with different group name.
-    if (field_trials.find(name) != field_trials.end() &&
-        field_trials.find(name)->second != group_name) {
+    if (field_trials_.find(name) != field_trials_.end() &&
+        field_trials_.find(name)->second != group_name)
       break;
-    }
 
-    field_trials[name] = group_name;
+    field_trials_[name] = group_name;
 
     // Successfully parsed all field trials from the string.
-    if (next_item == trials_string.length()) {
-      webrtc::field_trial::InitFieldTrialsFromString(trials_string.c_str());
+    if (next_item == trials_string.length())
       return;
-    }
   }
   // Using fprintf as LOG does not print when this is called early in main.
   fprintf(stderr, "Invalid field trials string.\n");
@@ -75,18 +85,18 @@ void InitFieldTrialsFromString(const std::string& trials_string) {
 }
 
 ScopedFieldTrials::ScopedFieldTrials(const std::string& config)
-  : previous_field_trials_(webrtc::field_trial::GetFieldTrialString()) {
+    : previous_field_trials_(field_trials_) {
   assert(field_trials_initiated_);
   field_trials_initiated_ = false;
-  current_field_trials_ = config;
-  InitFieldTrialsFromString(current_field_trials_);
+  field_trials_.clear();
+  InitFieldTrialsFromString(config);
 }
 
 ScopedFieldTrials::~ScopedFieldTrials() {
   // Should still be initialized, since InitFieldTrials is called from ctor.
   // That's why we don't restore the flag.
   assert(field_trials_initiated_);
-  webrtc::field_trial::InitFieldTrialsFromString(previous_field_trials_);
+  field_trials_ = previous_field_trials_;
 }
 
 }  // namespace test
diff --git a/webrtc/test/field_trial.h b/webrtc/test/field_trial.h
index 735aa1f833..d448f3411d 100644
--- a/webrtc/test/field_trial.h
+++ b/webrtc/test/field_trial.h
@@ -39,8 +39,7 @@ class ScopedFieldTrials {
   explicit ScopedFieldTrials(const std::string& config);
   ~ScopedFieldTrials();
  private:
-  std::string current_field_trials_;
-  const char* previous_field_trials_;
+  const std::map<std::string, std::string> previous_field_trials_;
 };
 
 }  // namespace test
diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp
index dbb1be9ad0..0af17f793b 100644
--- a/webrtc/test/test.gyp
+++ b/webrtc/test/test.gyp
@@ -79,7 +79,6 @@
       ],
       'dependencies': [
         '<(webrtc_root)/common.gyp:webrtc_common',
-        '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
     },