diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 23:54:51 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 23:54:51 +0000 |
| commit | c051d5a56b838d1a1ac552dffa93f52e24ab1fd3 (patch) | |
| tree | ce035b27081a80678409816f20ccaf058f1edfe5 /chrome/test/base | |
| parent | 914d8bfcdd14160de78bd6db47bb453a160c9a52 (diff) | |
| download | chromium_src-c051d5a56b838d1a1ac552dffa93f52e24ab1fd3.zip chromium_src-c051d5a56b838d1a1ac552dffa93f52e24ab1fd3.tar.gz chromium_src-c051d5a56b838d1a1ac552dffa93f52e24ab1fd3.tar.bz2 | |
Add GrabWindowSnapshotAsync aura tests
This adds a version of GrabWindowSnapshotAsync that behaves identically
to GrabWindowSnapshot except with a callback. The snapshot aura unit
tests are updated to use this new async function instead of the sync
one.
In order to make the snapshot tests work properly, they also now have to
use a real gl context so that real drawing and readback can occur
through the compositor.
BUG=331410, 332167
Review URL: https://codereview.chromium.org/119753007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base')
| -rw-r--r-- | chrome/test/base/browser_with_test_window_test.cc | 3 | ||||
| -rw-r--r-- | chrome/test/base/view_event_test_base.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc index 296e263..0ec7d96 100644 --- a/chrome/test/base/browser_with_test_window_test.cc +++ b/chrome/test/base/browser_with_test_window_test.cc @@ -59,7 +59,8 @@ void BrowserWithTestWindowTest::SetUp() { #elif defined(USE_AURA) aura_test_helper_.reset(new aura::test::AuraTestHelper( base::MessageLoopForUI::current())); - aura_test_helper_->SetUp(); + bool allow_test_contexts = true; + aura_test_helper_->SetUp(allow_test_contexts); #endif // USE_AURA #if defined(TOOLKIT_VIEWS) views_delegate_.reset(CreateViewsDelegate()); diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index be058ef2..8d4f9ca 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -141,7 +141,8 @@ void ViewEventTestBase::SetUp() { // the test screen. aura_test_helper_.reset( new aura::test::AuraTestHelper(base::MessageLoopForUI::current())); - aura_test_helper_->SetUp(); + bool allow_test_contexts = true; + aura_test_helper_->SetUp(allow_test_contexts); context = aura_test_helper_->root_window(); #endif // !USE_ASH && USE_AURA |