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

Unified Diff: content/test/BUILD.gn

Issue 2332423002: Added memory-monitor for ChromeOS. (Closed)
Patch Set: limit conditionals to only chromeos/linux (win, mac, etc. are automatic) Created 4 years, 3 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
« content/browser/BUILD.gn ('K') | « content/browser/memory/memory_monitor_linux.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 06f672bb792c6bae0a42b1f1b86d9ee4faf8ad6f..f415141f8799772a589185de24a46b03d7b399ea 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -1095,7 +1095,6 @@ test("content_unittests") {
"../browser/media/session/media_session_controller_unittest.cc",
"../browser/media/session/media_session_uma_helper_unittest.cc",
"../browser/memory/memory_coordinator_unittest.cc",
- "../browser/memory/memory_monitor_linux_unittest.cc",
"../browser/memory/memory_monitor_win_unittest.cc",
"../browser/memory/test_memory_monitor.cc",
"../browser/memory/test_memory_monitor.h",
@@ -1320,6 +1319,13 @@ test("content_unittests") {
"run_all_unittests.cc",
]
+ # Chromeos also defines linux but their memory-monitors conflict.
nasko 2016/09/19 17:05:05 nit: ChromeOS
+ if (is_chromeos) {
+ sources += [ "../browser/memory/memory_monitor_chromeos_unittest.cc" ]
+ } else {
+ sources += [ "../browser/memory/memory_monitor_linux_unittest.cc" ]
+ }
+
if (is_android || is_linux || is_mac || is_win) {
data = [
"$root_out_dir/content_shell.pak",
« content/browser/BUILD.gn ('K') | « content/browser/memory/memory_monitor_linux.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698