diff options
| author | estade <estade@chromium.org> | 2015-09-03 14:19:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-03 21:20:27 +0000 |
| commit | 418715ff100e2caab2fb20011ac61fe7f4cc95c5 (patch) | |
| tree | add578fb73655e99aeb2163ec9aeb987b45c1006 /chrome/chrome_tests.gypi | |
| parent | 27b1c65bcab31c7c9a900420cdb4b42ab3205e98 (diff) | |
| download | chromium_src-418715ff100e2caab2fb20011ac61fe7f4cc95c5.zip chromium_src-418715ff100e2caab2fb20011ac61fe7f4cc95c5.tar.gz chromium_src-418715ff100e2caab2fb20011ac61fe7f4cc95c5.tar.bz2 | |
Re-enable mistakenly disabled test
ProfileChooserViewBrowserTest was effectively disabled everywhere because
of a missing define. This adds the define (as well as explicitly not
compiling on ChromeOS rather than just ifdefing the whole file out).
BUG=527504
Review URL: https://codereview.chromium.org/1301333009
Cr-Commit-Position: refs/heads/master@{#347246}
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index bf72d62..2cb489e 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -648,7 +648,6 @@ 'browser/ui/views/media_router/media_router_ui_browsertest.cc', 'browser/ui/views/new_task_manager_view_browsertest.cc', 'browser/ui/views/profiles/avatar_menu_button_browsertest.cc', - 'browser/ui/views/profiles/profile_chooser_view_browsertest.cc', 'browser/ui/views/toolbar/browser_actions_container_browsertest.cc', 'browser/ui/views/toolbar/toolbar_view_browsertest.cc', 'browser/ui/views/translate/translate_bubble_view_browsertest.cc', @@ -806,6 +805,10 @@ 'browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc', 'browser/ui/webui/options/chromeos/shared_options_browsertest.cc', ], + 'chrome_browser_tests_views_non_cros_or_mac_sources': [ + # This should be brought up on OSX Views but not CrOS. + 'browser/ui/views/profiles/profile_chooser_view_browsertest.cc', + ], 'chrome_browser_tests_policy_sources': [ 'browser/policy/cloud/cloud_policy_browsertest.cc', 'browser/policy/cloud/cloud_policy_manager_browsertest.cc', @@ -2453,6 +2456,12 @@ ['toolkit_views==1 and OS!="mac"', { 'sources': [ '<@(chrome_browser_tests_views_non_mac_sources)' ], }], + ['toolkit_views==1 and OS!="mac" and chromeos == 0', { + # A temporary define to make it easier to remove CrOS dependencies on + # avatar button code. TODO(estade): remove. + 'defines': [ 'FRAME_AVATAR_BUTTON=1', ], + 'sources': [ '<@(chrome_browser_tests_views_non_cros_or_mac_sources)' ], + }], ['OS!="android" and OS!="ios"', { 'sources': [ 'browser/copresence/chrome_whispernet_client_browsertest.cc', |