Rename e/b/a/cast_channel/test_util

This filename conflicts with extensions/common test_util, which can be a problem for some linkers linking extensions test_support. BUG=457368 R=jamescook@chromium.org,kmarshall@chromium.org Review URL: https://codereview.chromium.org/911213002 Cr-Commit-Position: refs/heads/master@{#315678}
Denger-Network · Feb 11, 2015 · 7fa89d8 · 7fa89d8
1 parent aab3cc7
commit 7fa89d8
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 11 deletions.
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
@@ -67,8 +67,8 @@ grit("extensions_renderer_resources") {
 source_set("test_support") {
   testonly = true
   sources = [
-    "browser/api/cast_channel/test_util.cc",
-    "browser/api/cast_channel/test_util.h",
+    "browser/api/cast_channel/cast_test_util.cc",
+    "browser/api/cast_channel/cast_test_util.h",
     "browser/api/dns/mock_host_resolver_creator.cc",
     "browser/api/dns/mock_host_resolver_creator.h",
     "browser/api/storage/settings_test_util.cc",

diff --git a/extensions/browser/api/cast_channel/cast_channel_apitest.cc b/extensions/browser/api/cast_channel/cast_channel_apitest.cc
@@ -13,8 +13,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/api/cast_channel/cast_channel_api.h"
 #include "extensions/browser/api/cast_channel/cast_socket.h"
+#include "extensions/browser/api/cast_channel/cast_test_util.h"
 #include "extensions/browser/api/cast_channel/logger.h"
-#include "extensions/browser/api/cast_channel/test_util.h"
 #include "extensions/common/api/cast_channel.h"
 #include "extensions/common/api/cast_channel/cast_channel.pb.h"
 #include "extensions/common/switches.h"

diff --git a/extensions/browser/api/cast_channel/cast_socket_unittest.cc b/extensions/browser/api/cast_channel/cast_socket_unittest.cc
@@ -16,9 +16,9 @@
 #include "extensions/browser/api/cast_channel/cast_auth_util.h"
 #include "extensions/browser/api/cast_channel/cast_framer.h"
 #include "extensions/browser/api/cast_channel/cast_message_util.h"
+#include "extensions/browser/api/cast_channel/cast_test_util.h"
 #include "extensions/browser/api/cast_channel/cast_transport.h"
 #include "extensions/browser/api/cast_channel/logger.h"
-#include "extensions/browser/api/cast_channel/test_util.h"
 #include "extensions/common/api/cast_channel/cast_channel.pb.h"
 #include "net/base/address_list.h"
 #include "net/base/capturing_net_log.h"

diff --git a/...ons/browser/api/cast_channel/test_util.cc → ...rowser/api/cast_channel/cast_test_util.cc b/...ons/browser/api/cast_channel/test_util.cc → ...rowser/api/cast_channel/cast_test_util.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 "extensions/browser/api/cast_channel/test_util.h"
+#include "extensions/browser/api/cast_channel/cast_test_util.h"
 
 namespace extensions {
 namespace core_api {

diff --git a/...ions/browser/api/cast_channel/test_util.h → ...browser/api/cast_channel/cast_test_util.h b/...ions/browser/api/cast_channel/test_util.h → ...browser/api/cast_channel/cast_test_util.h
diff --git a/extensions/browser/api/cast_channel/cast_transport_unittest.cc b/extensions/browser/api/cast_channel/cast_transport_unittest.cc
@@ -10,9 +10,9 @@
 #include "base/test/simple_test_tick_clock.h"
 #include "extensions/browser/api/cast_channel/cast_framer.h"
 #include "extensions/browser/api/cast_channel/cast_socket.h"
+#include "extensions/browser/api/cast_channel/cast_test_util.h"
 #include "extensions/browser/api/cast_channel/logger.h"
 #include "extensions/browser/api/cast_channel/logger_util.h"
-#include "extensions/browser/api/cast_channel/test_util.h"
 #include "extensions/common/api/cast_channel/cast_channel.pb.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/completion_callback.h"

diff --git a/extensions/browser/api/cast_channel/keep_alive_delegate_unittest.cc b/extensions/browser/api/cast_channel/keep_alive_delegate_unittest.cc
@@ -5,7 +5,7 @@
 #include "extensions/browser/api/cast_channel/keep_alive_delegate.h"
 
 #include "base/timer/mock_timer.h"
-#include "extensions/browser/api/cast_channel/test_util.h"
+#include "extensions/browser/api/cast_channel/cast_test_util.h"
 #include "net/base/net_errors.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
@@ -1167,8 +1167,8 @@
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
-        'browser/api/cast_channel/test_util.cc',
-        'browser/api/cast_channel/test_util.h',
+        'browser/api/cast_channel/cast_test_util.cc',
+        'browser/api/cast_channel/cast_test_util.h',
         'browser/api/dns/mock_host_resolver_creator.cc',
         'browser/api/dns/mock_host_resolver_creator.h',
         'browser/api/storage/settings_test_util.cc',

diff --git a/extensions/extensions_tests.gyp b/extensions/extensions_tests.gyp
@@ -54,8 +54,6 @@
         'browser/api/cast_channel/cast_transport_unittest.cc',
         'browser/api/cast_channel/keep_alive_delegate_unittest.cc',
         'browser/api/cast_channel/logger_unittest.cc',
-        'browser/api/cast_channel/test_util.cc',
-        'browser/api/cast_channel/test_util.h',
         'browser/api/declarative/declarative_rule_unittest.cc',
         'browser/api/declarative/deduping_factory_unittest.cc',
         'browser/api/declarative/rules_registry_unittest.cc',