Consolidate tests for HTTP request restrictions on untrusted loaders.

Reducing the number of tests should speed up bots, and we are unlikely
to ever need to separately enable/disable these.
Review URL: http://codereview.chromium.org/8857003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113524 0039d316-1c4b-4281-b951-d872f2087c98

chrome/test/ui/ppapi_uitest.cc

@@ -338,14 +338,8 @@ TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntrustedJavascriptURLRestriction)
 // TODO(bbudge) Fix Javascript URLs for trusted loaders.
 // http://crbug.com/103062
 TEST_PPAPI_IN_PROCESS_VIA_HTTP(FAILS_URLLoader_TrustedJavascriptURLRestriction)
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntrustedMethodRestriction)
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_TrustedMethodRestriction)
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntrustedHeaderRestriction)
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_TrustedHeaderRestriction)
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntrustedCustomReferrer)
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_TrustedCustomReferrer)
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntrustedCustomContentTransferEncoding)
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_TrustedCustomContentTransferEncoding)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntrustedHttpRestriction)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_TrustedHttpRestriction)
 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_AuditURLRedirect)
 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_AbortCalls)
 TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntendedLoad)
@@ -370,16 +364,8 @@ TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_UntrustedJavascriptURLRestriction)
 // http://crbug.com/103062
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(
     FAILS_URLLoader_TrustedJavascriptURLRestriction)
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_UntrustedMethodRestriction)
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_TrustedMethodRestriction)
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_UntrustedHeaderRestriction)
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_TrustedHeaderRestriction)
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_UntrustedCustomReferrer)
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_TrustedCustomReferrer)
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(
-    URLLoader_UntrustedCustomContentTransferEncoding)
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(
-    URLLoader_TrustedCustomContentTransferEncoding)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_UntrustedHttpRestriction)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_TrustedHttpRestriction)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_AuditURLRedirect)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_AbortCalls)
 TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_UntendedLoad)
@@ -398,10 +384,7 @@ TEST_PPAPI_NACL_VIA_HTTP(URLLoader_StreamToFile)
 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_URLLoader_UntrustedSameOriginRestriction)
 TEST_PPAPI_NACL_VIA_HTTP(DISABLED_URLLoader_UntrustedCrossOriginRequest)
 TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntrustedJavascriptURLRestriction)
-TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntrustedMethodRestriction)
-TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntrustedHeaderRestriction)
-TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntrustedCustomReferrer)
-TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntrustedCustomContentTransferEncoding)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntrustedHttpRestriction)
 TEST_PPAPI_NACL_VIA_HTTP(URLLoader_AuditURLRedirect)
 TEST_PPAPI_NACL_VIA_HTTP(URLLoader_AbortCalls)
 TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntendedLoad)

ppapi/tests/test_url_loader.h

@@ -64,14 +64,8 @@ class TestURLLoader : public TestCase {
   std::string TestTrustedCrossOriginRequest();
   std::string TestUntrustedJavascriptURLRestriction();
   std::string TestTrustedJavascriptURLRestriction();
-  std::string TestUntrustedMethodRestriction();
-  std::string TestTrustedMethodRestriction();
-  std::string TestUntrustedHeaderRestriction();
-  std::string TestTrustedHeaderRestriction();
-  std::string TestUntrustedCustomReferrer();
-  std::string TestTrustedCustomReferrer();
-  std::string TestUntrustedCustomContentTransferEncoding();
-  std::string TestTrustedCustomContentTransferEncoding();
+  std::string TestUntrustedHttpRequests();
+  std::string TestTrustedHttpRequests();
   std::string TestAuditURLRedirect();
   std::string TestAbortCalls();
   std::string TestUntendedLoad();