summaryrefslogtreecommitdiffstats
path: root/ppapi/tests/testing_instance.h
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 22:34:22 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 22:34:22 +0000
commit13e343c565819075ce1eef5a001c875c795f7c33 (patch)
treeb6a9e03b6b77fef5d9d5a09101da1c25ff86487e /ppapi/tests/testing_instance.h
parentb86aad87785f4cdeaf9839619b2d1cc7e32e2f7f (diff)
downloadchromium_src-13e343c565819075ce1eef5a001c875c795f7c33.zip
chromium_src-13e343c565819075ce1eef5a001c875c795f7c33.tar.gz
chromium_src-13e343c565819075ce1eef5a001c875c795f7c33.tar.bz2
Re-land http://codereview.chromium.org/9403039/, r124106
Original description: """ PPAPI: Really force-free NPObjects on Instance destruction. (There still seems to be a memory leak with this patch; I may have to check our NPObject reference counting next.) BUG=114023 TEST= """ BUG=114023 TEST= TBR=dmichael@chromium.org Review URL: http://codereview.chromium.org/9564024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/tests/testing_instance.h')
-rw-r--r--ppapi/tests/testing_instance.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/ppapi/tests/testing_instance.h b/ppapi/tests/testing_instance.h
index 8dadb20..c064329 100644
--- a/ppapi/tests/testing_instance.h
+++ b/ppapi/tests/testing_instance.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -92,6 +92,11 @@ pp::InstancePrivate {
void ReportProgress(const std::string& progress_value);
+ // Add a post-condition to the JavaScript on the test_case.html page. This
+ // JavaScript code will be run after the instance is shut down and must
+ // evaluate to |true| or the test will fail.
+ void AddPostCondition(const std::string& script);
+
private:
void ExecuteTests(int32_t unused);
@@ -109,6 +114,10 @@ pp::InstancePrivate {
// Runs 'PostMessage_SendingData.
std::string FilterForTestName(const std::string& name);
+ // Sends a test command to the page using PostMessage.
+ void SendTestCommand(const std::string& command);
+ void SendTestCommand(const std::string& command, const std::string& params);
+
// Appends a list of available tests to the console in the document.
void LogAvailableTests();