Reland http://codereview.chromium.org/8477015

ppapi/tests/test_url_loader.cc

 // 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.
 
 #include "ppapi/tests/test_url_loader.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <string>
 
@@ skipping 59 matching lines @@
     instance_->AppendError("FileIOTrusted interface not available");
   }
   url_loader_trusted_interface_ = static_cast<const PPB_URLLoaderTrusted*>(
       pp::Module::Get()->GetBrowserInterface(PPB_URLLOADERTRUSTED_INTERFACE));
   if (!url_loader_trusted_interface_) {
     instance_->AppendError("URLLoaderTrusted interface not available");
   }
   return InitTestingInterface() && EnsureRunningOverHTTP();
 }
 
-void TestURLLoader::RunTest() {
-  RUN_TEST_FORCEASYNC_AND_NOT(BasicGET);
-  RUN_TEST_FORCEASYNC_AND_NOT(BasicPOST);
-  RUN_TEST_FORCEASYNC_AND_NOT(BasicFilePOST);
-  RUN_TEST_FORCEASYNC_AND_NOT(BasicFileRangePOST);
-  RUN_TEST_FORCEASYNC_AND_NOT(CompoundBodyPOST);
-  RUN_TEST_FORCEASYNC_AND_NOT(EmptyDataPOST);
-  RUN_TEST_FORCEASYNC_AND_NOT(BinaryDataPOST);
-  RUN_TEST_FORCEASYNC_AND_NOT(CustomRequestHeader);
-  RUN_TEST_FORCEASYNC_AND_NOT(FailsBogusContentLength);
+void TestURLLoader::RunTests(const std::string& filter) {
+  RUN_TEST_FORCEASYNC_AND_NOT(BasicGET, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(BasicPOST, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(BasicFilePOST, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(BasicFileRangePOST, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(CompoundBodyPOST, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(EmptyDataPOST, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(BinaryDataPOST, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(CustomRequestHeader, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(FailsBogusContentLength, filter);
 // Disable portion of test which failes when the HTTP server's
 // data_dir is moved to PRODUCT_DIR.
 // see: http://code.google.com/p/chromium/issues/detail?id=103690
-//  RUN_TEST_FORCEASYNC_AND_NOT(SameOriginRestriction);
-//  RUN_TEST_FORCEASYNC_AND_NOT(CrossOriginRequest);
-  RUN_TEST_FORCEASYNC_AND_NOT(JavascriptURLRestriction);
-  RUN_TEST_FORCEASYNC_AND_NOT(MethodRestriction);
-  RUN_TEST_FORCEASYNC_AND_NOT(HeaderRestriction);
-  RUN_TEST_FORCEASYNC_AND_NOT(CustomReferrer);
-  RUN_TEST_FORCEASYNC_AND_NOT(CustomContentTransferEncoding);
-  RUN_TEST_FORCEASYNC_AND_NOT(StreamToFile);
-  RUN_TEST_FORCEASYNC_AND_NOT(AuditURLRedirect);
-  RUN_TEST_FORCEASYNC_AND_NOT(AbortCalls);
-  RUN_TEST_FORCEASYNC_AND_NOT(UntendedLoad);
+//  RUN_TEST_FORCEASYNC_AND_NOT(SameOriginRestriction, filter);
+//  RUN_TEST_FORCEASYNC_AND_NOT(CrossOriginRequest, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(JavascriptURLRestriction, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(MethodRestriction, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(HeaderRestriction, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(CustomReferrer, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(CustomContentTransferEncoding, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(StreamToFile, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(AuditURLRedirect, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(AbortCalls, filter);
+  RUN_TEST_FORCEASYNC_AND_NOT(UntendedLoad, filter);
 }
 
 std::string TestURLLoader::ReadEntireFile(pp::FileIO* file_io,
                                           std::string* data) {
   TestCompletionCallback callback(instance_->pp_instance(), force_async_);
   char buf[256];
   int64_t offset = 0;
 
   for (;;) {
     int32_t rv = file_io->Read(offset, buf, sizeof(buf), callback);
@@ skipping 645 matching lines @@
   if (!error.empty())
     return error;
   if (body != "hello\n")
     return ReportError("Couldn't read data", rv);
 
   PASS();
 }
 
 // TODO(viettrungluu): Add tests for FollowRedirect,
 // Get{Upload,Download}Progress, Close (including abort tests if applicable).