Revert 110221 - Test NaCl version of ppapi_tests via ui_tests

Copy server pieces to build output dir.
Update ppapi_uitests.cc to run server from output dir.
Add test to ppapi_uitests, update dependecies.
Update test_sever to support a fully qualified path.

BUG= http://code.google.com/p/chromium/issues/detail?id=96782
BUG= http://code.google.com/p/chromium/issues/detail?id=103690
TEST= try (ui_tests --gtest_filter="PPAPI*.*")
Review URL: http://codereview.chromium.org/8539019

TBR=noelallen@google.com
Review URL: http://codereview.chromium.org/8486017

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

3 files changed, 5 insertions, 100 deletions

diff --git a/ppapi/native_client/tests/ppapi_tests/test_case.nmf b/ppapi/native_client/tests/ppapi_tests/test_case.nmf
index f0bb249..3528855 100644
--- a/ppapi/native_client/tests/ppapi_tests/test_case.nmf
+++ b/ppapi/native_client/tests/ppapi_tests/test_case.nmf
@@ -1,7 +1,7 @@
 {
   "program": {
-    "x86-64": {"url": "ppapi_nacl_tests_newlib_x64.nexe"},
-    "x86-32": {"url": "ppapi_nacl_tests_newlib_x32.nexe"},
-    "arm": {"url": "ppapi_nacl_tests_newlib_arm.nexe"}
+    "x86-64": {"url": "ppapi_tests_x86-64.nexe"},
+    "x86-32": {"url": "ppapi_tests_x86-32.nexe"},
+    "arm": {"url": "ppapi_tests_arm.nexe"}
   }
 }
diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
index f60403c..48f6745 100644
--- a/ppapi/ppapi_tests.gypi
+++ b/ppapi/ppapi_tests.gypi
@@ -414,96 +414,4 @@
       ],
     },
   ],
-  'conditions': [
-    ['disable_nacl!=1', {
-      'targets': [
-         {
-          'target_name': 'ppapi_nacl_tests',
-          'type': 'none',
-          'dependencies': [
-             'native_client/native_client.gyp:ppapi_lib',
-             'native_client/native_client.gyp:nacl_irt',
-             'ppapi.gyp:ppapi_cpp_lib',
-           ],
-          'variables': {
-            'nexe_target': 'ppapi_nacl_tests',
-            'build_glibc': 0,
-            'build_newlib': 1,
-            'include_dirs': [
-              'lib/gl/include',
-              '..',
-            ],
-            'link_flags': [
-              '-lppapi_cpp',
-              '-lppapi',
-            ],
-            'extra_deps64': [
-              '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libppapi_cpp.a',
-              '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libppapi.a',
-            ],
-            'extra_deps32': [
-              '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libppapi_cpp.a',
-              '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libppapi.a',
-            ],
-            'sources': [
-              # Common test files
-              'tests/test_case.cc',
-              'tests/test_utils.cc',
-              'tests/testing_instance.cc',
-
-              # Compile-time tests
-              'tests/test_c_includes.c',
-              'tests/test_cpp_includes.cc',
-              'tests/test_struct_sizes.c',
-              # Test cases (PLEASE KEEP THIS SECTION IN ALPHABETICAL ORDER)
-
-              # Add/uncomment PPAPI interfaces below when they get proxied.
-              # Not yet proxied.
-              #'test_broker.cc',
-              # Not yet proxied.
-              #'test_buffer.cc',
-              # Not yet proxied.
-              #'test_char_set.cc',
-              'tests/test_cursor_control.cc',
-              # Fails in DeleteDirectoryRecursively.
-              # BUG: http://code.google.com/p/nativeclient/issues/detail?id=2107
-              #'test_directory_reader.cc',
-              'tests/test_file_io.cc',
-              'tests/test_file_ref.cc',
-              'tests/test_file_system.cc',
-              'tests/test_memory.cc',
-              'tests/test_graphics_2d.cc',
-              'tests/test_image_data.cc',
-              'tests/test_paint_aggregator.cc',
-              # test_post_message.cc relies on synchronous scripting, which is not
-              # available for untrusted tests.
-              # Does not compile under nacl (uses private interface ExecuteScript).
-              #'test_post_message.cc',
-              'tests/test_scrollbar.cc',
-              # Not yet proxied.
-              #'tests/test_transport.cc',
-              # Not yet proxied.
-              #'tests/test_uma.cc',
-              # Activating the URL loader test requires a test httpd that
-              # understands HTTP POST, which our current httpd.py doesn't.
-              # It also requires deactivating the tests that use FileIOTrusted
-              # when running in NaCl.
-              #'tests/test_url_loader.cc',
-              # Does not compile under nacl (uses VarPrivate).
-              #'test_url_util.cc',
-              # Not yet proxied.
-              #'test_video_decoder.cc',
-              'tests/test_var.cc',
-
-              # Deprecated test cases.
-              #'tests/test_instance_deprecated.cc',
-              # Var_deprecated fails in TestPassReference, and we probably won't
-              # fix it.
-              #'tests/test_var_deprecated.cc'
-            ],
-          },
-        },
-      ],
-    }],
-  ],
 }
diff --git a/ppapi/tests/test_url_loader.cc b/ppapi/tests/test_url_loader.cc
index edbbbbf..44f969c 100644
--- a/ppapi/tests/test_url_loader.cc
+++ b/ppapi/tests/test_url_loader.cc
@@ -87,11 +87,8 @@ void TestURLLoader::RunTests(const std::string& 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);