From 5fe2d65c43b3087e48b438e7bb6c469d84bc3611 Mon Sep 17 00:00:00 2001
From: "kjellander@webrtc.org"
 <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 18 Dec 2013 13:27:37 +0000
Subject: [PATCH] Remove metrics_unittests

This target has been merged into video_engine_tests in r5284.

BUG=webrtc:1843
R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/6129004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5319 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/build/apk_tests.gyp            | 14 -------
 webrtc/build/apk_tests_noop.gyp       |  4 --
 webrtc/test/metrics.gyp               | 54 ---------------------------
 webrtc/test/metrics_unittests.isolate | 38 -------------------
 4 files changed, 110 deletions(-)
 delete mode 100644 webrtc/test/metrics_unittests.isolate

diff --git a/webrtc/build/apk_tests.gyp b/webrtc/build/apk_tests.gyp
index 4a1f6e0e2..8464d70f7 100644
--- a/webrtc/build/apk_tests.gyp
+++ b/webrtc/build/apk_tests.gyp
@@ -60,20 +60,6 @@
         '../../../build/apk_test.gypi',
       ],
     },
-    {
-      'target_name': 'metrics_unittests_apk',
-      'type': 'none',
-      'variables': {
-        'test_suite_name': 'metrics_unittests',
-        'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)metrics_unittests<(SHARED_LIB_SUFFIX)',
-      },
-      'dependencies': [
-        '<(webrtc_root)/test/metrics.gyp:metrics_unittests',
-      ],
-      'includes': [
-        '../../../build/apk_test.gypi',
-      ],
-    },
     {
       'target_name': 'modules_tests_apk',
       'type': 'none',
diff --git a/webrtc/build/apk_tests_noop.gyp b/webrtc/build/apk_tests_noop.gyp
index 98c4af9aa..daf86e342 100644
--- a/webrtc/build/apk_tests_noop.gyp
+++ b/webrtc/build/apk_tests_noop.gyp
@@ -21,10 +21,6 @@
       'target_name': 'common_video_unittests_apk',
       'type': 'none',
     },
-    {
-      'target_name': 'metrics_unittests',
-      'type': 'none',
-    },
     {
       'target_name': 'modules_tests_apk',
       'type': 'none',
diff --git a/webrtc/test/metrics.gyp b/webrtc/test/metrics.gyp
index 3d61b6c0f..0486a7c9e 100644
--- a/webrtc/test/metrics.gyp
+++ b/webrtc/test/metrics.gyp
@@ -28,59 +28,5 @@
         'testsupport/metrics/video_metrics.cc',
       ],
     },
-    {
-      'target_name': 'metrics_unittests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        'metrics',
-        '<(webrtc_root)/test/test.gyp:test_support_main',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-      ],
-      'sources': [
-        'testsupport/metrics/video_metrics_unittest.cc',
-      ],
-      'conditions': [
-        # TODO(henrike): remove build_with_chromium==1 when the bots are
-        # using Chromium's buildbots.
-        ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', {
-          'dependencies': [
-            '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
-          ],
-        }],
-      ],
-    },
   ], # targets
-  'conditions': [
-    # TODO(henrike): remove build_with_chromium==1 when the bots are using
-    # Chromium's buildbots.
-    ['include_tests==1 and build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', {
-      'targets': [
-        {
-          'target_name': 'metrics_unittests_apk_target',
-          'type': 'none',
-          'dependencies': [
-            '<(apk_tests_path):metrics_unittests_apk',
-          ],
-        },
-      ],
-    }],
-    ['test_isolation_mode != "noop"', {
-      'targets': [
-        {
-          'target_name': 'metrics_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            'metrics_unittests',
-          ],
-          'includes': [
-            '../build/isolate.gypi',
-            'metrics_unittests.isolate',
-          ],
-          'sources': [
-            'metrics_unittests.isolate',
-          ],
-        },
-      ],
-    }],
-  ],
 }
diff --git a/webrtc/test/metrics_unittests.isolate b/webrtc/test/metrics_unittests.isolate
deleted file mode 100644
index 1a196d653..000000000
--- a/webrtc/test/metrics_unittests.isolate
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2013 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.
-{
-  'conditions': [
-    ['OS=="android"', {
-      # When doing Android builds, the WebRTC code is put in third_party/webrtc
-      # of a Chromium checkout, this is one level above the standalone build.
-      'variables': {
-        'isolate_dependency_untracked': [
-          '../../../data/',
-          '../../../resources/',
-        ],
-      },
-    }],
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../testing/test_env.py',
-          '<(PRODUCT_DIR)/metrics_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_tracked': [
-          '../../DEPS',
-          '../../resources/foreman_cif_short.yuv',
-          '../../testing/test_env.py',
-          '<(PRODUCT_DIR)/metrics_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_untracked': [
-          '../../tools/swarming_client/',
-        ],
-      },
-    }],
-  ],
-}