diff options
Diffstat (limited to 'content/browser/media')
7 files changed, 8 insertions, 8 deletions
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc index d9ef168..f284add 100644 --- a/content/browser/media/media_browsertest.cc +++ b/content/browser/media/media_browsertest.cc @@ -9,8 +9,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test_utils.h" // TODO(wolenetz): Fix Media.YUV* tests on MSVS 2012 x64. crbug.com/180074 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) && _MSC_VER == 1700 diff --git a/content/browser/media/media_browsertest.h b/content/browser/media/media_browsertest.h index 8bffb3d..b242db3 100644 --- a/content/browser/media/media_browsertest.h +++ b/content/browser/media/media_browsertest.h @@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "content/test/content_browser_test.h" +#include "content/public/test/content_browser_test.h" namespace content { diff --git a/content/browser/media/media_canplaytype_browsertest.cc b/content/browser/media/media_canplaytype_browsertest.cc index 2002124..4a5b5a8 100644 --- a/content/browser/media/media_canplaytype_browsertest.cc +++ b/content/browser/media/media_canplaytype_browsertest.cc @@ -6,8 +6,8 @@ #include "content/browser/media/media_browsertest.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test_utils.h" const char* kProbably = "probably"; const char* kMaybe = "maybe"; diff --git a/content/browser/media/webrtc_aecdump_browsertest.cc b/content/browser/media/webrtc_aecdump_browsertest.cc index ff8cd14..2a4d8ea 100644 --- a/content/browser/media/webrtc_aecdump_browsertest.cc +++ b/content/browser/media/webrtc_aecdump_browsertest.cc @@ -11,8 +11,8 @@ #include "base/test/trace_event_analyzer.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test_utils.h" #include "content/test/webrtc_content_browsertest_base.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc index 62b50da..cec4227 100644 --- a/content/browser/media/webrtc_browsertest.cc +++ b/content/browser/media/webrtc_browsertest.cc @@ -9,9 +9,9 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test_utils.h" #include "content/test/webrtc_content_browsertest_base.h" #include "media/audio/audio_manager.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc index 62aadb8..03493c0 100644 --- a/content/browser/media/webrtc_getusermedia_browsertest.cc +++ b/content/browser/media/webrtc_getusermedia_browsertest.cc @@ -12,9 +12,9 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test_utils.h" #include "content/test/webrtc_content_browsertest_base.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/perf/perf_test.h" diff --git a/content/browser/media/webrtc_internals_browsertest.cc b/content/browser/media/webrtc_internals_browsertest.cc index ed2a0da..8e071c7 100644 --- a/content/browser/media/webrtc_internals_browsertest.cc +++ b/content/browser/media/webrtc_internals_browsertest.cc @@ -9,9 +9,9 @@ #include "base/values.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" using std::string; |