summaryrefslogtreecommitdiffstats
path: root/ppapi/tests
diff options
context:
space:
mode:
authorbbudge@google.com <bbudge@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-11 23:15:10 +0000
committerbbudge@google.com <bbudge@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-11 23:15:10 +0000
commit4ad2087c2b3fb35d83fa3ea3c11fa0941cf9fd05 (patch)
tree9492acfc4e47e2ab5e3a24aa159e78289c42c1ca /ppapi/tests
parent3a0c37eff42f8185aa491ef395f25bfb93553754 (diff)
downloadchromium_src-4ad2087c2b3fb35d83fa3ea3c11fa0941cf9fd05.zip
chromium_src-4ad2087c2b3fb35d83fa3ea3c11fa0941cf9fd05.tar.gz
chromium_src-4ad2087c2b3fb35d83fa3ea3c11fa0941cf9fd05.tar.bz2
Remove temporary fixes for URLLoader synchronous error reporting. Fix an PPB_URLLoader_Impl::didFinishLoading to check that callback is present. Fix tests to test both sync and async semantics.
Review URL: http://codereview.chromium.org/7189041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/tests')
-rw-r--r--ppapi/tests/test_url_loader.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/ppapi/tests/test_url_loader.cc b/ppapi/tests/test_url_loader.cc
index 6ecb15d..fe1bec1 100644
--- a/ppapi/tests/test_url_loader.cc
+++ b/ppapi/tests/test_url_loader.cc
@@ -43,18 +43,18 @@ bool TestURLLoader::Init() {
}
void TestURLLoader::RunTest() {
- RUN_TEST(BasicGET);
- RUN_TEST_FORCEASYNC(BasicPOST);
+ RUN_TEST_FORCEASYNC_AND_NOT(BasicGET);
+ RUN_TEST_FORCEASYNC_AND_NOT(BasicPOST);
RUN_TEST_FORCEASYNC_AND_NOT(CompoundBodyPOST);
- RUN_TEST_FORCEASYNC(EmptyDataPOST);
- RUN_TEST(BinaryDataPOST);
+ RUN_TEST_FORCEASYNC_AND_NOT(EmptyDataPOST);
+ RUN_TEST_FORCEASYNC_AND_NOT(BinaryDataPOST);
RUN_TEST_FORCEASYNC_AND_NOT(CustomRequestHeader);
- RUN_TEST_FORCEASYNC(IgnoresBogusContentLength);
- RUN_TEST(SameOriginRestriction);
- RUN_TEST_FORCEASYNC(CrossOriginRequest);
+ RUN_TEST_FORCEASYNC_AND_NOT(IgnoresBogusContentLength);
+ RUN_TEST_FORCEASYNC_AND_NOT(SameOriginRestriction);
+ RUN_TEST_FORCEASYNC_AND_NOT(CrossOriginRequest);
RUN_TEST_FORCEASYNC_AND_NOT(StreamToFile);
- RUN_TEST(AuditURLRedirect);
- RUN_TEST_FORCEASYNC(AbortCalls);
+ RUN_TEST_FORCEASYNC_AND_NOT(AuditURLRedirect);
+ RUN_TEST_FORCEASYNC_AND_NOT(AbortCalls);
}
std::string TestURLLoader::ReadEntireFile(pp::FileIO_Dev* file_io,