Revert 110221 - Test NaCl version of ppapi_tests via ui_tests

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 69 matching lines @@
 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, filter);
-//  RUN_TEST_FORCEASYNC_AND_NOT(CrossOriginRequest, filter);
+  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);
 }
@@ skipping 654 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).