Move all pipeline integration tests to media/test.

Prework required (and desired) for creating a mojo version of the
pipeline integration tests.

BUG=440850
TEST=builds and runs in gn and gyp.

Review URL: https://codereview.chromium.org/791983003

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

8 files changed, 97 insertions, 42 deletions

diff --git a/media/BUILD.gn b/media/BUILD.gn
index 178c9df..33a4799 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -546,6 +546,7 @@ test("media_unittests") {
     "//media/audio:test_support",
     "//media/base:unittests",
     "//media/base:test_support",
+    "//media/test:pipeline_integration_tests",
     "//skia",  # Direct dependency required to inherit config.
     "//testing/gmock",
     "//testing/gtest",
@@ -572,8 +573,6 @@ test("media_unittests") {
       "filters/ffmpeg_glue_unittest.cc",
       "filters/ffmpeg_video_decoder_unittest.cc",
       "filters/in_memory_url_protocol_unittest.cc",
-      "filters/pipeline_integration_test.cc",
-      "filters/pipeline_integration_test_base.cc",
     ]
   }
 
@@ -635,13 +634,6 @@ test("media_unittests") {
 }
 
 test("media_perftests") {
-  sources = []
-  if (media_use_ffmpeg) {
-    sources += [
-      "filters/pipeline_integration_perftest.cc",
-      "filters/pipeline_integration_test_base.cc",
-    ]
-  }
   configs += [ ":media_config" ]
   deps = [
     ":media",
@@ -651,6 +643,7 @@ test("media_perftests") {
     "//media/audio:test_support",
     "//media/base:perftests",
     "//media/base:test_support",
+    "//media/test:pipeline_integration_perftests",
     "//testing/gmock",
     "//testing/gtest",
     "//testing/perf",
@@ -713,32 +706,23 @@ if (media_use_ffmpeg) {
     sources = [
       "base/run_all_unittests.cc",
       "ffmpeg/ffmpeg_regression_tests.cc",
-      "filters/pipeline_integration_test_base.cc",
     ]
-    configs += [ ":media_config" ]
+
+    configs += [ "//media:media_config" ]
+
     deps = [
-      ":media",
-      ":test_support",
       "//base/test:test_support",
+      "//media",
+      "//media:test_support",
       "//media/audio:test_support",
       "//media/base:test_support",
+      "//media/test:pipeline_integration_tests",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/ffmpeg",
       "//ui/gfx/geometry",
       "//ui/gfx:test_support",
     ]
-
-    # TODO(ajwong): This was in the original gyp, but it seems silly.
-    #        ['os_posix==1 and OS!="mac"', {
-    #          'conditions': [
-    #            ['use_allocator!="none"', {
-    #              'dependencies': [
-    #                '../base/allocator/allocator.gyp:allocator',
-    #              ],
-    #            }],
-    #          ],
-    #        }],
   }
 }
 
diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc
index 644fd03..265c4dd 100644
--- a/media/ffmpeg/ffmpeg_regression_tests.cc
+++ b/media/ffmpeg/ffmpeg_regression_tests.cc
@@ -19,11 +19,10 @@
 // Test cases labeled FLAKY may not always pass, but they should never crash or
 // cause any kind of warnings or errors under tooling.
 
-#include "media/filters/pipeline_integration_test_base.h"
-
 #include <string>
 
 #include "base/bind.h"
+#include "media/test/pipeline_integration_test_base.h"
 
 namespace media {
 
diff --git a/media/media.gyp b/media/media.gyp
index 7169531..c16a880 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1201,8 +1201,6 @@
         'filters/h264_bit_reader_unittest.cc',
         'filters/h264_parser_unittest.cc',
         'filters/in_memory_url_protocol_unittest.cc',
-        'filters/pipeline_integration_test.cc',
-        'filters/pipeline_integration_test_base.cc',
         'filters/renderer_impl_unittest.cc',
         'filters/skcanvas_video_renderer_unittest.cc',
         'filters/source_buffer_stream_unittest.cc',
@@ -1231,6 +1229,8 @@
         'formats/webm/webm_parser_unittest.cc',
         'formats/webm/webm_tracks_parser_unittest.cc',
         'formats/webm/webm_webvtt_parser_unittest.cc',
+        'test/pipeline_integration_test.cc',
+        'test/pipeline_integration_test_base.cc',
       ],
       'include_dirs': [
         # Needed by media_drm_bridge.cc.
@@ -1261,8 +1261,8 @@
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
             'filters/ffmpeg_video_decoder_unittest.cc',
             'filters/in_memory_url_protocol_unittest.cc',
-            'filters/pipeline_integration_test.cc',
-            'filters/pipeline_integration_test_base.cc',
+            'test/pipeline_integration_test.cc',
+            'test/pipeline_integration_test_base.cc',
           ],
         }],
         ['use_alsa==1', {
@@ -1384,8 +1384,8 @@
         'base/sinc_resampler_perftest.cc',
         'base/vector_math_perftest.cc',
         'base/yuv_convert_perftest.cc',
-        'filters/pipeline_integration_perftest.cc',
-        'filters/pipeline_integration_test_base.cc',
+        'test/pipeline_integration_perftest.cc',
+        'test/pipeline_integration_test_base.cc',
       ],
       'conditions': [
         ['arm_neon==1', {
@@ -1406,8 +1406,8 @@
         }, {  # media_use_ffmpeg==0
           'sources!': [
             'base/demuxer_perftest.cc',
-            'filters/pipeline_integration_perftest.cc',
-            'filters/pipeline_integration_test_base.cc',
+            'test/pipeline_integration_perftest.cc',
+            'test/pipeline_integration_test_base.cc',
           ],
         }],
       ],
@@ -1795,7 +1795,7 @@
           'sources': [
             'base/run_all_unittests.cc',
             'ffmpeg/ffmpeg_regression_tests.cc',
-            'filters/pipeline_integration_test_base.cc',
+            'test/pipeline_integration_test_base.cc',
           ],
           'conditions': [
             ['os_posix==1 and OS!="mac"', {
diff --git a/media/test/BUILD.gn b/media/test/BUILD.gn
new file mode 100644
index 0000000..2ce266b
--- /dev/null
+++ b/media/test/BUILD.gn
@@ -0,0 +1,73 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//media/media_options.gni")
+
+source_set("pipeline_integration_test_base") {
+  testonly = true
+
+  if (media_use_ffmpeg) {
+    sources = [
+      "pipeline_integration_test_base.cc",
+      "pipeline_integration_test_base.h",
+    ]
+
+    deps = [
+      "//base",
+      "//media",
+      "//media:test_support",
+      "//media/audio:test_support",
+      "//media/base:test_support",
+      "//testing/gmock",
+      "//testing/gtest",
+    ]
+  }
+}
+
+source_set("pipeline_integration_tests") {
+  testonly = true
+
+  if (media_use_ffmpeg) {
+    sources = [
+      "pipeline_integration_test.cc",
+    ]
+
+    deps = [
+      ":pipeline_integration_test_base",
+      "//base",
+      "//media",
+      "//media:test_support",
+      "//media/audio:test_support",
+      "//media/base:test_support",
+      "//testing/gtest",
+
+      # TODO(dalecurtis): Required since the gmock header is included in the
+      # header for pipeline_integration_test_base.h.  This should be moved into
+      # the .cc file to avoid the extra dependency here.
+      "//testing/gmock",
+    ]
+  }
+}
+
+source_set("pipeline_integration_perftests") {
+  testonly = true
+
+  if (media_use_ffmpeg) {
+    sources = [
+      "pipeline_integration_perftest.cc",
+    ]
+
+    deps = [
+      ":pipeline_integration_test_base",
+      "//media/base:test_support",
+      "//testing/gtest",
+      "//testing/perf",
+
+      # TODO(dalecurtis): Required since the gmock header is included in the
+      # header for pipeline_integration_test_base.h.  This should be moved into
+      # the .cc file to avoid the extra dependency here.
+      "//testing/gmock",
+    ]
+  }
+}
diff --git a/media/filters/pipeline_integration_perftest.cc b/media/test/pipeline_integration_perftest.cc
index eac3be8..81efc90 100644
--- a/media/filters/pipeline_integration_perftest.cc
+++ b/media/test/pipeline_integration_perftest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "media/base/test_data_util.h"
-#include "media/filters/pipeline_integration_test_base.h"
+#include "media/test/pipeline_integration_test_base.h"
 #include "testing/perf/perf_test.h"
 
 namespace media {
diff --git a/media/filters/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index beb9bd0..279c122 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/filters/pipeline_integration_test_base.h"
-
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ -19,6 +17,7 @@
 #include "media/cdm/json_web_key.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/renderer_impl.h"
+#include "media/test/pipeline_integration_test_base.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::_;
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc
index 5647eb1..683a334 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/test/pipeline_integration_test_base.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/filters/pipeline_integration_test_base.h"
+#include "media/test/pipeline_integration_test_base.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
diff --git a/media/filters/pipeline_integration_test_base.h b/media/test/pipeline_integration_test_base.h
index 1c8b5d6..905cb75 100644
--- a/media/filters/pipeline_integration_test_base.h
+++ b/media/test/pipeline_integration_test_base.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FILTERS_PIPELINE_INTEGRATION_TEST_BASE_H_
-#define MEDIA_FILTERS_PIPELINE_INTEGRATION_TEST_BASE_H_
+#ifndef MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
+#define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
 
 #include "base/md5.h"
 #include "base/message_loop/message_loop.h"
@@ -144,4 +144,4 @@ class PipelineIntegrationTestBase {
 
 }  // namespace media
 
-#endif  // MEDIA_FILTERS_PIPELINE_INTEGRATION_TEST_BASE_H_
+#endif  // MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_