Move gtest_prod_util.h out of webrtc/test tree.

This is needed because the target is defined in webrtc/common.gyp
and its current location crosses package boundaries when generating
projects for some build systems.

NOTRY=True

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

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

webrtc/BUILD.gn

@@ -246,12 +246,6 @@ source_set("webrtc_common") {
   }
 }
 
-source_set("gtest_prod") {
-  sources = [
-    "test/testsupport/gtest_prod_util.h",
-  ]
-}
-
 if (rtc_enable_protobuf) {
   proto_library("rtc_event_log_proto") {
     sources = [

webrtc/base/BUILD.gn

@@ -643,3 +643,9 @@ if (is_ios) {
     ]
   }
 }
+
+source_set("gtest_prod") {
+  sources = [
+    "gtest_prod_util.h",
+  ]
+}

webrtc/base/base.gyp

@@ -746,5 +746,12 @@
         }],
       ],
     },
+    {
+     'target_name': 'gtest_prod',
+      'type': 'static_library',
+      'sources': [
+        'gtest_prod_util.h',
+      ],
+    },
   ],
 }

webrtc/base/gtest_prod_util.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_TEST_TESTSUPPORT_GTEST_PROD_UTIL_H_
-#define WEBRTC_TEST_TESTSUPPORT_GTEST_PROD_UTIL_H_
+#ifndef WEBRTC_BASE_GTEST_PROD_UTIL_H_
+#define WEBRTC_BASE_GTEST_PROD_UTIL_H_
 
 // Define our own version of FRIEND_TEST here rather than including
 // gtest_prod.h to avoid depending on any part of GTest in production code.
@@ -35,4 +35,4 @@ friend class test_case_name##_##test_name##_Test
   FRIEND_TEST_WEBRTC(test_case_name, FLAKY_##test_name); \
   FRIEND_TEST_WEBRTC(test_case_name, FAILS_##test_name)
 
-#endif  // WEBRTC_TEST_TESTSUPPORT_GTEST_PROD_UTIL_H_
+#endif  // WEBRTC_BASE_GTEST_PROD_UTIL_H_

webrtc/common.gyp

@@ -20,12 +20,5 @@
         'typedefs.h',
       ],
     },
-    {
-      'target_name': 'gtest_prod',
-      'type': 'static_library',
-      'sources': [
-        'test/testsupport/gtest_prod_util.h',
-      ],
-    },
   ],
 }

webrtc/common_audio/channel_buffer.h

@@ -14,9 +14,9 @@
 #include <string.h>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/gtest_prod_util.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/common_audio/include/audio_util.h"
-#include "webrtc/test/testsupport/gtest_prod_util.h"
 
 namespace webrtc {
 

webrtc/common_audio/resampler/sinc_resampler.h

@@ -15,9 +15,9 @@
 #define WEBRTC_COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_
 
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/gtest_prod_util.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/system_wrappers/include/aligned_malloc.h"
-#include "webrtc/test/testsupport/gtest_prod_util.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/nack.h

@@ -14,9 +14,9 @@
 #include <vector>
 #include <map>
 
+#include "webrtc/base/gtest_prod_util.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
-#include "webrtc/test/testsupport/gtest_prod_util.h"
 
 //
 // The Nack class keeps track of the lost packets, an estimate of time-to-play

webrtc/modules/audio_processing/transient/transient_suppressor.h

@@ -14,8 +14,8 @@
 #include <deque>
 #include <set>
 
+#include "webrtc/base/gtest_prod_util.h"
 #include "webrtc/base/scoped_ptr.h"
-#include "webrtc/test/testsupport/gtest_prod_util.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/remote_bitrate_estimator/test/bwe.h

@@ -16,7 +16,7 @@
 #include <sstream>
 #include <string>
 
-#include "webrtc/test/testsupport/gtest_prod_util.h"
+#include "webrtc/base/gtest_prod_util.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"

webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h

@@ -17,7 +17,7 @@
 #include <vector>
 
 #include "webrtc/base/common.h"
-#include "webrtc/test/testsupport/gtest_prod_util.h"
+#include "webrtc/base/gtest_prod_util.h"
 
 namespace webrtc {
 namespace testing {

webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h

@@ -16,13 +16,13 @@
 #include <utility>
 #include <vector>
 
+#include "webrtc/base/gtest_prod_util.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/rtp_rtcp/source/packet_loss_stats.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
-#include "webrtc/test/testsupport/gtest_prod_util.h"
 
 namespace webrtc {
 

webrtc/test/BUILD.gn

@@ -70,7 +70,7 @@ source_set("test_support") {
   ]
 
   deps = [
-    "..:gtest_prod",
+    "../base:gtest_prod",
     "../system_wrappers",
     "//testing/gmock",
     "//testing/gtest",

webrtc/test/test.gyp

@@ -133,7 +133,7 @@
       'dependencies': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/testing/gmock.gyp:gmock',
-        '<(webrtc_root)/common.gyp:gtest_prod',
+        '<(webrtc_root)/base/base.gyp:gtest_prod',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
       'sources': [

webrtc/tools/BUILD.gn

@@ -20,7 +20,7 @@ source_set("command_line_parser") {
     "simple_command_line_parser.h",
   ]
   deps = [
-    "..:gtest_prod",
+    "../base:gtest_prod",
   ]
   configs += [ "..:common_config" ]
   public_configs = [ "..:common_inherited_config" ]

webrtc/tools/internal_tools.gyp

@@ -21,7 +21,7 @@
         'simple_command_line_parser.cc',
       ],
       'dependencies': [
-        '<(webrtc_root)/common.gyp:gtest_prod',
+        '<(webrtc_root)/base/base.gyp:gtest_prod',
       ],
     }, # command_line_parser
   ],

webrtc/tools/simple_command_line_parser.h

@@ -16,7 +16,7 @@
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/test/testsupport/gtest_prod_util.h"
+#include "webrtc/base/gtest_prod_util.h"
 
 // This is a very basic command line parsing class. We pass the command line
 // arguments and their number and the class forms a vector out of these. Than we