Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2031)

Unified Diff: chrome/chrome_tests.gypi

Issue 7067020: Moving mediaplayer to the chrome filebrowser. Observable behaviour should not change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolved conflicts. Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/extensions/api/extension_api.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 6dcd2cc53ff9f82bf931594de664cc89f89e6bdf..31b7ce7328acf4cf76a7e793c2e92dbb503645c2 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2286,6 +2286,7 @@
'browser/chromeos/login/wizard_controller_browsertest.cc',
'browser/chromeos/login/wizard_in_process_browser_test.cc',
'browser/chromeos/login/wizard_in_process_browser_test.h',
+ 'browser/chromeos/media/media_player_browsertest.cc',
'browser/chromeos/network_state_notifier_browsertest.cc',
'browser/chromeos/notifications/notification_browsertest.cc',
'browser/chromeos/panels/panel_browsertest.cc',
@@ -2429,7 +2430,6 @@
'browser/ui/views/dom_view_browsertest.cc',
'browser/ui/views/html_dialog_view_browsertest.cc',
'browser/ui/webui/chrome_url_data_manager_browsertest.cc',
- 'browser/ui/webui/mediaplayer_browsertest.cc',
'browser/ui/webui/ntp/most_visited_browsertest.cc',
'browser/ui/webui/settings_browsertest.cc',
'browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc',
@@ -2485,7 +2485,7 @@
['exclude', '^browser/chromeos'],
],
'sources!': [
- 'browser/ui/webui/mediaplayer_browsertest.cc',
+ 'browser/chromeos/media/media_player_browsertest.cc',
],
}, { #else: OS == "chromeos"
'sources!': [
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/extensions/api/extension_api.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698