diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-19 11:25:06 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-19 11:25:06 +0000 |
| commit | 58052981835a7ab506feb2e0319dc195c659ba64 (patch) | |
| tree | 072cb4f1735e70982dde0984f58b68011a1f3979 | |
| parent | f717c42b61b89d39980c1914bbb76bbe336b5b2b (diff) | |
| download | chromium_src-58052981835a7ab506feb2e0319dc195c659ba64.zip chromium_src-58052981835a7ab506feb2e0319dc195c659ba64.tar.gz chromium_src-58052981835a7ab506feb2e0319dc195c659ba64.tar.bz2 | |
Disable the TaskManagerBrowserTests on ChromeOS.
These tests depend on --disable-gpu which is not available on
ChromeOS. The compositor there requires a GPU process and does
not support software compositing.
R=sky@chromium.org
BUG=331947,270918
Review URL: https://codereview.chromium.org/141353005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245833 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/task_manager/task_manager_browsertest.cc | 7 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index b6ef074..578e791 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -45,11 +45,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" -// http://crbug.com/31663 -// TODO(linux_aura) http://crbug.com/163931 -#if !(defined(OS_WIN) && defined(USE_AURA)) && \ - !(defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)) - using content::WebContents; // On Linux this is crashing intermittently http://crbug/84719 @@ -538,5 +533,3 @@ IN_PROC_BROWSER_TEST_F(TaskManagerNoShowBrowserTest, base::Unretained(this))); TaskManagerBrowserTestUtil::WaitForWebResourceChange(2); } - -#endif diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index fb4c595..b8c2706 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1746,6 +1746,15 @@ '../ui/events/events.gyp:events_test_support', ], }], + ['use_aura==1', { + 'sources!': [ + # http://crbug.com/31663 + # TODO(linux_aura) http://crbug.com/163931 + # TODO(vabr): There is always a GPU process on ChromeOS: + # crbug.com/331947 + 'browser/task_manager/task_manager_browsertest.cc', + ], + }], ['chromeos==0', { 'sources/': [ ['exclude', '^browser/chromeos'], |