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

Unified Diff: chrome/chrome_tests.gypi

Issue 631333003: Adding application lifetime tests to athena, allowing to override focus request for applciations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 2 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/browser/ui/apps/chrome_app_window_client.cc ('k') | extensions/browser/app_window/app_window.cc » ('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 4daebb4e5c5806aae2114c2ddb2fa29e3e327a2e..16576da758af98cb5ac9ba35302cac37b596b611 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1850,7 +1850,6 @@
],
'sources!': [
'<@(chrome_browser_tests_sources)',
- 'browser/extensions/api/networking_private/networking_private_apitest.cc',
],
'sources': [
'../athena/test/base/activity_lifetime_tracker.h',
@@ -2090,7 +2089,7 @@
'../components/components.gyp:wifi_test_support',
],
}],
- ['chromeos == 1', {
+ ['chromeos == 1 and use_athena == 0', {
'sources': [
'browser/extensions/api/networking_private/networking_private_apitest.cc',
'browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc',
« no previous file with comments | « chrome/browser/ui/apps/chrome_app_window_client.cc ('k') | extensions/browser/app_window/app_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698