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

Unified Diff: chrome/chrome_tests.gypi

Issue 501303002: [Mac] Make app shims load the same framework version as the running Chrome process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase Created 6 years, 4 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/apps/shortcut_manager.cc ('k') | chrome/common/mac/app_mode_chrome_locator.h » ('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 1740028f02d7eed4c8a7d99e109c866e4f34db8c..a0b6a52d234d1603cc6b0000ddbeb88a7300b03d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1556,6 +1556,7 @@
'browser/ui/webui/web_ui_test_handler.h',
'browser/ui/zoom/zoom_controller_browsertest.cc',
'browser/unload_browsertest.cc',
+ 'common/mac/app_mode_chrome_locator_browsertest.mm',
'common/mac/mock_launchd.cc',
'common/mac/mock_launchd.h',
'common/time_format_browsertest.cc',
@@ -1940,6 +1941,7 @@
# chrome_resources.gyp:{packed_extra_resources,packed_resources},
# and can build this target standalone much faster.
'dependencies': [
+ 'app_mode_app_support',
'chrome',
'../components/components.gyp:breakpad_stubs',
'../third_party/ocmock/ocmock.gyp:ocmock',
@@ -2689,36 +2691,6 @@
},
],
'conditions': [
- ['OS=="mac"', {
- 'targets': [
- {
- # Tests for Mac app launcher.
- 'target_name': 'app_mode_app_tests',
- 'type': 'executable',
- 'product_name': 'app_mode_app_tests',
- 'dependencies': [
- '../base/base.gyp:test_support_base',
- '../chrome/common_constants.gyp:common_constants',
- '../testing/gtest.gyp:gtest',
- 'chrome.gyp:chrome', # run time dependency
- 'app_mode_app_support',
- ],
- 'sources': [
- 'common/mac/app_mode_chrome_locator_unittest.mm',
- 'test/base/app_mode_app_tests.cc',
- ],
- 'include_dirs': [
- '..',
- ],
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
- '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
- ],
- },
- }, # target app_mode_app_tests
- ],
- }],
['OS!="mac"', {
'targets': [
{
« no previous file with comments | « chrome/browser/apps/shortcut_manager.cc ('k') | chrome/common/mac/app_mode_chrome_locator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698