diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 20:23:09 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 20:23:09 +0000 |
| commit | e0709e1647c0b8394793bdd23f690c5c81333795 (patch) | |
| tree | c9f8edb56a09b26b329cb01d62be49d5197dcc62 /content/test/content_browser_test.cc | |
| parent | 0f85edb32463cb75d92cc719cf5a0bc68f36123b (diff) | |
| download | chromium_src-e0709e1647c0b8394793bdd23f690c5c81333795.zip chromium_src-e0709e1647c0b8394793bdd23f690c5c81333795.tar.gz chromium_src-e0709e1647c0b8394793bdd23f690c5c81333795.tar.bz2 | |
Disable HW decode in content_browsertests except on win & cros (to match chrome).
BUG=147564
TBR=jcivelli@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10917226
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_browser_test.cc')
| -rw-r--r-- | content/test/content_browser_test.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc index 40977da..a86569f 100644 --- a/content/test/content_browser_test.cc +++ b/content/test/content_browser_test.cc @@ -77,6 +77,12 @@ void ContentBrowserTest::SetUp() { subprocess_path); #endif + // NOTE: should be kept in sync with + // chrome/browser/resources/software_rendering_list.json +#if !defined(OS_WIN) && !defined(OS_CHROMEOS) + command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); +#endif + BrowserTestBase::SetUp(); } |