summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/browser/resources/media/new/media_internals.js2
-rw-r--r--content/browser/resources/media/new/player_manager.js (renamed from content/browser/resources/media/new/manager.js)0
-rw-r--r--content/test/data/media/webui/player_manager_test.html (renamed from content/test/data/media/webui/manager_test.html)0
-rw-r--r--content/test/webui_resource_browsertest.cc4
4 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/resources/media/new/media_internals.js b/content/browser/resources/media/new/media_internals.js
index ced99d5..67c2944 100644
--- a/content/browser/resources/media/new/media_internals.js
+++ b/content/browser/resources/media/new/media_internals.js
@@ -6,7 +6,7 @@ var media = {};
<include src="util.js"/>
<include src="player_info.js"/>
-<include src="manager.js"/>
+<include src="player_manager.js"/>
<include src="client_renderer.js"/>
<include src="main.js"/>
diff --git a/content/browser/resources/media/new/manager.js b/content/browser/resources/media/new/player_manager.js
index 1ba1301..1ba1301 100644
--- a/content/browser/resources/media/new/manager.js
+++ b/content/browser/resources/media/new/player_manager.js
diff --git a/content/test/data/media/webui/manager_test.html b/content/test/data/media/webui/player_manager_test.html
index 73ea76c..73ea76c 100644
--- a/content/test/data/media/webui/manager_test.html
+++ b/content/test/data/media/webui/player_manager_test.html
diff --git a/content/test/webui_resource_browsertest.cc b/content/test/webui_resource_browsertest.cc
index 454f65c..317d519 100644
--- a/content/test/webui_resource_browsertest.cc
+++ b/content/test/webui_resource_browsertest.cc
@@ -64,8 +64,8 @@ IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, MediaInternals_PlayerInfo) {
RunMediaInternalsTest(FILE_PATH_LITERAL("player_info_test.html"));
}
-IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, MediaInternals_Manager) {
- RunMediaInternalsTest(FILE_PATH_LITERAL("manager_test.html"));
+IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, MediaInternals_PlayerManager) {
+ RunMediaInternalsTest(FILE_PATH_LITERAL("player_manager_test.html"));
}
} // namespace content