diff options
| author | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 22:52:59 +0000 |
|---|---|---|
| committer | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 22:52:59 +0000 |
| commit | ebc5c8be10f0b82b428064c50be6e6a42861b9e1 (patch) | |
| tree | 4f693c544d1eb2da200952e499599b1656041f81 /ppapi/tests/test_image_data.cc | |
| parent | dc4b7d54f623020348ef98136d9776c7e0693b18 (diff) | |
| download | chromium_src-ebc5c8be10f0b82b428064c50be6e6a42861b9e1.zip chromium_src-ebc5c8be10f0b82b428064c50be6e6a42861b9e1.tar.gz chromium_src-ebc5c8be10f0b82b428064c50be6e6a42861b9e1.tar.bz2 | |
Fix PPAPI ui_tests.
r66321 silently broke it because we were not running the tests, just listing the
tests and yet returning success.
This fixes it as well as some regressions in the tests themselves.
BUG=none
TEST=ui_tests
Review URL: http://codereview.chromium.org/7055002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/tests/test_image_data.cc')
| -rw-r--r-- | ppapi/tests/test_image_data.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/tests/test_image_data.cc b/ppapi/tests/test_image_data.cc index ab8894a..ed130cd 100644 --- a/ppapi/tests/test_image_data.cc +++ b/ppapi/tests/test_image_data.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -60,7 +60,7 @@ std::string TestImageData::TestInvalidSize() { negative_height.width = 16; negative_height.height = -2; PP_Resource rsrc = image_data_interface_->Create( - pp::Module::Get()->pp_module(), + instance_->pp_instance(), PP_IMAGEDATAFORMAT_BGRA_PREMUL, &negative_height, PP_TRUE); if (rsrc) @@ -70,7 +70,7 @@ std::string TestImageData::TestInvalidSize() { negative_width.width = -2; negative_width.height = 16; rsrc = image_data_interface_->Create( - pp::Module::Get()->pp_module(), + instance_->pp_instance(), PP_IMAGEDATAFORMAT_BGRA_PREMUL, &negative_width, PP_TRUE); if (rsrc) |