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

Unified Diff: chrome/chrome_tests.gypi

Issue 9699054: rlz: Hook up on mac, switch to chrome's network stack on win. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: last test should pass Created 8 years, 9 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
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 3e31531e91c493e1aea72c5785d5dfa75e9ead01..7771b0f0fc83873427d962ec9d65657a6ea149e0 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2347,6 +2347,11 @@
'browser/spellchecker/spellchecker_platform_engine_unittest.cc',
],
}],
+ ['OS!="win" and OS!="mac"', {
Mark Mentovai 2012/03/26 19:52:18 Only for official? Maybe there should be an enabl
Roger Tawa OOO till Jul 10th 2012/03/26 19:57:14 I would rather leave it as Nico has it here so tha
+ 'sources!': [
+ 'browser/rlz/rlz_unittest.cc',
+ ],
+ }],
['OS=="win"', {
'dependencies': [
'chrome_version_resources',
@@ -2408,7 +2413,6 @@
'app/chrome_dll.rc',
'browser/accessibility/browser_accessibility_win_unittest.cc',
'browser/bookmarks/bookmark_node_data_unittest.cc',
- 'browser/rlz/rlz_unittest.cc',
'browser/search_engines/template_url_scraper_unittest.cc',
'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc',
'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
@@ -3072,6 +3076,11 @@
'../content/browser/accessibility/dump_accessibility_tree_helper.cc',
],
}],
+ ['OS!="win" and OS!="mac"', {
+ 'sources!': [
+ 'browser/rlz/rlz_extension_apitest.cc',
+ ],
+ }],
['OS=="win"', {
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
@@ -3118,7 +3127,6 @@
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
'app/chrome_version.rc.version',
- 'browser/rlz/rlz_extension_apitest.cc',
],
}],
['toolkit_uses_gtk == 1', {

Powered by Google App Engine
This is Rietveld 408576698