NaCl: remove dead tests and files from the SCons build.

ppapi/native_client/tests/ppapi/ contained tests that checked PPAPI headers
were compatible with the NaCl toolchain.  These tests are no longer relevant.

ppapi/native_client/tests/ppapi_simple_tests/ contained dead files.

BUG= http://code.google.com/p/chromium/issues/detail?id=154400

Review URL: https://chromiumcodereview.appspot.com/11358131

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

26 files changed, 0 insertions, 2877 deletions

diff --git a/ppapi/native_client/chrome_main.scons b/ppapi/native_client/chrome_main.scons
index c9d8692..c98381c 100644
--- a/ppapi/native_client/chrome_main.scons
+++ b/ppapi/native_client/chrome_main.scons
@@ -41,7 +41,6 @@ ppapi_scons_files['nonvariant_test_scons_files'] = [
     'tests/nacl_browser/manifest_file/nacl.scons',
     'tests/nacl_browser/nameservice/nacl.scons',
     'tests/nacl_browser/postmessage_redir/nacl.scons',
-    'tests/ppapi/nacl.scons',
     'tests/ppapi_browser/bad/nacl.scons',
     'tests/ppapi_browser/crash/nacl.scons',
     'tests/ppapi_browser/extension_mime_handler/nacl.scons',
diff --git a/ppapi/native_client/tests/ppapi/nacl.scons b/ppapi/native_client/tests/ppapi/nacl.scons
deleted file mode 100644
index b3aaa1f..0000000
--- a/ppapi/native_client/tests/ppapi/nacl.scons
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- python -*-
-# Copyright 2010 The Native Client Authors.  All rights reserved.
-# Use of this source code is governed by a BSD-style license that can
-# be found in the LICENSE file.
-
-import gyp_extract
-
-Import('env')
-
-env.Prepend(CPPDEFINES=['XP_UNIX', 'GL_GLEXT_PROTOTYPES'])
-
-# TODO(robertm): those should not be necessary once we go -std=c99
-env.FilterOut(CFLAGS=['-pedantic'])
-env.FilterOut(CCFLAGS=['-pedantic'])
-
-
-# Load ppapi_cpp.gypi
-ppapi_cpp_gypi = gyp_extract.LoadGypFile(
-    env.File('$SOURCE_ROOT/ppapi/ppapi_cpp.gypi').abspath)
-
-# From ppapi_cpp.gypi:ppapi_cpp_objects:cpp/[^/]*\.h
-cpp_headers = gyp_extract.GypTargetSources(
-    ppapi_cpp_gypi, 'ppapi_cpp_objects', 'cpp/[^/]*\.h')
-cpp_headers = ['ppapi/' +
-    header_file for header_file in cpp_headers]
-
-# From ppapi_cpp.gypi:ppapi_cpp_objects:cpp/dev/[^/]*\.h
-cpp_dev_headers = gyp_extract.GypTargetSources(
-    ppapi_cpp_gypi, 'ppapi_cpp_objects', 'cpp/dev/[^/]*\.h')
-cpp_dev_headers = ['ppapi/' +
-    header_file for header_file in cpp_dev_headers]
-
-
-def EmitHeaderTest(target=None, source=None, env=None):
-  fh = open(target[0].path, 'w')
-  for header in env['TEST_HEADERS']:
-    fh.write('#include "%s"\n' % header)
-  fh.close()
-  return 0
-
-
-env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include'])
-cpp_header_test_cc = env.Command(
-    '$OBJ_ROOT/gen/native_client/test/ppapi/cpp_header_test.cc',
-    [], Action(EmitHeaderTest, varlist=['TEST_HEADERS']),
-    TEST_HEADERS=cpp_headers)
-
-cpp_dev_header_test_cc = env.Command(
-    '$OBJ_ROOT/gen/native_client/test/ppapi/cpp_dev_header_test.cc',
-    [], Action(EmitHeaderTest, varlist=['TEST_HEADERS']),
-    TEST_HEADERS=cpp_dev_headers)
-
-
-ppapi_header_test_inputs = [
-  cpp_header_test_cc,
-  cpp_dev_header_test_cc,
-  'opengl_header_test.c',
-  'opengl_cpp_header_test.cc',
-]
-
-# Build-only test to make sure the header layout for ppapi is correct.
-env.ComponentLibrary('header_test', ppapi_header_test_inputs)
diff --git a/ppapi/native_client/tests/ppapi/opengl_cpp_header_test.cc b/ppapi/native_client/tests/ppapi/opengl_cpp_header_test.cc
deleted file mode 100644
index 720183a..0000000
--- a/ppapi/native_client/tests/ppapi/opengl_cpp_header_test.cc
+++ /dev/null
@@ -1,10 +0,0 @@
-// 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.
-
-// This is a build test that includes the basic OpenGL ES 2 headers, to make
-// sure that the header layout in the NaCl toolchain is correct.  Note that
-// unlike the cpp header test files, this is not generated by a script.
-
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
diff --git a/ppapi/native_client/tests/ppapi/opengl_header_test.c b/ppapi/native_client/tests/ppapi/opengl_header_test.c
deleted file mode 100644
index 85616c1..0000000
--- a/ppapi/native_client/tests/ppapi/opengl_header_test.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* 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.
- */
-
-/* This is a build test that includes the basic OpenGL ES 2 headers, to make
- * sure that the header layout in the NaCl toolchain is correct.  Note that
- * unlike the cpp header test files, this is not generated by a script.
- */
-
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/audio.cc b/ppapi/native_client/tests/ppapi_simple_tests/audio.cc
deleted file mode 100644
index 759a28a..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/audio.cc
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (c) 2012 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 <stdint.h>
-
-#include <cmath>
-#include <limits>
-#include <string>
-
-#include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/src/shared/platform/nacl_log.h"
-
-
-#include "ppapi/c/pp_bool.h"
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/c/ppb_audio.h"
-#include "ppapi/c/ppb_audio_config.h"
-#include "ppapi/cpp/audio.h"
-#include "ppapi/cpp/audio_config.h"
-#include "ppapi/cpp/completion_callback.h"
-#include "ppapi/cpp/instance.h"
-#include "ppapi/cpp/module.h"
-
-const PP_AudioSampleRate kSampleFrequency = PP_AUDIOSAMPLERATE_44100;
-// Buffer size in units of sample frames.
-// 4096 is a conservative size that should avoid underruns on most systems.
-const uint32_t kSampleFrameCount = 4096;
-const uint32_t kDefaultFrequency = 400;
-const uint32_t kDefaultDuration = 10000;
-
-const int kNumChannelsForStereo = 2;
-const size_t kSizeSingleSample = kNumChannelsForStereo * sizeof(int16_t);
-
-const double kPi = 3.141592653589;
-const double kTwoPi = 2.0 * kPi;
-
-class MyInstance : public pp::Instance {
- private:
-  pp::Audio audio_;
-  uint32_t obtained_sample_frame_count_;
-  double audio_wave_time_;   // between -kTwoPi, +kTwoPi
-  uint32_t duration_;   // in msec
-  uint32_t frequency_;
-
-  static void SoundCallback(void* samples, uint32_t num_bytes, void* thiz) {
-    MyInstance* instance = reinterpret_cast<MyInstance*>(thiz);
-    // CHECK inside callback is only for testing purposes.
-    CHECK(instance->obtained_sample_frame_count_ * kSizeSingleSample ==
-          num_bytes);
-    const double delta = kTwoPi * instance->frequency_ / kSampleFrequency;
-    const int16_t max_int16 = std::numeric_limits<int16_t>::max();
-    int16_t* buf = reinterpret_cast<int16_t*>(samples);
-    for (size_t i = 0; i < instance->obtained_sample_frame_count_; ++i) {
-      const double v = sin(instance->audio_wave_time_) * max_int16;
-      *buf++ = static_cast<int16_t>(v);
-      *buf++ = static_cast<int16_t>(v);
-      // Add delta, keep within -kTwoPi, +TwoPi to preserve precision.
-      instance->audio_wave_time_ += delta;
-      if (instance->audio_wave_time_ > kTwoPi)
-        instance->audio_wave_time_ -= kTwoPi * 2.0;
-    }
-  }
-
-  static void StopOutput(void* thiz, int32_t err) {
-    if (PP_OK == err) {
-      MyInstance* instance = static_cast<MyInstance*>(thiz);
-      instance->audio_.StopPlayback();
-    }
-  }
-
-  void ExtraChecks(pp::AudioConfig* config) {
-    CHECK(obtained_sample_frame_count_ >= PP_AUDIOMINSAMPLEFRAMECOUNT);
-    CHECK(obtained_sample_frame_count_ <= PP_AUDIOMAXSAMPLEFRAMECOUNT);
-
-    PPB_GetInterface get_browser_if =
-        pp::Module::Get()->get_browser_interface();
-
-    const PPB_AudioConfig* audio_config_if =
-        static_cast<const PPB_AudioConfig*>(
-        get_browser_if(PPB_AUDIO_CONFIG_INTERFACE));
-
-    const PPB_Audio* audio_if =
-        static_cast<const PPB_Audio*>(
-          get_browser_if(PPB_AUDIO_INTERFACE));
-
-    CHECK(NULL != audio_config_if);
-    CHECK(NULL != audio_if);
-
-    const PP_Resource audio_config_res = config->pp_resource();
-    const PP_Resource audio_res = audio_.pp_resource();
-
-    CHECK(PP_TRUE == audio_config_if->IsAudioConfig(audio_config_res));
-    CHECK(PP_TRUE == audio_if->IsAudio(audio_res));
-    CHECK(PP_FALSE == audio_config_if->IsAudioConfig(audio_res));
-    CHECK(PP_FALSE == audio_if->IsAudio(audio_config_res));
-    CHECK(audio_if->GetCurrentConfig(audio_res) == audio_config_res);
-    CHECK(0 == audio_if->GetCurrentConfig(audio_config_res));
-    CHECK(audio_config_if->GetSampleRate(audio_config_res) ==
-        config->sample_rate());
-    CHECK(audio_config_if->GetSampleFrameCount(audio_config_res) ==
-        config->sample_frame_count());
-    CHECK(audio_.config().pp_resource() == audio_config_res);
-  }
-
-  void ParseArgs(uint32_t argc, const char* argn[], const char* argv[]) {
-     for (uint32_t i = 0; i < argc; ++i) {
-       const std::string tag = argn[i];
-       if (tag == "duration") duration_ = strtol(argv[i], 0, 0);
-       if (tag == "frequency") frequency_ = strtol(argv[i], 0, 0);
-     }
-  }
-
- public:
-  explicit MyInstance(PP_Instance instance)
-    : pp::Instance(instance),
-      duration_(kDefaultDuration), frequency_(kDefaultFrequency) {}
-
-  virtual ~MyInstance() {}
-
-  virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]) {
-    ParseArgs(argc, argn, argv);
-    obtained_sample_frame_count_ = pp::AudioConfig::RecommendSampleFrameCount(
-      kSampleFrequency, kSampleFrameCount);
-
-    pp::AudioConfig config =
-      pp::AudioConfig(this, kSampleFrequency, obtained_sample_frame_count_);
-
-    audio_ = pp::Audio(this, config, SoundCallback, this);
-
-    ExtraChecks(&config);
-
-    CHECK(audio_.StartPlayback());
-
-    pp::CompletionCallback cc(StopOutput, this);
-    pp::Module::Get()->core()->CallOnMainThread(duration_, cc, PP_OK);
-    return true;
-  }
-};
-
-// standard boilerplate code below
-class MyModule : public pp::Module {
- public:
-  virtual pp::Instance* CreateInstance(PP_Instance instance) {
-    return new MyInstance(instance);
-  }
-};
-
-namespace pp {
-Module* CreateModule() {
-  return new MyModule();
-}
-
-}  // namespace pp
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/audio.stdin b/ppapi/native_client/tests/ppapi_simple_tests/audio.stdin
deleted file mode 100644
index 9f87ff1..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/audio.stdin
+++ /dev/null
@@ -1,116 +0,0 @@
-# NOTE: to be used with a prolog from
-#       tests/ppapi_proxy/sel_universal_ppapi_replay_prolog.stdin
-
-# define a bunch of variables for readability
-set_variable MODULE i(4444)
-set_variable INSTANCE i(5555)
-# to be safe we allocate a shmem region of 64k
-set_variable SHM_SIZE 65536
-set_variable NUM_FRAMES 4096
-# size of the audio buffer = NUM_FRAMES * 2 (channels) * 2 (16bit audio)
-set_variable BUF_SIZE 16384
-#  SHM_UNUSED = SHM_SIZE - BUF_SIZE
-set_variable SHM_UNUSED 49152
-
-# arbitrary numbers we picked as handles
-set_variable HANDLE_CFG i(30)
-set_variable HANDLE_AUDIO i(34)
-
-echo
-echo "*** INIT MODULE"
-# PPB_xxx replays below will be triggered as a reaction to PPP_InitializeModule
-replay 1 PPB_GetInterface:s:i  s("PPB_Core;1.0") * i(1)
-# The results contain a process id which is non-determinisitic.
-# We must hide the results to support golden file diffing.
-rpc PPP_InitializeModule hide-results i(0) ${MODULE} h(pepper_desc) s("${service_string}") * i(0) i(0)
-
-echo
-echo "*** INIT INSTANCE"
-set_variable TAGS C(10,frequency\000)
-set_variable VALUES C(4,800\000)
-# The PPB_xxx replays below will be triggered as a reaction to
-# PPP_Instance_DidCreate in roughly the order shown
-replay 1 PPB_GetInterface:s:i s("PPB_AudioConfig;1.0") * i(1)
-replay 1 PPB_AudioConfig_RecommendSampleFrameCount:ii:i i(44100) i(${NUM_FRAMES}) * i(${NUM_FRAMES})
-replay 1 PPB_AudioConfig_CreateStereo16Bit:iii:i ${INSTANCE} i(44100) i(${NUM_FRAMES}) * ${HANDLE_CFG}
-# TODO(robertm): explain why these are called three times
-replay 3 PPB_Core_AddRefResource:i: ${HANDLE_CFG} *
-replay 3 PPB_Core_ReleaseResource:i: ${HANDLE_CFG} *
-replay 1 PPB_GetInterface:s:i s("PPB_Audio;1.0") * i(1)
-replay 1 PPB_Audio_Create:ii:i ${INSTANCE} ${HANDLE_CFG} * ${HANDLE_AUDIO}
-replay 1 PPB_AudioConfig_IsAudioConfig:i:i ${HANDLE_CFG} * i(1)
-replay 1 PPB_Audio_IsAudio:i:i ${HANDLE_AUDIO} * i(1)
-replay 1 PPB_AudioConfig_IsAudioConfig:i:i ${HANDLE_AUDIO} * i(0)
-replay 1 PPB_Audio_IsAudio:i:i ${HANDLE_CFG} * i(0)
-replay 1 PPB_Audio_GetCurrentConfig:i:i ${HANDLE_AUDIO} * ${HANDLE_CFG}
-replay 1 PPB_Audio_GetCurrentConfig:i:i ${HANDLE_CFG} * i(0)
-replay 1 PPB_AudioConfig_GetSampleRate:i:i  ${HANDLE_CFG} * i(44100)
-replay 1 PPB_AudioConfig_GetSampleFrameCount:i:i  ${HANDLE_CFG} * i(${NUM_FRAMES})
-replay 1 PPB_Audio_StartPlayback:i:i ${HANDLE_AUDIO} * i(1)
-replay 1 PPB_Core_CallOnMainThread:iii: i(10000) i(1) i(0) *
-rpc PPP_Instance_DidCreate ${INSTANCE} i(1) ${TAGS} ${VALUES} * i(0)
-
-echo
-echo "*** TRIGGER REPAINT"
-rpc PPP_Instance_DidChangeView ${INSTANCE} I(4,8,79,400,400) I(4,0,0,400,400) *
-
-echo
-echo "*** SETTING UP AUDIO SHARED MEMORY"
-shmem audio_handle audio_address ${SHM_SIZE}
-memset ${audio_address} 0  ${SHM_SIZE} 0
-checksum ${audio_address} 0 ${SHM_SIZE}
-
-echo
-echo "*** SETTING UP AUDIO SYNC SOCKET"
-sync_socket_create sync_in sync_out
-
-echo
-echo "*** AUDIO STREAM"
-# inform the nexe about the shmem region and the sync_socket
-rpc PPP_Audio_StreamCreated ${HANDLE_AUDIO} h(audio_handle) i(${BUF_SIZE}) h(sync_out) *
-
-echo
-echo "*** AUDIO STREAM SYNC"
-# By writing a byte into the sync sock we wake up the other side, the actual
-# value does not matter as long as it is not -1.
-# once the other side has woken up it is supposed to write into the buffer
-# associated with audio_handle as quickly as possible.
-# We wait 1sec to give it time to do that.
-# Note: the shmem area is actually bigger than the buffer.
-# We compute a checksum over the part that is used and that isn't.
-# The latter checksum should not change and be zero.
-sync_socket_write sync_in 0
-sleep 1
-checksum ${audio_address} 0 ${BUF_SIZE}
-checksum ${audio_address} ${BUF_SIZE} ${SHM_UNUSED}
-
-echo
-echo "*** AUDIO STREAM SYNC"
-sync_socket_write sync_in 1
-sleep 1
-checksum ${audio_address} 0 ${BUF_SIZE}
-checksum ${audio_address} ${BUF_SIZE} ${SHM_UNUSED}
-
-echo
-echo "*** AUDIO STREAM SYNC"
-sync_socket_write sync_in 2
-sleep 1
-checksum ${audio_address} 0 ${BUF_SIZE}
-checksum ${audio_address} ${BUF_SIZE} ${SHM_UNUSED}
-
-echo
-echo "*** AUDIO STREAM SYNC"
-
-sync_socket_write sync_in 3
-sleep 1
-checksum ${audio_address} 0 ${BUF_SIZE}
-checksum ${audio_address} ${BUF_SIZE} ${SHM_UNUSED}
-
-echo
-echo "*** TERMINATE AUDIO STREAM"
-sync_socket_write sync_in -1
-checksum ${audio_address} 0 ${BUF_SIZE}
-checksum ${audio_address} ${BUF_SIZE} 49152
-
-sleep 1
-rpc PPP_ShutdownModule *
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/audio.stdout b/ppapi/native_client/tests/ppapi_simple_tests/audio.stdout
deleted file mode 100644
index f50d868..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/audio.stdout
+++ /dev/null
@@ -1,131 +0,0 @@
-
-"*** REPLAY PROLOG"
-
-"*** REGISTER REPLAY METHODS"
-
-"*** CREATE UPCALL SERVICE"
-
-"*** INIT MODULE"
-rpc call intiated PPP_InitializeModule:iihs:ii
-input 0:  i(0)
-input 1:  i(4444)
-input 2:  h(pepper_desc)
-input 3:  @LENGTHY_SERVICE_STRING
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Core;1.0")
-output 0:  i(1)
-rpc call complete PPP_InitializeModule:iihs:ii
-
-
-"*** INIT INSTANCE"
-rpc call intiated PPP_Instance_DidCreate:iiCC:i
-input 0:  i(5555)
-input 1:  i(1)
-input 2:  C(10,frequency\x00)
-input 3:  C(4,800\x00)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_AudioConfig;1.0")
-output 0:  i(1)
-replaying PPB_AudioConfig_RecommendSampleFrameCount:ii:i:
-input 0:  i(44100)
-input 1:  i(4096)
-output 0:  i(4096)
-replaying PPB_AudioConfig_CreateStereo16Bit:iii:i:
-input 0:  i(5555)
-input 1:  i(44100)
-input 2:  i(4096)
-output 0:  i(30)
-replaying PPB_Core_AddRefResource:i::
-input 0:  i(30)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Audio;1.0")
-output 0:  i(1)
-replaying PPB_Audio_Create:ii:i:
-input 0:  i(5555)
-input 1:  i(30)
-output 0:  i(34)
-replaying PPB_Core_AddRefResource:i::
-input 0:  i(30)
-replaying PPB_Core_ReleaseResource:i::
-input 0:  i(30)
-replaying PPB_AudioConfig_IsAudioConfig:i:i:
-input 0:  i(30)
-output 0:  i(1)
-replaying PPB_Audio_IsAudio:i:i:
-input 0:  i(34)
-output 0:  i(1)
-replaying PPB_AudioConfig_IsAudioConfig:i:i:
-input 0:  i(34)
-output 0:  i(0)
-replaying PPB_Audio_IsAudio:i:i:
-input 0:  i(30)
-output 0:  i(0)
-replaying PPB_Audio_GetCurrentConfig:i:i:
-input 0:  i(34)
-output 0:  i(30)
-replaying PPB_Audio_GetCurrentConfig:i:i:
-input 0:  i(30)
-output 0:  i(0)
-replaying PPB_AudioConfig_GetSampleRate:i:i:
-input 0:  i(30)
-output 0:  i(44100)
-replaying PPB_AudioConfig_GetSampleFrameCount:i:i:
-input 0:  i(30)
-output 0:  i(4096)
-replaying PPB_Audio_StartPlayback:i:i:
-input 0:  i(34)
-output 0:  i(1)
-replaying PPB_Core_CallOnMainThread:iii::
-input 0:  i(10000)
-input 1:  i(1)
-input 2:  i(0)
-replaying PPB_Core_ReleaseResource:i::
-input 0:  i(30)
-rpc call complete PPP_Instance_DidCreate:iiCC:i
-output 0:  i(1)
-
-
-"*** TRIGGER REPAINT"
-rpc call intiated PPP_Instance_DidChangeView:iII:
-input 0:  i(5555)
-input 1:  I(4,8,79,400,400)
-input 2:  I(4,0,0,400,400)
-rpc call complete PPP_Instance_DidChangeView:iII:
-
-
-"*** SETTING UP AUDIO SHARED MEMORY"
-CHECKSUM: 0x00000000
-
-"*** SETTING UP AUDIO SYNC SOCKET"
-
-"*** AUDIO STREAM"
-rpc call intiated PPP_Audio_StreamCreated:ihih:
-input 0:  i(34)
-input 1:  h(audio_handle)
-input 2:  i(16384)
-input 3:  h(sync_out)
-rpc call complete PPP_Audio_StreamCreated:ihih:
-
-
-"*** AUDIO STREAM SYNC"
-CHECKSUM: 0xbbf21e00
-CHECKSUM: 0x00000000
-
-"*** AUDIO STREAM SYNC"
-CHECKSUM: 0xcbef91ac
-CHECKSUM: 0x00000000
-
-"*** AUDIO STREAM SYNC"
-CHECKSUM: 0xd0f22174
-CHECKSUM: 0x00000000
-
-"*** AUDIO STREAM SYNC"
-CHECKSUM: 0x23742c68
-CHECKSUM: 0x00000000
-
-"*** TERMINATE AUDIO STREAM"
-CHECKSUM: 0x23742c68
-CHECKSUM: 0x00000000
-rpc call intiated PPP_ShutdownModule::
-rpc call complete PPP_ShutdownModule::
-
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/event.cc b/ppapi/native_client/tests/ppapi_simple_tests/event.cc
deleted file mode 100644
index 4e047a3..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/event.cc
+++ /dev/null
@@ -1,250 +0,0 @@
-// 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 <stdint.h>
-#include <stdlib.h>
-
-#include <sstream>
-#include <string>
-#include <queue>
-
-#include "ppapi/c/pp_input_event.h"
-#include "ppapi/c/ppp_input_event.h"
-#include "ppapi/cpp/instance.h"
-#include "ppapi/cpp/module.h"
-#include "ppapi/cpp/point.h"
-#include "ppapi/cpp/var.h"
-#include "ppapi/cpp/input_event.h"
-
-
-using std::string;
-using std::queue;
-using std::ostringstream;
-
-const int kDefaultEventBufferSize = 10;
-
-namespace {
-
-string ModifierToString(uint32_t modifier) {
-  string s;
-  if (modifier & PP_INPUTEVENT_MODIFIER_SHIFTKEY) {
-    s += "shift ";
-  }
-  if (modifier & PP_INPUTEVENT_MODIFIER_CONTROLKEY) {
-    s += "ctrl ";
-  }
-  if (modifier & PP_INPUTEVENT_MODIFIER_ALTKEY) {
-    s += "alt ";
-  }
-  if (modifier & PP_INPUTEVENT_MODIFIER_METAKEY) {
-    s += "meta ";
-  }
-  if (modifier & PP_INPUTEVENT_MODIFIER_ISKEYPAD) {
-    s += "keypad ";
-  }
-  if (modifier & PP_INPUTEVENT_MODIFIER_ISAUTOREPEAT) {
-    s += "autorepeat ";
-  }
-  if (modifier & PP_INPUTEVENT_MODIFIER_LEFTBUTTONDOWN) {
-    s += "left-button-down ";
-  }
-  if (modifier & PP_INPUTEVENT_MODIFIER_MIDDLEBUTTONDOWN) {
-    s += "middle-button-down ";
-  }
-  if (modifier & PP_INPUTEVENT_MODIFIER_RIGHTBUTTONDOWN) {
-    s += "right-button-down ";
-  }
-  if (modifier & PP_INPUTEVENT_MODIFIER_CAPSLOCKKEY) {
-    s += "caps-lock ";
-  }
-  if (modifier & PP_INPUTEVENT_MODIFIER_NUMLOCKKEY) {
-    s += "num-lock ";
-  }
-  return s;
-}
-
-
-string MouseButtonToString(PP_InputEvent_MouseButton button) {
-  switch (button) {
-    case PP_INPUTEVENT_MOUSEBUTTON_NONE:
-      return "None";
-    case PP_INPUTEVENT_MOUSEBUTTON_LEFT:
-      return "Left";
-    case PP_INPUTEVENT_MOUSEBUTTON_MIDDLE:
-      return "Middle";
-    case PP_INPUTEVENT_MOUSEBUTTON_RIGHT:
-      return "Right";
-    default:
-      ostringstream stream;
-      stream << "Unrecognized (" << static_cast<int32_t>(button) << ")";
-      return stream.str();
-  }
-}
-
-
-string KeyEvent(const pp::KeyboardInputEvent& key_event,
-                const string& kind) {
-  ostringstream stream;
-  stream << "Key event:" << kind
-         << " modifier:" << ModifierToString(key_event.GetModifiers())
-         << " key_code:" << key_event.GetKeyCode()
-         << " time:" << key_event.GetTimeStamp()
-         << " text:" << key_event.GetCharacterText().DebugString()
-         << "\n";
-  return stream.str();
-}
-
-
-string MouseEvent(const pp::MouseInputEvent& mouse_event,
-                  const string& kind) {
-  ostringstream stream;
-  stream << "Mouse event:" << kind
-         << " modifier:" << ModifierToString(mouse_event.GetModifiers())
-         << " button:" << MouseButtonToString(mouse_event.GetButton())
-         << " x:" << mouse_event.GetPosition().x()
-         << " y:" << mouse_event.GetPosition().y()
-         << " click_count:" << mouse_event.GetClickCount()
-         << " time:" << mouse_event.GetTimeStamp()
-         << "\n";
-  return stream.str();
-}
-
-
-string WheelEvent(const pp::WheelInputEvent& wheel_event) {
-  ostringstream stream;
-  stream << "Wheel event."
-         << " modifier:" << ModifierToString(wheel_event.GetModifiers())
-         << " deltax:" << wheel_event.GetDelta().x()
-         << " deltay:" << wheel_event.GetDelta().y()
-         << " wheel_ticks_x:" << wheel_event.GetTicks().x()
-         << " wheel_ticks_y:" << wheel_event.GetTicks().y()
-         << " scroll_by_page:"
-         << (wheel_event.GetScrollByPage() ? "true" : "false")
-         << "\n";
-  return stream.str();
-}
-
-
-string EventToString(const pp::InputEvent& event) {
-  ostringstream stream;
-  switch (event.GetType()) {
-    default:
-    case PP_INPUTEVENT_TYPE_UNDEFINED:
-     stream << "Unrecognized Event (" << static_cast<int32_t>(event.GetType())
-             << ")";
-      return stream.str();
-
-    case PP_INPUTEVENT_TYPE_MOUSEDOWN:
-      return MouseEvent(pp::MouseInputEvent(event), "Down");
-    case PP_INPUTEVENT_TYPE_MOUSEUP:
-      return MouseEvent(pp::MouseInputEvent(event), "Up");
-    case PP_INPUTEVENT_TYPE_MOUSEMOVE:
-      return MouseEvent(pp::MouseInputEvent(event), "Move");
-    case PP_INPUTEVENT_TYPE_MOUSEENTER:
-      return MouseEvent(pp::MouseInputEvent(event), "Enter");
-    case PP_INPUTEVENT_TYPE_MOUSELEAVE:
-      return MouseEvent(pp::MouseInputEvent(event), "Leave");
-
-    case PP_INPUTEVENT_TYPE_WHEEL:
-      return WheelEvent(pp::WheelInputEvent(event));
-
-    case PP_INPUTEVENT_TYPE_RAWKEYDOWN:
-      return KeyEvent(pp::KeyboardInputEvent(event), "RawKeyDown");
-    case PP_INPUTEVENT_TYPE_KEYDOWN:
-      return KeyEvent(pp::KeyboardInputEvent(event), "Down");
-    case PP_INPUTEVENT_TYPE_KEYUP:
-      return KeyEvent(pp::KeyboardInputEvent(event), "Up");
-    case PP_INPUTEVENT_TYPE_CHAR:
-      return KeyEvent(pp::KeyboardInputEvent(event), "Char");
-  }
-}
-
-void StringReplace(string* input,
-                   const string& find,
-                   const string& replace) {
-  if (find.length() == 0 || input->length() == 0) {
-    return;
-  }
-
-  size_t start_pos = 0;
-  while (1) {
-    start_pos = input->find(find, start_pos);
-    if (start_pos == string::npos) {
-      break;
-    }
-    input->replace(start_pos, find.length(), replace);
-    start_pos += replace.length();
-  }
-}
-
-}  // namespace
-
-
-class MyInstance : public pp::Instance {
- private:
-  size_t max_buffer_size_;
-  queue<string> event_buffer_;
-
-  void ParseArgs(uint32_t argc, const char* argn[], const char* argv[]) {
-     for (uint32_t i = 0; i < argc; ++i) {
-       const std::string tag = argn[i];
-       if (tag == "buffer_size") max_buffer_size_ = strtol(argv[i], 0, 0);
-       // ignore other tags
-     }
-  }
-
-  // Dump all the event via PostMessage for testing
-  void FlushEventBuffer() {
-      while (event_buffer_.size() > 0) {
-        string s = event_buffer_.front();
-        event_buffer_.pop();
-        // Replace space with underscore to simplify testing
-        StringReplace(&s, " ", "_");
-        pp::Var message(s);
-        PostMessage(message);
-      }
-  }
-
- public:
-  explicit MyInstance(PP_Instance instance)
-    : pp::Instance(instance), max_buffer_size_(kDefaultEventBufferSize) {
-    RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE | PP_INPUTEVENT_CLASS_WHEEL);
-    RequestFilteringInputEvents(PP_INPUTEVENT_CLASS_KEYBOARD);
-  }
-
-  virtual ~MyInstance() {}
-
-  virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]) {
-    ParseArgs(argc, argn, argv);
-    return true;
-  }
-
-  virtual bool HandleInputEvent(const pp::InputEvent& event) {
-     ostringstream stream;
-     stream << pp_instance() << ": " << EventToString(event);
-     event_buffer_.push(stream.str());
-    if (event_buffer_.size() >= max_buffer_size_) {
-      FlushEventBuffer();
-    }
-    return true;
-  }
-
-  virtual void DidChangeFocus(bool has_focus) {
-    FlushEventBuffer();
-  }
-};
-
-// standard boilerplate code below
-class MyModule : public pp::Module {
- public:
-  virtual pp::Instance* CreateInstance(PP_Instance instance) {
-    return new MyInstance(instance);
-  }
-};
-
-namespace pp {
-  Module* CreateModule() {
-    return new MyModule();
-  }
-}
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/event.stdin b/ppapi/native_client/tests/ppapi_simple_tests/event.stdin
deleted file mode 100644
index d3a5a16..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/event.stdin
+++ /dev/null
@@ -1,135 +0,0 @@
-# define a bunch of variables for readability
-
-set_variable MODULE i(4444)
-set_variable INSTANCE i(5555)
-set_variable EVENT i(6666)
-
-# NOTE: the event interface between the nexe and proxy is not strictly
-#       following the ppapi model because of performance reasons.
-#
-# The nexe entry point is
-#   PPP_InputEvent_HandleInputEvent:iiCC:i
-# Where the arguments are:
-#   in:
-#     PP_Instance instance:
-#     PP_Resource resource:
-#     InputEventData event_data:
-#     char[] character_text:
-#   out:
-#     int handled:
-#
-# InputEventData is described in src/shared/ppapi_proxy/input_event_data.h as:
-#
-# struct InputEventData {
-#   InputEventData();
-#   ~InputEventData();
-#
-#   PP_InputEvent_Type event_type;
-#   uint32_t event_modifiers;
-#   PP_TimeTicks event_time_stamp;
-#
-#   PP_InputEvent_MouseButton mouse_button;
-#   int32_t mouse_click_count;
-#   PP_Point mouse_position;
-#   PP_Point mouse_movement;
-#
-#   PP_FloatPoint wheel_delta;
-#   PP_FloatPoint wheel_ticks;
-#   PP_Bool wheel_scroll_by_page;
-#
-#   uint32_t key_code;
-# };
-
-# ieee double
-set_variable TIME_1 8:0x3ff0000000000000
-set_variable TIME_2 8:0x3ff1000000000000
-set_variable TIME_3 8:0x3ff2000000000000
-set_variable TIME_4 8:0x3ff3000000000000
-set_variable TIME_5 8:0x3ff4000000000000
-set_variable TIME_6 8:0x3ff5000000000000
-set_variable TIME_7 8:0x3ff6000000000000
-
-# pair of ints
-set_variable COORDS 4:264,4:100
-set_variable MOVES  4:0,4:0
-
-set_variable EV_MOUSE_DOWN  R(64,4:0,4:64,${TIME_1},4:0,4:1,${COORDS},${MOVES},8:0,8:0,4:0,4:0)
-set_variable EV_MOUSE_UP    R(64,4:1,4:64,${TIME_2},4:0,4:0,${COORDS},${MOVES},8:0,8:0,4:0,4:0)
-
-set_variable EV_MOUSE_MOVE  R(64,4:2,4:0,${TIME_3},4:0,4:0,${COORDS},${MOVES},8:0,8:0,4:0,4:0)
-
-set_variable EV_MOUSE_ENTER R(64,4:3,4:0,${TIME_4},4:0,4:0,${COORDS},${MOVES},8:0,8:0,4:0,4:0)
-set_variable EV_MOUSE_LEAVE R(64,4:4,4:0,${TIME_5},4:0,4:0,${COORDS},${MOVES},8:0,8:0,4:0,4:0)
-
-set_variable EV_KEY_DOWN    R(64,4:7,4:0,${TIME_6},4:0,4:0,8:0,8:0,8:0,8:0,4:0,4:0x54)
-set_variable EV_KEY_UP      R(64,4:8,4:0,${TIME_7},4:0,4:0,8:0,8:0,8:0,8:0,4:0,4:0x54)
-
-set_variable JS_STR 4:5
-set_variable JS_UND 4:0
-set_variable VAR_UNDEF R(8,${JS_UND},4:0)
-set_variable VAR_CHAR R(16,${JS_STR},4:1,8:0x56)
-
-
-echo
-echo "*** INIT MODULE"
-replay 1 PPB_GetInterface:s:i  s("PPB_Core;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_Instance;1.0") * i(1)
-# the results contain a process id which is non-determinisitic
-rpc PPP_InitializeModule hide-results i(0) ${MODULE} h(pepper_desc) s("${service_string}") * i(0) i(0)
-
-
-echo
-echo "*** INIT INSTANCE"
-set_variable TAGS C(12,buffer_size\000)
-set_variable VALUES C(4,100\000)
-replay 1 PPB_GetInterface:s:i  s("PPB_InputEvent;1.0") * i(1)
-rpc PPP_Instance_DidCreate ${INSTANCE} i(1) ${TAGS} ${VALUES} * i(0)
-
-replay 1 PPB_GetInterface:s:i  s("PPB_Var;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_MouseInputEvent;1.1") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_KeyboardInputEvent;1.0") * i(1)
-# These occur once each for each event sent to the nexe
-replay 7 PPB_Core_AddRefResource:i: ${EVENT} *
-replay 7 ReleaseResourceMultipleTimes:ii: ${EVENT} i(1) *
-
-
-echo
-echo "*** SENT EVENTS EV_MOUSE_DOWN"
-rpc PPP_InputEvent_HandleInputEvent ${INSTANCE} ${EVENT} ${EV_MOUSE_DOWN} ${VAR_UNDEF} * i(0)
-echo
-echo "*** SENT EVENTS EV_MOUSE_UP"
-rpc PPP_InputEvent_HandleInputEvent ${INSTANCE} ${EVENT} ${EV_MOUSE_UP} ${VAR_UNDEF} * i(0)
-echo
-echo "*** SENT EVENTS EV_MOUSE_MOVE"
-rpc PPP_InputEvent_HandleInputEvent ${INSTANCE} ${EVENT} ${EV_MOUSE_MOVE} ${VAR_UNDEF} * i(0)
-echo
-echo "*** SENT EVENTS EV_MOUSE_ENTER"
-rpc PPP_InputEvent_HandleInputEvent ${INSTANCE} ${EVENT} ${EV_MOUSE_ENTER} ${VAR_UNDEF} * i(0)
-echo
-echo "*** SENT EVENTS EV_MOUSE_LEAVE"
-rpc PPP_InputEvent_HandleInputEvent ${INSTANCE} ${EVENT} ${EV_MOUSE_LEAVE} ${VAR_UNDEF} * i(0)
-echo
-echo "*** SENT EVENTS EV_KEY_UP"
-rpc PPP_InputEvent_HandleInputEvent ${INSTANCE} ${EVENT} ${EV_KEY_UP} ${VAR_CHAR} * i(0)
-echo
-echo "*** SENT EVENTS EV_KEY_DOWN"
-rpc PPP_InputEvent_HandleInputEvent ${INSTANCE} ${EVENT} ${EV_KEY_DOWN} ${VAR_CHAR} * i(0)
-
-
-echo
-echo "*** TRIGGER EVENT FLUSH"
-replay 1 PPB_GetInterface:s:i  s("PPB_Var;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_Messaging;1.0") * i(1)
-replay 1 PPB_Messaging_PostMessage:iC: i(5555) C(104,\x05\x00\x00\x00_\x00\x00\x005555:_Mouse_event:Down_modifier:left-button-down__button:Left_x:264_y:100_click_count:1_time:1\n\x00) *
-replay 1 PPB_Messaging_PostMessage:iC: i(5555) C(112,\x05\x00\x00\x00b\x00\x00\x005555:_Mouse_event:Up_modifier:left-button-down__button:Left_x:264_y:100_click_count:0_time:1.0625\n\x00\x00\x00\x00\x00\x00) *
-replay 1 PPB_Messaging_PostMessage:iC: i(5555) C(96,\x05\x00\x00\x00R\x00\x00\x005555:_Mouse_event:Move_modifier:_button:Left_x:264_y:100_click_count:0_time:1.125\n\x00\x00\x00\x00\x00\x00) *
-replay 1 PPB_Messaging_PostMessage:iC: i(5555) C(96,\x05\x00\x00\x00T\x00\x00\x005555:_Mouse_event:Enter_modifier:_button:Left_x:264_y:100_click_count:0_time:1.1875\n\x00\x00\x00\x00) *
-replay 1 PPB_Messaging_PostMessage:iC: i(5555) C(96,\x05\x00\x00\x00R\x00\x00\x005555:_Mouse_event:Leave_modifier:_button:Left_x:264_y:100_click_count:0_time:1.25\n\x00\x00\x00\x00\x00\x00) *
-replay 1 PPB_Messaging_PostMessage:iC: i(5555) C(80,\x05\x00\x00\x00B\x00\x00\x005555:_Key_event:Up_modifier:_key_code:84_time:1.375_text:Var<'V'>\n\x00\x00\x00\x00\x00\x00) *
-replay 1 PPB_Messaging_PostMessage:iC: i(5555) C(80,\x05\x00\x00\x00E\x00\x00\x005555:_Key_event:Down_modifier:_key_code:84_time:1.3125_text:Var<'V'>\n\x00\x00\x00) *
-rpc PPP_Instance_DidChangeFocus ${INSTANCE} b(0) *
-
-
-rpc PPP_ShutdownModule *
-
-echo "DONE"
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/event.stdout b/ppapi/native_client/tests/ppapi_simple_tests/event.stdout
deleted file mode 100644
index d791ad6..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/event.stdout
+++ /dev/null
@@ -1,180 +0,0 @@
-
-"*** REPLAY PROLOG"
-
-"*** REGISTER REPLAY METHODS"
-
-"*** CREATE UPCALL SERVICE"
-
-"*** INIT MODULE"
-rpc call intiated PPP_InitializeModule:iihs:ii
-input 0:  i(0)
-input 1:  i(4444)
-input 2:  h(pepper_desc)
-input 3:  @LENGTHY_SERVICE_STRING
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Core;1.0")
-output 0:  i(1)
-rpc call complete PPP_InitializeModule:iihs:ii
-
-
-"*** INIT INSTANCE"
-rpc call intiated PPP_Instance_DidCreate:iiCC:i
-input 0:  i(5555)
-input 1:  i(1)
-input 2:  C(12,buffer_size\x00)
-input 3:  C(4,100\x00)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_InputEvent;1.0")
-output 0:  i(1)
-rpc call complete PPP_Instance_DidCreate:iiCC:i
-output 0:  i(1)
-
-
-"*** SENT EVENTS EV_MOUSE_DOWN"
-rpc call intiated PPP_InputEvent_HandleInputEvent:iiCC:i
-input 0:  i(5555)
-input 1:  i(6666)
-input 2:  C(64,\x00\x00\x00\x00@\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x01\x00\x00\x00\b\x01\x00\x00d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00)
-input 3:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-replaying PPB_Core_AddRefResource:i::
-input 0:  i(6666)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_MouseInputEvent;1.1")
-output 0:  i(1)
-replaying ReleaseResourceMultipleTimes:ii::
-input 0:  i(6666)
-input 1:  i(1)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Var;1.0")
-output 0:  i(1)
-rpc call complete PPP_InputEvent_HandleInputEvent:iiCC:i
-output 0:  i(1)
-
-
-"*** SENT EVENTS EV_MOUSE_UP"
-rpc call intiated PPP_InputEvent_HandleInputEvent:iiCC:i
-input 0:  i(5555)
-input 1:  i(6666)
-input 2:  C(64,\x01\x00\x00\x00@\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf1?\x00\x00\x00\x00\x00\x00\x00\x00\b\x01\x00\x00d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00)
-input 3:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-replaying PPB_Core_AddRefResource:i::
-input 0:  i(6666)
-replaying ReleaseResourceMultipleTimes:ii::
-input 0:  i(6666)
-input 1:  i(1)
-rpc call complete PPP_InputEvent_HandleInputEvent:iiCC:i
-output 0:  i(1)
-
-
-"*** SENT EVENTS EV_MOUSE_MOVE"
-rpc call intiated PPP_InputEvent_HandleInputEvent:iiCC:i
-input 0:  i(5555)
-input 1:  i(6666)
-input 2:  C(64,\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf2?\x00\x00\x00\x00\x00\x00\x00\x00\b\x01\x00\x00d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00)
-input 3:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-replaying PPB_Core_AddRefResource:i::
-input 0:  i(6666)
-replaying ReleaseResourceMultipleTimes:ii::
-input 0:  i(6666)
-input 1:  i(1)
-rpc call complete PPP_InputEvent_HandleInputEvent:iiCC:i
-output 0:  i(1)
-
-
-"*** SENT EVENTS EV_MOUSE_ENTER"
-rpc call intiated PPP_InputEvent_HandleInputEvent:iiCC:i
-input 0:  i(5555)
-input 1:  i(6666)
-input 2:  C(64,\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf3?\x00\x00\x00\x00\x00\x00\x00\x00\b\x01\x00\x00d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00)
-input 3:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-replaying PPB_Core_AddRefResource:i::
-input 0:  i(6666)
-replaying ReleaseResourceMultipleTimes:ii::
-input 0:  i(6666)
-input 1:  i(1)
-rpc call complete PPP_InputEvent_HandleInputEvent:iiCC:i
-output 0:  i(1)
-
-
-"*** SENT EVENTS EV_MOUSE_LEAVE"
-rpc call intiated PPP_InputEvent_HandleInputEvent:iiCC:i
-input 0:  i(5555)
-input 1:  i(6666)
-input 2:  C(64,\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf4?\x00\x00\x00\x00\x00\x00\x00\x00\b\x01\x00\x00d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00)
-input 3:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-replaying PPB_Core_AddRefResource:i::
-input 0:  i(6666)
-replaying ReleaseResourceMultipleTimes:ii::
-input 0:  i(6666)
-input 1:  i(1)
-rpc call complete PPP_InputEvent_HandleInputEvent:iiCC:i
-output 0:  i(1)
-
-
-"*** SENT EVENTS EV_KEY_UP"
-rpc call intiated PPP_InputEvent_HandleInputEvent:iiCC:i
-input 0:  i(5555)
-input 1:  i(6666)
-input 2:  C(64,\b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf6?\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00T\x00\x00\x00)
-input 3:  C(16,\x05\x00\x00\x00\x01\x00\x00\x00V\x00\x00\x00\x00\x00\x00\x00)
-replaying PPB_Core_AddRefResource:i::
-input 0:  i(6666)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_KeyboardInputEvent;1.0")
-output 0:  i(1)
-replaying ReleaseResourceMultipleTimes:ii::
-input 0:  i(6666)
-input 1:  i(1)
-rpc call complete PPP_InputEvent_HandleInputEvent:iiCC:i
-output 0:  i(1)
-
-
-"*** SENT EVENTS EV_KEY_DOWN"
-rpc call intiated PPP_InputEvent_HandleInputEvent:iiCC:i
-input 0:  i(5555)
-input 1:  i(6666)
-input 2:  C(64,\x07\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf5?\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00T\x00\x00\x00)
-input 3:  C(16,\x05\x00\x00\x00\x01\x00\x00\x00V\x00\x00\x00\x00\x00\x00\x00)
-replaying PPB_Core_AddRefResource:i::
-input 0:  i(6666)
-replaying ReleaseResourceMultipleTimes:ii::
-input 0:  i(6666)
-input 1:  i(1)
-rpc call complete PPP_InputEvent_HandleInputEvent:iiCC:i
-output 0:  i(1)
-
-
-"*** TRIGGER EVENT FLUSH"
-rpc call intiated PPP_Instance_DidChangeFocus:ib:
-input 0:  i(5555)
-input 1:  b(0)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Messaging;1.0")
-output 0:  i(1)
-replaying PPB_Messaging_PostMessage:iC::
-input 0:  i(5555)
-input 1:  C(104,\x05\x00\x00\x00_\x00\x00\x005555:_Mouse_event:Down_modifier:left-button-down__button:Left_x:264_y:100_click_count:1_time:1\n\x00)
-replaying PPB_Messaging_PostMessage:iC::
-input 0:  i(5555)
-input 1:  C(112,\x05\x00\x00\x00b\x00\x00\x005555:_Mouse_event:Up_modifier:left-button-down__button:Left_x:264_y:100_click_count:0_time:1.0625\n\x00\x00\x00\x00\x00\x00)
-replaying PPB_Messaging_PostMessage:iC::
-input 0:  i(5555)
-input 1:  C(96,\x05\x00\x00\x00R\x00\x00\x005555:_Mouse_event:Move_modifier:_button:Left_x:264_y:100_click_count:0_time:1.125\n\x00\x00\x00\x00\x00\x00)
-replaying PPB_Messaging_PostMessage:iC::
-input 0:  i(5555)
-input 1:  C(96,\x05\x00\x00\x00T\x00\x00\x005555:_Mouse_event:Enter_modifier:_button:Left_x:264_y:100_click_count:0_time:1.1875\n\x00\x00\x00\x00)
-replaying PPB_Messaging_PostMessage:iC::
-input 0:  i(5555)
-input 1:  C(96,\x05\x00\x00\x00R\x00\x00\x005555:_Mouse_event:Leave_modifier:_button:Left_x:264_y:100_click_count:0_time:1.25\n\x00\x00\x00\x00\x00\x00)
-replaying PPB_Messaging_PostMessage:iC::
-input 0:  i(5555)
-input 1:  C(80,\x05\x00\x00\x00B\x00\x00\x005555:_Key_event:Up_modifier:_key_code:84_time:1.375_text:Var<'V'>\n\x00\x00\x00\x00\x00\x00)
-replaying PPB_Messaging_PostMessage:iC::
-input 0:  i(5555)
-input 1:  C(80,\x05\x00\x00\x00E\x00\x00\x005555:_Key_event:Down_modifier:_key_code:84_time:1.3125_text:Var<'V'>\n\x00\x00\x00)
-rpc call complete PPP_Instance_DidChangeFocus:ib:
-
-rpc call intiated PPP_ShutdownModule::
-rpc call complete PPP_ShutdownModule::
-
-"DONE"
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/file.cc b/ppapi/native_client/tests/ppapi_simple_tests/file.cc
deleted file mode 100644
index 3b3c2d8..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/file.cc
+++ /dev/null
@@ -1,326 +0,0 @@
-// 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 <stdint.h>
-#include <stdlib.h>
-
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <queue>
-
-#include "native_client/src/shared/platform/nacl_check.h"
-
-
-
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/c/ppb_file_io.h"
-
-#include "ppapi/cpp/completion_callback.h"
-#include "ppapi/cpp/instance.h"
-#include "ppapi/cpp/file_ref.h"
-#include "ppapi/cpp/file_io.h"
-#include "ppapi/cpp/module.h"
-#include "ppapi/cpp/url_response_info.h"
-#include "ppapi/cpp/url_loader.h"
-#include "ppapi/cpp/url_request_info.h"
-#include "ppapi/cpp/var.h"
-
-using std::string;
-using std::ostringstream;
-
-const int kDefaultChunkSize = 1024;
-
-
-class MyInstance : public pp::Instance {
- private:
-  string url_;
-  bool stream_to_file_;
-  uint32_t chunk_size_;
-  bool debug_;
-  bool pdebug_;
-
-  void ParseArgs(uint32_t argc, const char* argn[], const char* argv[]) {
-     for (uint32_t i = 0; i < argc; ++i) {
-       const std::string tag = argn[i];
-       if (tag == "chunk_size") chunk_size_ = strtol(argv[i], 0, 0);
-       if (tag == "url") url_ = argv[i];
-       if (tag == "to_file") stream_to_file_ = strtol(argv[i], 0, 0);
-       if (tag == "debug") debug_ = strtol(argv[i], 0, 0);
-       if (tag == "pdebug") pdebug_ = strtol(argv[i], 0, 0);
-       // ignore other tags
-     }
-  }
-
- public:
-  void Message(const string& s) {
-    ostringstream stream;
-    stream << pp_instance() << ": " << s;
-    pp::Var message(stream.str());
-    PostMessage(message);
-  }
-
-
-  void Debug(const string& s) {
-    if (debug_) {
-      std::cout << "DEBUG: " << s;
-    }
-    if (pdebug_) {
-      Message("DEBUG: " + s);
-    }
-  }
-
-  explicit MyInstance(PP_Instance instance)
-    : pp::Instance(instance),
-      url_("no_url_given.html"),
-      stream_to_file_(true),
-      chunk_size_(kDefaultChunkSize),
-      debug_(false),
-      pdebug_(false) {
-  }
-
-  virtual ~MyInstance() {}
-
-  // Defined below. This function does the real work by delegating it to
-  // either ReaderStreamAsFile or ReaderResponseBody
-  virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]);
-};
-
-
-
-class ReaderStreamAsFile {
- private:
-  uint32_t current_offset_;
-  uint32_t chunk_size_;
-  char* buffer_;
-  pp::URLResponseInfo* response_info_;
-  pp::FileRef* file_ref_;
-  pp::FileIO* file_io_;
-  MyInstance* instance_;
-  pp::URLLoader loader_;
-
-  // forward to instance
-  void Message(const string& s) {
-    instance_->Message(s);
-  }
-
-  void Debug(const string& s) {
-    instance_->Debug(s);
-  }
-
-  static void ReadCompleteCallback(void* thiz, int32_t result) {
-    ReaderStreamAsFile* reader = static_cast<ReaderStreamAsFile*>(thiz);
-    ostringstream stream;
-    stream << "ReadCompleteCallback Bytes Read: " << result;
-    reader->Debug(stream.str());
-    if (result <= 0) {
-      reader->Message("COMPLETE");
-      return;
-    }
-
-    reader->current_offset_ += result;
-    reader->ReadMore();
-  }
-
-  void ReadMore() {
-    pp::CompletionCallback cc(ReadCompleteCallback, this);
-    cc.set_flags(PP_COMPLETIONCALLBACK_FLAG_OPTIONAL);
-    int32_t rv = file_io_->Read(current_offset_, buffer_, chunk_size_, cc);
-    if (rv == PP_OK) {
-      cc.Run(rv);
-    } else if (rv != PP_OK_COMPLETIONPENDING) {
-      Message("Error: ReadMore unexpected rv");
-    }
-  }
-
-  static void OpenFileCompleteCallback(void* thiz, int32_t result) {
-    ReaderStreamAsFile* reader = static_cast<ReaderStreamAsFile*>(thiz);
-
-    if (result != PP_OK) {
-      reader->Message("Error: FileOpenCompleteCallback unexpected result");
-      return;
-    }
-
-    reader->ReadMore();
-  }
-
-  void OpenFile() {
-    file_ref_ = new pp::FileRef(loader_.GetResponseInfo().GetBodyAsFileRef());
-    CHECK(!file_ref_->is_null());
-
-    file_io_ = new  pp::FileIO(instance_);
-    CHECK(!file_io_->is_null());
-
-    pp::CompletionCallback cc(OpenFileCompleteCallback, this);
-    int32_t rv = file_io_->Open(*file_ref_, PP_FILEOPENFLAG_READ, cc);
-    if (rv != PP_OK_COMPLETIONPENDING) {
-      Message("Error: OpenFile unexpected rv");
-    }
-  }
-
-  static void FinishCompleteCallback(void* thiz, int32_t result) {
-    ReaderStreamAsFile* reader = static_cast<ReaderStreamAsFile*>(thiz);
-    if (result != PP_OK) {
-      reader->Message("Error: FinishCompleteCallback unexpected result");
-      return;
-    }
-
-    reader->OpenFile();
-  }
-
-  void Finish() {
-    pp::CompletionCallback cc(FinishCompleteCallback, this);
-    cc.set_flags(PP_COMPLETIONCALLBACK_FLAG_OPTIONAL);
-    int32_t rv = loader_.FinishStreamingToFile(cc);
-    if (rv == PP_OK) {
-      cc.Run(rv);
-    } else if (rv != PP_OK_COMPLETIONPENDING) {
-      Message("Error: Finish unexpected rv");
-    }
-  }
-
-  // this callback handles both regular and "stream-to-file" mode
-  // But control flow diverges afterwards
-  static void OpenURLCompleteCallback(void* thiz, int32_t result) {
-    ReaderStreamAsFile* reader = static_cast<ReaderStreamAsFile*>(thiz);
-
-    pp::URLResponseInfo response_info(reader->loader_.GetResponseInfo());
-    CHECK(!response_info.is_null());
-    int32_t status_code = response_info.GetStatusCode();
-    if (status_code != 200) {
-      reader->Message("Error: OpenURLCompleteCallback unexpected status code");
-      return;
-    }
-
-    reader->Finish();
-  }
-
-  void OpenURL(const string& url) {
-    pp::URLRequestInfo request(instance_);
-    request.SetURL(url);
-    request.SetStreamToFile(true);
-
-    pp::CompletionCallback cc(OpenURLCompleteCallback, this);
-    int32_t rv = loader_.Open(request, cc);
-    if (rv != PP_OK_COMPLETIONPENDING) {
-      Message("Error: OpenURL unexpected rv");
-    }
-  }
-
- public:
-  ReaderStreamAsFile(MyInstance* instance,
-                     uint32_t chunk_size,
-                     const string& url) :
-    current_offset_(0),
-    chunk_size_(chunk_size),
-    buffer_(new char[chunk_size]),
-    response_info_(0),
-    file_ref_(0),
-    file_io_(0),
-    instance_(instance),
-    loader_(instance) {
-      OpenURL(url);
-    }
-};
-
-
-class ReaderResponseBody {
- private:
-  uint32_t chunk_size_;
-  char* buffer_;
-  MyInstance* instance_;
-  pp::URLLoader loader_;
-
-  // forward to instance
-  void Message(const string& s) {
-    instance_->Message(s);
-  }
-
-  void Debug(const string& s) {
-    instance_->Debug(s);
-  }
-
-  static void ReadCompleteCallback(void* thiz, int32_t result) {
-    ReaderResponseBody* reader = static_cast<ReaderResponseBody*>(thiz);
-    ostringstream stream;
-    stream << "ReadCompleteCallback Bytes Read: " << result;
-    reader->Debug(stream.str());
-    if (result <= 0) {
-      reader->Message("COMPLETE");
-      return;
-    }
-    reader->ReadMore();
-  }
-
-  void ReadMore() {
-    pp::CompletionCallback cc(ReadCompleteCallback, this);
-    cc.set_flags(PP_COMPLETIONCALLBACK_FLAG_OPTIONAL);
-    int rv = loader_.ReadResponseBody(buffer_, chunk_size_, cc);
-    if (rv == PP_OK) {
-      cc.Run(rv);
-    } else if (rv != PP_OK_COMPLETIONPENDING) {
-      Message("Error: ReadMore unexpected rv");
-    }
-  }
-
-  static void LoadCompleteCallback(void* thiz, int32_t result) {
-    ReaderResponseBody* reader = static_cast<ReaderResponseBody*>(thiz);
-    ostringstream stream;
-    stream << "LoadCompleteCallback: " << result;
-    reader->Debug(stream.str());
-    pp::URLResponseInfo response_info(reader->loader_.GetResponseInfo());
-    CHECK(!response_info.is_null());
-    int32_t status_code = response_info.GetStatusCode();
-    if (status_code != 200) {
-      reader->Message("Error: LoadCompleteCallback unexpected status code");
-      return;
-    }
-
-    reader->ReadMore();
-  }
-
- public:
-  ReaderResponseBody(MyInstance* instance,
-                     uint32_t chunk_size,
-                     const string& url) :
-    chunk_size_(chunk_size),
-    buffer_(new char[chunk_size]),
-    instance_(instance),
-    loader_(instance) {
-    pp::URLRequestInfo request(instance_);
-    request.SetURL(url);
-    request.SetStreamToFile(false);
-
-    pp::CompletionCallback cc(LoadCompleteCallback, this);
-    int32_t rv = loader_.Open(request, cc);
-    if (rv != PP_OK_COMPLETIONPENDING) {
-      Message("Error: ReaderResponseBody: unexpected rv");
-    }
-  }
-};
-
-// Defined here because of circular class visibility issues
-bool MyInstance::Init(uint32_t argc, const char* argn[], const char* argv[]) {
-  ParseArgs(argc, argn, argv);
-  if (stream_to_file_) {
-    new ReaderStreamAsFile(this, chunk_size_, url_);
-  } else {
-    new ReaderResponseBody(this, chunk_size_, url_);
-  }
-  return true;
-}
-
-// standard boilerplate code below
-class MyModule : public pp::Module {
- public:
-  virtual pp::Instance* CreateInstance(PP_Instance instance) {
-    return new MyInstance(instance);
-  }
-};
-
-namespace pp {
-  Module* CreateModule() {
-    return new MyModule();
-  }
-}
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/file1.stdin b/ppapi/native_client/tests/ppapi_simple_tests/file1.stdin
deleted file mode 100644
index ad3a304..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/file1.stdin
+++ /dev/null
@@ -1,88 +0,0 @@
-# To be used with
-#    sel_universal_ppapi_replay_prolog.stdin
-# define a bunch of variables for readability
-
-# NOTE: this test exercises the request.SetStreamToFile(false) case
-
-set_variable MODULE i(4444)
-set_variable INSTANCE i(5555)
-
-# Tags used by pepper/srpc to marshall js parameters
-set_variable JS_STR 4:5
-set_variable JS_INT 4:2
-
-# NOTE: the strings below must not contain unescaped spaces or commas
-
-set_variable FILE_DATA1 C(6,hello\x20)
-set_variable FILE_SIZE1 i(6)
-set_variable FILE_DATA2 C(6,world!)
-set_variable FILE_SIZE2 i(6)
-
-set_variable PARAM_STR_URL R(24,${JS_STR},4:10,"myurl.html",6:0)
-set_variable PARAM_STR_GET R(16,${JS_STR},4:3,"GET",5:0)
-set_variable PARAM_NUM_0  R(8,${JS_INT},4:0)
-set_variable PARAM_NUM_1  R(8,${JS_INT},4:1)
-set_variable PARAM_STATUS R(8,4:3,4:200)
-
-set_variable NUM_TAGS i(3)
-set_variable TAGS C(23,chunk_size\000url\000to_file\000)
-set_variable VALUES C(16,10\000myurl.html\0000\000)
-
-set_variable COMPLETE R(24,${JS_STR},4:14,"5555: COMPLETE",2:0)
-
-######################################################################
-
-# These replays are too common to list them separately
-# TODO(robertm): make the counts tight, eliminate PPB_Var ASAP
-
-replay 1 PPB_GetInterface:s:i  s("PPB_Messaging;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_Core;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_Var;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_URLRequestInfo;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_URLResponseInfo;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_URLLoader;1.0") * i(1)
-
-######################################################################
-
-echo
-echo "*** INIT MODULE"
-# the results contain a process id which is non-determinisitic
-rpc PPP_InitializeModule hide-results i(0) ${MODULE} h(pepper_desc) s("${service_string}") * i(0) i(0)
-
-echo
-echo "*** Load URL"
-replay 1 PPB_URLRequestInfo_Create:i:i ${INSTANCE} * i(30)
-replay 1 PPB_URLLoader_Create:i:i  ${INSTANCE} * i(34)
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(30) i(0) ${PARAM_STR_URL} * i(1)
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(30) i(1) ${PARAM_STR_GET} * i(1)
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(30) i(3) ${PARAM_NUM_0} * i(1)
-replay 1 PPB_URLLoader_Open:iii:i i(34) i(30) i(1) * i(-1)
-replay 1 PPB_Core_ReleaseResource:i: i(30) *
-rpc PPP_Instance_DidCreate ${INSTANCE} ${NUM_TAGS} ${TAGS} ${VALUES} * i(0)
-
-echo
-echo "*** async Open Callback"
-replay 1 PPB_URLLoader_GetResponseInfo:i:i i(34) * i(38)
-replay 1 PPB_URLResponseInfo_GetProperty:ii:C i(38) i(3) * ${PARAM_STATUS}
-replay 1 PPB_URLLoader_ReadResponseBody:iii:Ci i(34) i(10) i(2) * C(0,) i(-1)
-replay 1 PPB_Core_ReleaseResource:i: i(38) *
-rpc RunCompletionCallback i(1) i(0) C(0,) *
-
-echo
-echo "*** async ReaderResponseBody Callback (first 6 bytes)"
-replay 1 PPB_URLLoader_ReadResponseBody:iii:Ci i(34) i(10) i(3) * C(0,) i(-1)
-rpc RunCompletionCallback i(2) ${FILE_SIZE1} ${FILE_DATA1} *
-
-echo
-echo "*** async ReaderResponseBody Callback (second 6 bytes)"
-replay 1 PPB_URLLoader_ReadResponseBody:iii:Ci i(34) i(10) i(4) * C(0,) i(-1)
-rpc RunCompletionCallback i(3) ${FILE_SIZE2} ${FILE_DATA2} *
-
-echo
-echo "*** async ReaderResponseBody Callback (eof - 0 bytes)"
-replay 1 PPB_Messaging_PostMessage:iC: ${INSTANCE} ${COMPLETE} *
-rpc RunCompletionCallback i(4) i(0) C(0,) *
-
-echo
-echo "*** DONE"
-rpc PPP_ShutdownModule *
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/file1.stdout b/ppapi/native_client/tests/ppapi_simple_tests/file1.stdout
deleted file mode 100644
index fff7df5..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/file1.stdout
+++ /dev/null
@@ -1,133 +0,0 @@
-
-"*** REPLAY PROLOG"
-
-"*** REGISTER REPLAY METHODS"
-
-"*** CREATE UPCALL SERVICE"
-
-"*** INIT MODULE"
-rpc call intiated PPP_InitializeModule:iihs:ii
-input 0:  i(0)
-input 1:  i(4444)
-input 2:  h(pepper_desc)
-input 3:  @LENGTHY_SERVICE_STRING
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Core;1.0")
-output 0:  i(1)
-rpc call complete PPP_InitializeModule:iihs:ii
-
-
-"*** Load URL"
-rpc call intiated PPP_Instance_DidCreate:iiCC:i
-input 0:  i(5555)
-input 1:  i(3)
-input 2:  C(23,chunk_size\x00url\x00to_file\x00)
-input 3:  C(16,10\x00myurl.html\x000\x00)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_URLLoader;1.0")
-output 0:  i(1)
-replaying PPB_URLLoader_Create:i:i:
-input 0:  i(5555)
-output 0:  i(34)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_URLRequestInfo;1.0")
-output 0:  i(1)
-replaying PPB_URLRequestInfo_Create:i:i:
-input 0:  i(5555)
-output 0:  i(30)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Var;1.0")
-output 0:  i(1)
-replaying PPB_URLRequestInfo_SetProperty:iiC:i:
-input 0:  i(30)
-input 1:  i(0)
-input 2:  C(24,\x05\x00\x00\x00\n\x00\x00\x00myurl.html\x00\x00\x00\x00\x00\x00)
-output 0:  i(1)
-replaying PPB_URLRequestInfo_SetProperty:iiC:i:
-input 0:  i(30)
-input 1:  i(3)
-input 2:  C(8,\x02\x00\x00\x00\x00\x00\x00\x00)
-output 0:  i(1)
-replaying PPB_URLLoader_Open:iii:i:
-input 0:  i(34)
-input 1:  i(30)
-input 2:  i(1)
-output 0:  i(-1)
-replaying PPB_Core_ReleaseResource:i::
-input 0:  i(30)
-rpc call complete PPP_Instance_DidCreate:iiCC:i
-output 0:  i(1)
-
-
-"*** async Open Callback"
-rpc call intiated RunCompletionCallback:iiC:
-input 0:  i(1)
-input 1:  i(0)
-input 2:  C(0,)
-replaying PPB_URLLoader_GetResponseInfo:i:i:
-input 0:  i(34)
-output 0:  i(38)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_URLResponseInfo;1.0")
-output 0:  i(1)
-replaying PPB_URLResponseInfo_GetProperty:ii:C:
-input 0:  i(38)
-input 1:  i(3)
-output 0:  C(8,\x03\x00\x00\x00\xc8\x00\x00\x00)
-replaying PPB_URLLoader_ReadResponseBody:iii:Ci:
-input 0:  i(34)
-input 1:  i(10)
-input 2:  i(2)
-output 0:  C(0,)
-output 1:  i(-1)
-replaying PPB_Core_ReleaseResource:i::
-input 0:  i(38)
-rpc call complete RunCompletionCallback:iiC:
-
-
-"*** async ReaderResponseBody Callback (first 6 bytes)"
-rpc call intiated RunCompletionCallback:iiC:
-input 0:  i(2)
-input 1:  i(6)
-input 2:  C(6,hello )
-replaying PPB_URLLoader_ReadResponseBody:iii:Ci:
-input 0:  i(34)
-input 1:  i(10)
-input 2:  i(3)
-output 0:  C(0,)
-output 1:  i(-1)
-rpc call complete RunCompletionCallback:iiC:
-
-
-"*** async ReaderResponseBody Callback (second 6 bytes)"
-rpc call intiated RunCompletionCallback:iiC:
-input 0:  i(3)
-input 1:  i(6)
-input 2:  C(6,world!)
-replaying PPB_URLLoader_ReadResponseBody:iii:Ci:
-input 0:  i(34)
-input 1:  i(10)
-input 2:  i(4)
-output 0:  C(0,)
-output 1:  i(-1)
-rpc call complete RunCompletionCallback:iiC:
-
-
-"*** async ReaderResponseBody Callback (eof - 0 bytes)"
-rpc call intiated RunCompletionCallback:iiC:
-input 0:  i(4)
-input 1:  i(0)
-input 2:  C(0,)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Messaging;1.0")
-output 0:  i(1)
-replaying PPB_Messaging_PostMessage:iC::
-input 0:  i(5555)
-input 1:  C(24,\x05\x00\x00\x00\x0e\x00\x00\x005555: COMPLETE\x00\x00)
-rpc call complete RunCompletionCallback:iiC:
-
-
-"*** DONE"
-rpc call intiated PPP_ShutdownModule::
-rpc call complete PPP_ShutdownModule::
-
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/file2.stdin b/ppapi/native_client/tests/ppapi_simple_tests/file2.stdin
deleted file mode 100644
index 090425dc..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/file2.stdin
+++ /dev/null
@@ -1,83 +0,0 @@
-# To be used with
-#    sel_universal_ppapi_replay_prolog.stdin
-# define a bunch of variables for readability
-
-# NOTE: this test exercises the request.SetStreamToFile(true) case
-#       which does not result in a 200 return code
-#       So the expected outcome of this tests is a failure.
-
-set_variable MODULE i(4444)
-set_variable INSTANCE i(5555)
-
-# Tags used by pepper/srpc to marshall js parameters
-set_variable JS_STR 4:5
-set_variable JS_INT 4:2
-
-# NOTE: the strings below must not contain unescaped spaces or commas
-
-set_variable FILE_DATA1 C(6,hello\x20)
-set_variable FILE_SIZE1 i(6)
-set_variable FILE_DATA2 C(6,world!)
-set_variable FILE_SIZE2 i(6)
-
-set_variable PARAM_STR_URL R(24,${JS_STR},4:10,"myurl.html",6:0)
-set_variable PARAM_STR_GET R(16,${JS_STR},4:3,"GET",5:0)
-set_variable PARAM_NUM_0  R(8,${JS_INT},4:0)
-set_variable PARAM_NUM_1  R(8,${JS_INT},4:1)
-set_variable PARAM_STATUS R(8,4:3,4:200)
-
-set_variable NUM_TAGS i(3)
-set_variable TAGS C(23,chunk_size\000url\000to_file\000)
-set_variable VALUES C(16,10\000myurl.html\0001\000)
-
-set_variable ERROR R(48,${JS_STR},4:33,"5555: Error: Finish unexpected rv",7:0)
-
-######################################################################
-
-# These replays are too common to list them separately
-# TODO(robertm): make the counts tight, eliminate PPB_Var ASAP
-
-replay 1 PPB_GetInterface:s:i  s("PPB_Messaging;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_Core;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_Var;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_URLRequestInfo;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_URLResponseInfo;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_URLLoader;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_FileIO;1.0") * i(1)
-
-######################################################################
-
-echo
-echo "*** INIT MODULE"
-# the results contain a process id which is non-determinisitic
-rpc PPP_InitializeModule hide-results i(0) ${MODULE} h(pepper_desc) s("${service_string}") * i(0) i(0)
-
-echo
-echo "*** Load URL"
-replay 1 PPB_URLRequestInfo_Create:i:i ${INSTANCE} * i(30)
-replay 1 PPB_URLLoader_Create:i:i  ${INSTANCE} * i(34)
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(30) i(0) ${PARAM_STR_URL} * i(1)
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(30) i(1) ${PARAM_STR_GET} * i(1)
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(30) i(3) ${PARAM_NUM_1} * i(1)
-replay 1 PPB_URLLoader_Open:iii:i i(34) i(30) i(1) * i(-1)
-replay 1 PPB_Core_ReleaseResource:i: i(30) *
-rpc PPP_Instance_DidCreate ${INSTANCE} ${NUM_TAGS} ${TAGS} ${VALUES} * i(0)
-
-echo
-echo "*** async Open Callback"
-replay 1 PPB_URLLoader_GetResponseInfo:i:i i(34) * i(38)
-replay 1 PPB_URLResponseInfo_GetProperty:ii:C i(38) i(3) * ${PARAM_STATUS}
-replay 1 PPB_URLLoader_ReadResponseBody:iii:Ci i(34) i(10) i(2) * C(0,) i(-1)
-replay 1 PPB_Core_ReleaseResource:i: i(38) *
-replay 1 PPB_Messaging_PostMessage:iC: ${INSTANCE} ${ERROR} *
-rpc RunCompletionCallback i(1) i(0) C(0,) *
-
-
-######################################################################
-## EPILOG
-######################################################################
-echo
-echo "*** DONE"
-rpc PPP_ShutdownModule *
-
-
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/file2.stdout b/ppapi/native_client/tests/ppapi_simple_tests/file2.stdout
deleted file mode 100644
index 2d1318c..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/file2.stdout
+++ /dev/null
@@ -1,91 +0,0 @@
-
-"*** REPLAY PROLOG"
-
-"*** REGISTER REPLAY METHODS"
-
-"*** CREATE UPCALL SERVICE"
-
-"*** INIT MODULE"
-rpc call intiated PPP_InitializeModule:iihs:ii
-input 0:  i(0)
-input 1:  i(4444)
-input 2:  h(pepper_desc)
-input 3:  @LENGTHY_SERVICE_STRING
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Core;1.0")
-output 0:  i(1)
-rpc call complete PPP_InitializeModule:iihs:ii
-
-
-"*** Load URL"
-rpc call intiated PPP_Instance_DidCreate:iiCC:i
-input 0:  i(5555)
-input 1:  i(3)
-input 2:  C(23,chunk_size\x00url\x00to_file\x00)
-input 3:  C(16,10\x00myurl.html\x001\x00)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_URLLoader;1.0")
-output 0:  i(1)
-replaying PPB_URLLoader_Create:i:i:
-input 0:  i(5555)
-output 0:  i(34)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_URLRequestInfo;1.0")
-output 0:  i(1)
-replaying PPB_URLRequestInfo_Create:i:i:
-input 0:  i(5555)
-output 0:  i(30)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Var;1.0")
-output 0:  i(1)
-replaying PPB_URLRequestInfo_SetProperty:iiC:i:
-input 0:  i(30)
-input 1:  i(0)
-input 2:  C(24,\x05\x00\x00\x00\n\x00\x00\x00myurl.html\x00\x00\x00\x00\x00\x00)
-output 0:  i(1)
-replaying PPB_URLRequestInfo_SetProperty:iiC:i:
-input 0:  i(30)
-input 1:  i(3)
-input 2:  C(8,\x02\x00\x00\x00\x01\x00\x00\x00)
-output 0:  i(1)
-replaying PPB_URLLoader_Open:iii:i:
-input 0:  i(34)
-input 1:  i(30)
-input 2:  i(1)
-output 0:  i(-1)
-replaying PPB_Core_ReleaseResource:i::
-input 0:  i(30)
-rpc call complete PPP_Instance_DidCreate:iiCC:i
-output 0:  i(1)
-
-
-"*** async Open Callback"
-rpc call intiated RunCompletionCallback:iiC:
-input 0:  i(1)
-input 1:  i(0)
-input 2:  C(0,)
-replaying PPB_URLLoader_GetResponseInfo:i:i:
-input 0:  i(34)
-output 0:  i(38)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_URLResponseInfo;1.0")
-output 0:  i(1)
-replaying PPB_URLResponseInfo_GetProperty:ii:C:
-input 0:  i(38)
-input 1:  i(3)
-output 0:  C(8,\x03\x00\x00\x00\xc8\x00\x00\x00)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Messaging;1.0")
-output 0:  i(1)
-replaying PPB_Messaging_PostMessage:iC::
-input 0:  i(5555)
-input 1:  C(48,\x05\x00\x00\x00!\x00\x00\x005555: Error: Finish unexpected rv\x00\x00\x00\x00\x00\x00\x00)
-replaying PPB_Core_ReleaseResource:i::
-input 0:  i(38)
-rpc call complete RunCompletionCallback:iiC:
-
-
-"*** DONE"
-rpc call intiated PPP_ShutdownModule::
-rpc call complete PPP_ShutdownModule::
-
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/graphics2d.cc b/ppapi/native_client/tests/ppapi_simple_tests/graphics2d.cc
deleted file mode 100644
index 600f0eb..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/graphics2d.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-// 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 <stdint.h>
-
-#include <cmath>
-#include <limits>
-#include <string>
-
-#include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/src/shared/platform/nacl_log.h"
-
-#include "ppapi/c/pp_rect.h"
-#include "ppapi/c/pp_bool.h"
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/cpp/rect.h"
-#include "ppapi/cpp/graphics_2d.h"
-#include "ppapi/cpp/image_data.h"
-#include "ppapi/cpp/completion_callback.h"
-#include "ppapi/cpp/instance.h"
-#include "ppapi/cpp/module.h"
-
-const uint32_t kDefaultColor = 0x2266aa;
-
-void FillRect(pp::ImageData* image, int left, int top, int width, int height,
-              uint32_t color) {
-  for (int y = std::max(0, top);
-       y < std::min(image->size().height() - 1, top + height);
-       y++) {
-    for (int x = std::max(0, left);
-         x < std::min(image->size().width() - 1, left + width);
-         x++)
-      *image->GetAddr32(pp::Point(x, y)) = color;
-  }
-}
-
-class MyInstance : public pp::Instance {
- private:
-  uint32_t color_;
-  pp::Size size_;
-  pp::Graphics2D device_context_;
-
-  void ParseArgs(uint32_t argc, const char* argn[], const char* argv[]) {
-    for (uint32_t i = 0; i < argc; ++i) {
-      const std::string tag = argn[i];
-      if (tag == "color") color_ = strtol(argv[i], 0, 0);
-    }
-  }
-
-  static void FlushCallback(void* thiz, int32_t result) {
-    // If necessary we can get at the instabce like so:
-    // MyInstance* instance = static_cast<MyInstance*>(thiz);
-  }
-
- public:
-  explicit MyInstance(PP_Instance instance)
-    : pp::Instance(instance), color_(kDefaultColor), size_(0, 0) {}
-
-  virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]) {
-    ParseArgs(argc, argn, argv);
-    return true;
-  }
-
-  virtual void DidChangeView(const pp::Rect& position, const pp::Rect& clip) {
-    if (position.size().width() == size_.width() &&
-        position.size().height() == size_.height()) {
-      // No change. We don't care about the position, only the size.
-      return;
-    }
-
-    device_context_ = pp::Graphics2D(this, position.size(), false);
-    CHECK(BindGraphics(device_context_));
-    size_ = position.size();
-
-    pp::ImageData image(this, PP_IMAGEDATAFORMAT_BGRA_PREMUL, size_, true);
-    CHECK(!image.is_null());
-    FillRect(&image, 0, 0, size_.width(), size_.height(), color_);
-
-    device_context_.ReplaceContents(&image);
-    pp::CompletionCallback cc(FlushCallback, this);
-
-    device_context_.Flush(cc);
-  }
-};
-
-
-class MyModule : public pp::Module {
- public:
-  // Override CreateInstance to create your customized Instance object.
-  virtual pp::Instance* CreateInstance(PP_Instance instance) {
-    return new MyInstance(instance);
-  }
-};
-
-namespace pp {
-
-// Factory function for your specialization of the Module object.
-Module* CreateModule() {
-  return new MyModule();
-}
-
-}  // namespace pp
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/graphics2d.stdin b/ppapi/native_client/tests/ppapi_simple_tests/graphics2d.stdin
deleted file mode 100644
index f46f225..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/graphics2d.stdin
+++ /dev/null
@@ -1,63 +0,0 @@
-# To be used with
-#    sel_universal_ppapi_replay_prolog.stdin
-# define a bunch of variables for readability
-
-set_variable MODULE i(4444)
-set_variable INSTANCE i(5555)
-# PP_Size
-set_variable IMG_FMT  R(8,4:400,4:400)
-set_variable IMG_HANDLE i(7)
-set_variable GRAPHICS_HANLDE i(8)
-# PP_ImageDataDesc
-set_variable IMG_FMT2 R(16,4:0,4:400,4:400,4:1600)
-# image size is width x height x 4-byte-pixel
-set_variable IMG_SIZE 640000
-# PP_Size
-set_variable GRAPHICS_FMT  R(8,4:400,4:400)
-
-echo
-echo "*** INIT MODULE"
-replay 1 PPB_GetInterface:s:i  s("PPB_Core;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_Instance;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_ImageData;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_Graphics2D;1.0") * i(1)
-# The results contain a process id which is non-determinisitic. The
-# 'hide-results' option suppresses this output to help with golden file.
-rpc PPP_InitializeModule hide-results i(0) ${MODULE} h(pepper_desc) s("${service_string}") * i(0) i(0)
-
-echo
-echo "*** INIT INSTANCE"
-set_variable TAGS C(6,color\000)
-set_variable VALUES C(5,0xaa\000)
-
-# The PPP_GetInterface() call is probably not necessary, we just emulate what
-# happens in real life
-rpc PPP_GetInterface s("PPP_Instance;1.0") * i(0)
-rpc PPP_Instance_DidCreate ${INSTANCE} i(1) ${TAGS} ${VALUES} * i(0)
-
-echo
-echo "*** SETTTING UP VIDEO MEMORY"
-
-# video size is image size rounded up to 64k
-shmem video_handle video_address 655360
-memset ${video_address} 0  ${IMG_SIZE} 0
-checksum ${video_address} 0 ${IMG_SIZE}
-
-echo
-echo "*** TRIGGER REPAINT"
-replay 1 PPB_Core_AddRefResource:i: ${GRAPHICS_HANLDE} *
-replay 1 PPB_ImageData_Create:iiCi:i ${INSTANCE} i(0) ${IMG_FMT} i(1) * ${IMG_HANDLE}
-replay 1 PPB_ImageData_Describe:i:Chii ${IMG_HANDLE} * ${IMG_FMT2} h(video_handle) i(${IMG_SIZE}) i(1)
-replay 1 PPB_Graphics2D_Create:iCi:i ${INSTANCE} ${GRAPHICS_FMT} i(0) * ${GRAPHICS_HANLDE}
-replay 1 PPB_Instance_BindGraphics:ii:i ${INSTANCE} ${GRAPHICS_HANLDE} * i(1)
-replay 1 PPB_Graphics2D_ReplaceContents:ii:  ${GRAPHICS_HANLDE}  ${IMG_HANDLE} *
-replay 1 PPB_Graphics2D_Flush:ii:i ${GRAPHICS_HANLDE} i(1) * i(-1)
-replay 1 ReleaseResourceMultipleTimes:ii:  ${IMG_HANDLE} i(1) *
-replay 1 PPB_Core_ReleaseResource:i:  ${GRAPHICS_HANLDE} *
-rpc PPP_Instance_DidChangeView ${INSTANCE} I(4,8,79,400,400) I(4,0,0,400,400) *
-
-echo
-echo "*** CHECKING MEMORY"
-checksum ${video_address} 0 ${IMG_SIZE}
-
-rpc PPP_ShutdownModule *
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/graphics2d.stdout b/ppapi/native_client/tests/ppapi_simple_tests/graphics2d.stdout
deleted file mode 100644
index 9c093e7..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/graphics2d.stdout
+++ /dev/null
@@ -1,90 +0,0 @@
-
-"*** REPLAY PROLOG"
-
-"*** REGISTER REPLAY METHODS"
-
-"*** CREATE UPCALL SERVICE"
-
-"*** INIT MODULE"
-rpc call intiated PPP_InitializeModule:iihs:ii
-input 0:  i(0)
-input 1:  i(4444)
-input 2:  h(pepper_desc)
-input 3:  @LENGTHY_SERVICE_STRING
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Core;1.0")
-output 0:  i(1)
-rpc call complete PPP_InitializeModule:iihs:ii
-
-
-"*** INIT INSTANCE"
-rpc call intiated PPP_GetInterface:s:i
-input 0:  s("PPP_Instance;1.0")
-rpc call complete PPP_GetInterface:s:i
-output 0:  i(1)
-
-rpc call intiated PPP_Instance_DidCreate:iiCC:i
-input 0:  i(5555)
-input 1:  i(1)
-input 2:  C(6,color\x00)
-input 3:  C(5,0xaa\x00)
-rpc call complete PPP_Instance_DidCreate:iiCC:i
-output 0:  i(1)
-
-
-"*** SETTTING UP VIDEO MEMORY"
-CHECKSUM: 0x00000000
-
-"*** TRIGGER REPAINT"
-rpc call intiated PPP_Instance_DidChangeView:iII:
-input 0:  i(5555)
-input 1:  I(4,8,79,400,400)
-input 2:  I(4,0,0,400,400)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Graphics2D;1.0")
-output 0:  i(1)
-replaying PPB_Graphics2D_Create:iCi:i:
-input 0:  i(5555)
-input 1:  C(8,\x90\x01\x00\x00\x90\x01\x00\x00)
-input 2:  i(0)
-output 0:  i(8)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Instance;1.0")
-output 0:  i(1)
-replaying PPB_Instance_BindGraphics:ii:i:
-input 0:  i(5555)
-input 1:  i(8)
-output 0:  i(1)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_ImageData;1.0")
-output 0:  i(1)
-replaying PPB_ImageData_Create:iiCi:i:
-input 0:  i(5555)
-input 1:  i(0)
-input 2:  C(8,\x90\x01\x00\x00\x90\x01\x00\x00)
-input 3:  i(1)
-output 0:  i(7)
-replaying PPB_ImageData_Describe:i:Chii:
-input 0:  i(7)
-output 0:  C(16,\x00\x00\x00\x00\x90\x01\x00\x00\x90\x01\x00\x00@\x06\x00\x00)
-output 1:  h(video_handle)
-output 2:  i(640000)
-output 3:  i(1)
-replaying PPB_Graphics2D_ReplaceContents:ii::
-input 0:  i(8)
-input 1:  i(7)
-replaying ReleaseResourceMultipleTimes:ii::
-input 0:  i(7)
-input 1:  i(1)
-replaying PPB_Graphics2D_Flush:ii:i:
-input 0:  i(8)
-input 1:  i(1)
-output 0:  i(-1)
-rpc call complete PPP_Instance_DidChangeView:iII:
-
-
-"*** CHECKING MEMORY"
-CHECKSUM: 0xe1913cee
-rpc call intiated PPP_ShutdownModule::
-rpc call complete PPP_ShutdownModule::
-
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/ppapi_emu_file.stdin b/ppapi/native_client/tests/ppapi_simple_tests/ppapi_emu_file.stdin
deleted file mode 100644
index 9b234881..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/ppapi_emu_file.stdin
+++ /dev/null
@@ -1,52 +0,0 @@
-# define a bunch of variables for readability
-
-set_variable MODULE i(4444)
-set_variable INSTANCE i(5555)
-# NOTE: width and height must match the image_data and
-# graphic_2d object requests that the nexe makes
-set_variable WIDTH  1000
-set_variable HEIGHT 700
-
-echo
-echo "*** INITIALIZE PEPPER EMULATION"
-# this registers the currently supported PPB_xxx rpcs
-pepper_emu_initialize ${INSTANCE} ${WIDTH} ${HEIGHT} demo
-echo
-
-echo
-echo "*** CREATE UPCALL SERVICE"
-# advertise the registered rpcs to the nexe
-install_upcalls service_string pepper_desc
-# the variable service string is very long and might change so we suppress it
-nondeterministic s("${service_string}") @LENGTHY_SERVICE_STRING
-
-echo
-echo "*** INIT MODULE"
-rpc PPP_InitializeModule hide-results i(0) ${MODULE} h(pepper_desc) s("${service_string}") * i(0) i(0)
-
-echo
-echo "*** CHECK INSTANCE CREATION"
-# many nexes uses this to trigger instance initialization
-set_variable TAGS C(30,url\000to_file\000chunk_size\000pdebug\000)
-set_variable VALUES C(18,test.txt\0000\0001024\0001\000)
-set_variable NUM_TAGS i(4)
-rpc PPP_Instance_DidCreate ${INSTANCE} ${NUM_TAGS} ${TAGS} ${VALUES} * i(0)
-
-echo
-echo "*** TRIGGER REPAINT"
-rpc PPP_Instance_DidChangeView ${INSTANCE} I(4,8,79,${WIDTH},${HEIGHT}) I(4,0,0,${WIDTH},${HEIGHT}) *
-
-# make sure we terminate when seeing the string "5555: COMPLETE" send via
-# PostMessage by the nexe when it has fully read the file
-echo
-echo "REGISTER TERMINATION MESSAGE"
-pepper_emu_set_quit_message "5555: COMPLETE"
-
-echo
-echo "*** ENTER EVENT LOOP"
-# wait for events and handle them until we see the "quit_message"
-pepper_emu_event_loop 0 100000
-
-######################################################################
-## EPILOG
-######################################################################
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/ppapi_emu_file.stdout b/ppapi/native_client/tests/ppapi_simple_tests/ppapi_emu_file.stdout
deleted file mode 100644
index 02f84a35..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/ppapi_emu_file.stdout
+++ /dev/null
@@ -1,41 +0,0 @@
-
-"*** INITIALIZE PEPPER EMULATION"
-
-
-"*** CREATE UPCALL SERVICE"
-
-"*** INIT MODULE"
-rpc call intiated PPP_InitializeModule:iihs:ii
-input 0:  i(0)
-input 1:  i(4444)
-input 2:  h(pepper_desc)
-input 3:  @LENGTHY_SERVICE_STRING
-rpc call complete PPP_InitializeModule:iihs:ii
-
-
-"*** CHECK INSTANCE CREATION"
-rpc call intiated PPP_Instance_DidCreate:iiCC:i
-input 0:  i(5555)
-input 1:  i(4)
-input 2:  C(30,url\x00to_file\x00chunk_size\x00pdebug\x00)
-input 3:  C(18,test.txt\x000\x001024\x001\x00)
-rpc call complete PPP_Instance_DidCreate:iiCC:i
-output 0:  i(1)
-
-
-"*** TRIGGER REPAINT"
-rpc call intiated PPP_Instance_DidChangeView:iII:
-input 0:  i(5555)
-input 1:  I(4,8,79,1000,700)
-input 2:  I(4,0,0,1000,700)
-rpc call complete PPP_Instance_DidChangeView:iII:
-
-
-"REGISTER TERMINATION MESSAGE"
-
-"*** ENTER EVENT LOOP"
-POST_MESSAGE: [5555: DEBUG: LoadCompleteCallback: 0]
-POST_MESSAGE: [5555: DEBUG: ReadCompleteCallback Bytes Read: 1024]
-POST_MESSAGE: [5555: DEBUG: ReadCompleteCallback Bytes Read: 980]
-POST_MESSAGE: [5555: DEBUG: ReadCompleteCallback Bytes Read: 0]
-POST_MESSAGE: [5555: COMPLETE]
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/ppapi_geturl_invalid.stdin b/ppapi/native_client/tests/ppapi_simple_tests/ppapi_geturl_invalid.stdin
deleted file mode 100644
index 4ec8cfe..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/ppapi_geturl_invalid.stdin
+++ /dev/null
@@ -1,87 +0,0 @@
-# define a bunch of variables for readability
-
-set_variable MODULE i(4444)
-set_variable INSTANCE i(5555)
-
-# Tags used by pepper/srpc to marshall js parameters
-set_variable JS_STR 4:5
-set_variable JS_INT 4:2
-
-# NOTE: the strings below must not contain unescaped spaces or commas
-set_variable ARG_loadUrl ${JS_STR},4:7,"loadUrl",1:0
-set_variable ARG_ReportResult ${JS_STR},4:12,"ReportResult",4:0
-
-set_variable ARG_URL ${JS_STR},4:32,"http://www.google.com/robots.txt"
-
-set_variable ARG_ERR1 ${JS_STR},4:38,"PPB_URLLoader::Open:\x20PP_ERROR_NOACCESS",2:0
-set_variable ARG_ERR2 ${JS_STR},4:34,"PPB_URLRequestInfo::Create:\x20failed",6:0
-set_variable ARG_GET  ${JS_STR},4:3,"GET",5:0
-
-set_variable ARG_SUCC ${JS_STR},4:12,"hello\x20world!",4:0
-set_variable ARG_0 ${JS_INT},4:0
-set_variable ARG_1 ${JS_INT},4:1
-
-set_variable WINDOW R(24,8:6,8:0x9f,8:0x5f29)
-# TODO(robertm) figure out what this represents, maybe PP_Var
-set_variable EXCEPTION R(8,8:0)
-set_variable NULL R(8,8:0)
-
-echo
-echo "*** INIT MODULE"
-replay 99 PPB_GetInterface:s:i  s("PPB_Core;1.0") * i(1)
-replay 99 PPB_GetInterface:s:i  s("PPB_Instance;1.0") * i(1)
-replay 99 PPB_GetInterface:s:i  s("PPB_Var;1.0") * i(1)
-# the results contain a process id which is non-determinisitic
-rpc PPP_InitializeModule hide-results i(0) ${MODULE} h(pepper_desc) s("${service_string}") * i(0) i(0)
-
-echo
-echo "*** TRIGGER REPAINT"
-rpc PPP_Instance_DidChangeView ${INSTANCE} I(4,8,79,400,400) I(4,0,0,400,400) *
-# leave time for flush of stdout
-
-######################################################################
-## URL
-######################################################################
-echo
-echo "*** CALL loadUrl(): url2 as buffer - expected to fail"
-replay 1 PPB_GetInterface:s:i  s("PPB_URLRequestInfo;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_URLResponseInfo;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_URLLoader;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_FileIO;1.0") * i(1)
-
-replay 1 PPB_FileIO_Create:i:i ${INSTANCE} * i(35)
-replay 1 PPB_URLRequestInfo_Create:i:i ${INSTANCE} * i(40)
-replay 1 PPB_URLLoader_Create:i:i  ${INSTANCE} * i(44)
-
-replay 1 PPB_FileIO_IsFileIO:i:i i(35) * i(1)
-replay 1 PPB_URLRequestInfo_IsURLRequestInfo:i:i i(35) * i(0)
-replay 1 PPB_URLResponseInfo_IsURLResponseInfo:i:i i(35) * i(0)
-replay 1 PPB_URLLoader_IsURLLoader:i:i i(35) * i(0)
-
-replay 1 PPB_FileIO_IsFileIO:i:i i(40) * i(0)
-replay 1 PPB_URLRequestInfo_IsURLRequestInfo:i:i i(40) * i(1)
-replay 1 PPB_URLResponseInfo_IsURLResponseInfo:i:i i(40) * i(0)
-replay 1 PPB_URLLoader_IsURLLoader:i:i i(40) * i(0)
-
-replay 1 PPB_FileIO_IsFileIO:i:i i(44) * i(0)
-replay 1 PPB_URLRequestInfo_IsURLRequestInfo:i:i i(44) * i(0)
-replay 1 PPB_URLResponseInfo_IsURLResponseInfo:i:i i(44) * i(0)
-replay 1 PPB_URLLoader_IsURLLoader:i:i i(44) * i(1)
-
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(40) i(0) R(40,${ARG_URL}) * i(1)
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(40) i(1) R(16,${ARG_GET}) * i(1)
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(40) i(3) R(8,${ARG_0}) * i(1)
-
-replay 1 PPB_URLLoader_Open:iii:i i(44) i(40) i(1) * i(-7)
-
-replay 1 PPB_Core_ReleaseResource:i: i(35) *
-replay 1 PPB_Core_ReleaseResource:i: i(40) *
-replay 1 PPB_Core_ReleaseResource:i: i(44) *
-rpc Call ${OBJECT} R(16,${ARG_loadUrl}) i(2) R(48,${ARG_URL},${ARG_0}) ${NULL} * C(8) C(8)
-
-######################################################################
-## EPILOG
-######################################################################
-echo
-echo "*** DONE"
-rpc PPP_ShutdownModule *
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/ppapi_geturl_invalid.stdout b/ppapi/native_client/tests/ppapi_simple_tests/ppapi_geturl_invalid.stdout
deleted file mode 100644
index 3dc8641..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/ppapi_geturl_invalid.stdout
+++ /dev/null
@@ -1,135 +0,0 @@
-
-"*** REPLAY PROLOG"
-
-"*** REGISTER REPLAY METHODS"
-
-"*** INITIALIZE PEPPER"
-
-"*** CREATE UPCALL SERVICE"
-
-"*** INIT MODULE"
-rpc call intiated PPP_InitializeModule:iihs:ii
-input 0:  i(0)
-input 1:  i(4444)
-input 2:  h(pepper_desc)
-input 3:  @LENGTHY_SERIVE_STRING
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Core;1.0")
-output 0:  i(1)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Instance;1.0")
-output 0:  i(1)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Var;1.0")
-output 0:  i(1)
-rpc call complete PPP_InitializeModule:iihs:ii
-
-
-"*** TRIGGER REPAINT"
-rpc call intiated PPP_Instance_DidChangeView:iII:
-input 0:  i(5555)
-input 1:  I(4,8,79,400,400)
-input 2:  I(4,0,0,400,400)
-rpc call complete PPP_Instance_DidChangeView:iII:
-
-
-
-"*** CALL loadUrl(): url2 as buffer - expected to fail"
-rpc call intiated Call:CCiCC:CC
-input 0:  @THE_OBJECT
-input 1:  C(16,\x05\x00\x00\x00\x07\x00\x00\x00loadUrl\x00)
-input 2:  i(2)
-input 3:  C(48,\x05\x00\x00\x00 \x00\x00\x00http://www.google.com/robots.txt\x02\x00\x00\x00\x00\x00\x00\x00)
-input 4:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_URLRequestInfo;1.0")
-output 0:  i(1)
-replaying PPB_URLRequestInfo_Create:i:i:
-input 0:  i(5555)
-output 0:  i(40)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_URLResponseInfo;1.0")
-output 0:  i(1)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_URLLoader;1.0")
-output 0:  i(1)
-replaying PPB_URLLoader_Create:i:i:
-input 0:  i(5555)
-output 0:  i(44)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_FileIO;1.0")
-output 0:  i(1)
-replaying PPB_FileIO_Create:i:i:
-input 0:  i(5555)
-output 0:  i(35)
-replaying PPB_FileIO_IsFileIO:i:i:
-input 0:  i(40)
-output 0:  i(0)
-replaying PPB_URLRequestInfo_IsURLRequestInfo:i:i:
-input 0:  i(40)
-output 0:  i(1)
-replaying PPB_URLResponseInfo_IsURLResponseInfo:i:i:
-input 0:  i(40)
-output 0:  i(0)
-replaying PPB_URLLoader_IsURLLoader:i:i:
-input 0:  i(40)
-output 0:  i(0)
-replaying PPB_FileIO_IsFileIO:i:i:
-input 0:  i(44)
-output 0:  i(0)
-replaying PPB_URLRequestInfo_IsURLRequestInfo:i:i:
-input 0:  i(44)
-output 0:  i(0)
-replaying PPB_URLResponseInfo_IsURLResponseInfo:i:i:
-input 0:  i(44)
-output 0:  i(0)
-replaying PPB_URLLoader_IsURLLoader:i:i:
-input 0:  i(44)
-output 0:  i(1)
-replaying PPB_FileIO_IsFileIO:i:i:
-input 0:  i(35)
-output 0:  i(1)
-replaying PPB_URLRequestInfo_IsURLRequestInfo:i:i:
-input 0:  i(35)
-output 0:  i(0)
-replaying PPB_URLResponseInfo_IsURLResponseInfo:i:i:
-input 0:  i(35)
-output 0:  i(0)
-replaying PPB_URLLoader_IsURLLoader:i:i:
-input 0:  i(35)
-output 0:  i(0)
-replaying PPB_URLRequestInfo_SetProperty:iiC:i:
-input 0:  i(40)
-input 1:  i(0)
-input 2:  C(40,\x05\x00\x00\x00 \x00\x00\x00http://www.google.com/robots.txt)
-output 0:  i(1)
-replaying PPB_URLRequestInfo_SetProperty:iiC:i:
-input 0:  i(40)
-input 1:  i(1)
-input 2:  C(16,\x05\x00\x00\x00\x03\x00\x00\x00GET\x00\x00\x00\x00\x00)
-output 0:  i(1)
-replaying PPB_URLRequestInfo_SetProperty:iiC:i:
-input 0:  i(40)
-input 1:  i(3)
-input 2:  C(8,\x02\x00\x00\x00\x00\x00\x00\x00)
-output 0:  i(1)
-replaying PPB_URLLoader_Open:iii:i:
-input 0:  i(44)
-input 1:  i(40)
-input 2:  i(1)
-output 0:  i(-7)
-replaying PPB_Core_ReleaseResource:i::
-input 0:  i(40)
-replaying PPB_Core_ReleaseResource:i::
-input 0:  i(44)
-replaying PPB_Core_ReleaseResource:i::
-input 0:  i(35)
-rpc call complete Call:CCiCC:CC
-output 0:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-output 1:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-
-
-"*** DONE"
-rpc call intiated PPP_ShutdownModule::
-rpc call complete PPP_ShutdownModule::
-
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/ppapi_geturl_valid.stdin b/ppapi/native_client/tests/ppapi_simple_tests/ppapi_geturl_valid.stdin
deleted file mode 100644
index d4696b2..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/ppapi_geturl_valid.stdin
+++ /dev/null
@@ -1,151 +0,0 @@
-# define a bunch of variables for readability
-
-set_variable MODULE i(4444)
-set_variable INSTANCE i(5555)
-
-# Tags used by pepper/srpc to marshall js parameters
-set_variable JS_STR 4:5
-set_variable JS_INT 4:2
-
-# NOTE: the strings below must not contain unescaped spaces or commas
-set_variable ARG_loadUrl ${JS_STR},4:7,"loadUrl",1:0
-set_variable ARG_ReportResult ${JS_STR},4:12,"ReportResult",4:0
-
-set_variable ARG_URL ${JS_STR},4:25,"ppapi_geturl_success.html",7:0
-set_variable ARG_URL_FULL ${JS_STR},4:47,"http://localhost:5103/ppapi_geturl_success.html",1:0
-
-set_variable ARG_GET  ${JS_STR},4:3,"GET",5:0
-
-set_variable ARG_SUCC ${JS_STR},4:12,"hello\x20world!",4:0
-set_variable ARG_0 ${JS_INT},4:0
-set_variable ARG_1 ${JS_INT},4:1
-
-set_variable WINDOW R(24,8:6,8:0x9f,8:0x5f29)
-# TODO(robertm) figure out what this represents, maybe PP_Var
-set_variable EXCEPTION R(8,8:0)
-set_variable NULL R(8,8:0)
-
-echo
-echo "*** INIT MODULE"
-replay 99 PPB_GetInterface:s:i  s("PPB_Core;1.0") * i(1)
-replay 99 PPB_GetInterface:s:i  s("PPB_Instance;1.0") * i(1)
-replay 99 PPB_GetInterface:s:i  s("PPB_Var;1.0") * i(1)
-# the results contain a process id which is non-determinisitic
-rpc PPP_InitializeModule hide-results i(0) ${MODULE} h(pepper_desc) s("${service_string}") * i(0) i(0)
-
-echo
-echo "*** TRIGGER REPAINT"
-rpc PPP_Instance_DidChangeView ${INSTANCE} I(4,8,79,400,400) I(4,0,0,400,400) *
-# leave time for flush of stdout
-
-echo
-echo "*** GET INSTANCE OBJECT"
-rpc PPP_Instance_GetInstanceObject hide-results ${INSTANCE} * C(16)
-# save result to variable and also register it as non-deterministic
-set_variable OBJECT ${result0}
-nondeterministic ${result0} @THE_OBJECT
-
-######################################################################
-## URL (buffer)
-######################################################################
-
-echo
-echo "*** CALL loadUrl(): as buffer"
-replay 1 PPB_GetInterface:s:i  s("PPB_URLRequestInfo;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_URLResponseInfo;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_URLLoader;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_FileIO;1.0") * i(1)
-
-replay 1 PPB_FileIO_Create:i:i ${INSTANCE} * i(35)
-replay 1 PPB_URLRequestInfo_Create:i:i ${INSTANCE} * i(30)
-replay 1 PPB_URLLoader_Create:i:i  ${INSTANCE} * i(34)
-
-replay 1 PPB_FileIO_IsFileIO:i:i i(35) * i(1)
-replay 1 PPB_URLRequestInfo_IsURLRequestInfo:i:i i(35) * i(0)
-replay 1 PPB_URLResponseInfo_IsURLResponseInfo:i:i i(35) * i(0)
-replay 1 PPB_URLLoader_IsURLLoader:i:i i(35) * i(0)
-
-replay 1 PPB_URLRequestInfo_IsURLRequestInfo:i:i i(30) * i(1)
-replay 1 PPB_URLResponseInfo_IsURLResponseInfo:i:i i(30) * i(0)
-replay 1 PPB_URLLoader_IsURLLoader:i:i i(30) * i(0)
-replay 1 PPB_FileIO_IsFileIO:i:i i(30) * i(0)
-
-replay 1 PPB_URLRequestInfo_IsURLRequestInfo:i:i i(34) * i(0)
-replay 1 PPB_URLResponseInfo_IsURLResponseInfo:i:i i(34) * i(0)
-replay 1 PPB_URLLoader_IsURLLoader:i:i i(34) * i(1)
-replay 1 PPB_FileIO_IsFileIO:i:i i(34) * i(0)
-
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(30) i(0) R(40,${ARG_URL}) * i(1)
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(30) i(1) R(16,${ARG_GET}) * i(1)
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(30) i(3) R(8,${ARG_0}) * i(1)
-
-replay 1 PPB_URLLoader_Open:iii:i i(34) i(30) i(1) * i(-1)
-rpc Call ${OBJECT} R(16,${ARG_loadUrl}) i(2) R(48,${ARG_URL},${ARG_0}) ${NULL} * C(8) C(8)
-
-echo
-echo "*** async response part1"
-replay 1 PPB_URLLoader_GetResponseInfo:i:i i(34) * i(38)
-replay 1 PPB_FileIO_IsFileIO:i:i i(38) * i(0)
-replay 1 PPB_URLRequestInfo_IsURLRequestInfo:i:i i(38) * i(0)
-replay 1 PPB_URLResponseInfo_IsURLResponseInfo:i:i i(38) * i(1)
-replay 1 PPB_URLLoader_IsURLLoader:i:i i(38) * i(0)
-replay 1 PPB_URLResponseInfo_GetProperty:ii:C i(38) i(0) * R(56,${ARG_URL_FULL})
-replay 1 PPB_URLResponseInfo_GetProperty:ii:C i(38) i(3) * R(8,4:3,4:200)
-replay 1 PPB_URLLoader_ReadResponseBody:iii:Ci i(34) i(1024) i(2) * C(0,) i(-1)
-rpc RunCompletionCallback i(1) i(0) C(0,) *
-
-echo
-echo "*** async response part2"
-replay 1 PPB_URLLoader_ReadResponseBody:iii:Ci i(34) i(1024) i(3) * C(0,) i(-1)
-rpc RunCompletionCallback i(2) i(12) C(12,hello\x20world!) *
-
-######################################################################
-## URL (file)
-######################################################################
-
-echo
-echo "*** CALL loadUrl(): as file"
-replay 1 PPB_GetInterface:s:i  s("PPB_FileIO;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_URLRequestInfo;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_URLResponseInfo;1.0") * i(1)
-replay 1 PPB_GetInterface:s:i  s("PPB_URLLoader;1.0") * i(1)
-
-replay 1 PPB_URLLoader_Create:i:i  ${INSTANCE} * i(34)
-replay 1 PPB_URLRequestInfo_Create:i:i ${INSTANCE} * i(30)
-replay 1 PPB_FileIO_Create:i:i ${INSTANCE} * i(66)
-
-replay 1 PPB_FileIO_IsFileIO:i:i i(66) * i(1)
-replay 1 PPB_URLLoader_IsURLLoader:i:i i(66) * i(0)
-replay 1 PPB_URLResponseInfo_IsURLResponseInfo:i:i i(66) * i(0)
-replay 1 PPB_URLRequestInfo_IsURLRequestInfo:i:i i(66) * i(0)
-
-replay 1 PPB_FileIO_IsFileIO:i:i i(30) * i(0)
-replay 1 PPB_URLResponseInfo_IsURLResponseInfo:i:i i(30) * i(0)
-replay 1 PPB_URLRequestInfo_IsURLRequestInfo:i:i i(30) * i(1)
-replay 1 PPB_URLLoader_IsURLLoader:i:i i(30) * i(0)
-
-replay 1 PPB_FileIO_IsFileIO:i:i i(34) * i(0)
-replay 1 PPB_URLRequestInfo_IsURLRequestInfo:i:i i(34) * i(0)
-replay 1 PPB_URLResponseInfo_IsURLResponseInfo:i:i i(34) * i(0)
-replay 1 PPB_URLLoader_IsURLLoader:i:i i(34) * i(1)
-
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(30) i(0) R(40,${ARG_URL}) * i(1)
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(30) i(1) R(16,${ARG_GET}) * i(1)
-replay 1 PPB_URLRequestInfo_SetProperty:iiC:i i(30) i(3) R(8,${ARG_1}) * i(1)
-
-replay 1 PPB_URLLoader_Open:iii:i i(34) i(30) i(4) * i(-1)
-
-replay 1 PPB_Core_ReleaseResource:i: i(30) *
-replay 1 PPB_Core_ReleaseResource:i: i(34) *
-replay 1 PPB_Core_ReleaseResource:i: i(66) *
-
-replay 1 Call:CCiCC:CC R(16,8:0x9f,8:0x5f29) R(24,${ARG_ReportResult}) i(4) R(80,${ARG_URL},${ARG_1},${ARG_SUCC},${ARG_1}) ${NULL} * ${NULL} ${NULL}
-
-rpc Call ${OBJECT} R(16,${ARG_loadUrl}) i(2) R(48,${ARG_URL},${ARG_1}) ${NULL} * C(8) C(8)
-
-######################################################################
-## EPILOG
-######################################################################
-echo
-echo "*** DONE"
-rpc PPP_ShutdownModule *
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/ppapi_geturl_valid.stdout b/ppapi/native_client/tests/ppapi_simple_tests/ppapi_geturl_valid.stdout
deleted file mode 100644
index 16ce922..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/ppapi_geturl_valid.stdout
+++ /dev/null
@@ -1,272 +0,0 @@
-
-"*** REPLAY PROLOG"
-
-"*** REGISTER REPLAY METHODS"
-
-"*** INITIALIZE PEPPER"
-
-"*** CREATE UPCALL SERVICE"
-
-"*** INIT MODULE"
-rpc call intiated PPP_InitializeModule:iihs:ii
-input 0:  i(0)
-input 1:  i(4444)
-input 2:  h(pepper_desc)
-input 3:  @LENGTHY_SERIVE_STRING
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Core;1.0")
-output 0:  i(1)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Instance;1.0")
-output 0:  i(1)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_Var;1.0")
-output 0:  i(1)
-rpc call complete PPP_InitializeModule:iihs:ii
-
-
-"*** TRIGGER REPAINT"
-rpc call intiated PPP_Instance_DidChangeView:iII:
-input 0:  i(5555)
-input 1:  I(4,8,79,400,400)
-input 2:  I(4,0,0,400,400)
-rpc call complete PPP_Instance_DidChangeView:iII:
-
-
-"*** CALL loadUrl(): as buffer"
-rpc call intiated Call:CCiCC:CC
-input 0:  @THE_OBJECT
-input 1:  C(16,\x05\x00\x00\x00\x07\x00\x00\x00loadUrl\x00)
-input 2:  i(2)
-input 3:  C(48,\x05\x00\x00\x00\x19\x00\x00\x00ppapi_geturl_success.html\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00)
-input 4:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_URLRequestInfo;1.0")
-output 0:  i(1)
-replaying PPB_URLRequestInfo_Create:i:i:
-input 0:  i(5555)
-output 0:  i(30)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_URLResponseInfo;1.0")
-output 0:  i(1)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_URLLoader;1.0")
-output 0:  i(1)
-replaying PPB_URLLoader_Create:i:i:
-input 0:  i(5555)
-output 0:  i(34)
-replaying PPB_GetInterface:s:i:
-input 0:  s("PPB_FileIO;1.0")
-output 0:  i(1)
-replaying PPB_FileIO_Create:i:i:
-input 0:  i(5555)
-output 0:  i(35)
-replaying PPB_FileIO_IsFileIO:i:i:
-input 0:  i(30)
-output 0:  i(0)
-replaying PPB_URLRequestInfo_IsURLRequestInfo:i:i:
-input 0:  i(30)
-output 0:  i(1)
-replaying PPB_URLResponseInfo_IsURLResponseInfo:i:i:
-input 0:  i(30)
-output 0:  i(0)
-replaying PPB_URLLoader_IsURLLoader:i:i:
-input 0:  i(30)
-output 0:  i(0)
-replaying PPB_FileIO_IsFileIO:i:i:
-input 0:  i(34)
-output 0:  i(0)
-replaying PPB_URLRequestInfo_IsURLRequestInfo:i:i:
-input 0:  i(34)
-output 0:  i(0)
-replaying PPB_URLResponseInfo_IsURLResponseInfo:i:i:
-input 0:  i(34)
-output 0:  i(0)
-replaying PPB_URLLoader_IsURLLoader:i:i:
-input 0:  i(34)
-output 0:  i(1)
-replaying PPB_FileIO_IsFileIO:i:i:
-input 0:  i(35)
-output 0:  i(1)
-replaying PPB_URLRequestInfo_IsURLRequestInfo:i:i:
-input 0:  i(35)
-output 0:  i(0)
-replaying PPB_URLResponseInfo_IsURLResponseInfo:i:i:
-input 0:  i(35)
-output 0:  i(0)
-replaying PPB_URLLoader_IsURLLoader:i:i:
-input 0:  i(35)
-output 0:  i(0)
-replaying PPB_URLRequestInfo_SetProperty:iiC:i:
-input 0:  i(30)
-input 1:  i(0)
-input 2:  C(40,\x05\x00\x00\x00\x19\x00\x00\x00ppapi_geturl_success.html\x00\x00\x00\x00\x00\x00\x00)
-output 0:  i(1)
-replaying PPB_URLRequestInfo_SetProperty:iiC:i:
-input 0:  i(30)
-input 1:  i(1)
-input 2:  C(16,\x05\x00\x00\x00\x03\x00\x00\x00GET\x00\x00\x00\x00\x00)
-output 0:  i(1)
-replaying PPB_URLRequestInfo_SetProperty:iiC:i:
-input 0:  i(30)
-input 1:  i(3)
-input 2:  C(8,\x02\x00\x00\x00\x00\x00\x00\x00)
-output 0:  i(1)
-replaying PPB_URLLoader_Open:iii:i:
-input 0:  i(34)
-input 1:  i(30)
-input 2:  i(1)
-output 0:  i(-1)
-rpc call complete Call:CCiCC:CC
-output 0:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-output 1:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-
-
-"*** async response part1"
-rpc call intiated RunCompletionCallback:iiC:
-input 0:  i(1)
-input 1:  i(0)
-input 2:  C(0,)
-replaying PPB_URLLoader_GetResponseInfo:i:i:
-input 0:  i(34)
-output 0:  i(38)
-replaying PPB_FileIO_IsFileIO:i:i:
-input 0:  i(38)
-output 0:  i(0)
-replaying PPB_URLRequestInfo_IsURLRequestInfo:i:i:
-input 0:  i(38)
-output 0:  i(0)
-replaying PPB_URLResponseInfo_IsURLResponseInfo:i:i:
-input 0:  i(38)
-output 0:  i(1)
-replaying PPB_URLLoader_IsURLLoader:i:i:
-input 0:  i(38)
-output 0:  i(0)
-replaying PPB_URLResponseInfo_GetProperty:ii:C:
-input 0:  i(38)
-input 1:  i(0)
-output 0:  C(56,\x05\x00\x00\x00/\x00\x00\x00http://localhost:5103/ppapi_geturl_success.html\x00)
-replaying PPB_URLResponseInfo_GetProperty:ii:C:
-input 0:  i(38)
-input 1:  i(3)
-output 0:  C(8,\x03\x00\x00\x00\xc8\x00\x00\x00)
-replaying PPB_URLLoader_ReadResponseBody:iii:Ci:
-input 0:  i(34)
-input 1:  i(1024)
-input 2:  i(2)
-output 0:  C(0,)
-output 1:  i(-1)
-rpc call complete RunCompletionCallback:iiC:
-
-
-"*** async response part2"
-rpc call intiated RunCompletionCallback:iiC:
-input 0:  i(2)
-input 1:  i(12)
-input 2:  C(12,hello world!)
-replaying PPB_URLLoader_ReadResponseBody:iii:Ci:
-input 0:  i(34)
-input 1:  i(1024)
-input 2:  i(3)
-output 0:  C(0,)
-output 1:  i(-1)
-rpc call complete RunCompletionCallback:iiC:
-
-
-"*** async response eof - report success"
-rpc call intiated RunCompletionCallback:iiC:
-input 0:  i(3)
-input 1:  i(0)
-input 2:  C(0,)
-replaying PPB_Core_ReleaseResource:i::
-input 0:  i(30)
-replaying PPB_Core_ReleaseResource:i::
-input 0:  i(34)
-replaying PPB_Core_ReleaseResource:i::
-input 0:  i(38)
-replaying PPB_Core_ReleaseResource:i::
-input 0:  i(35)
-rpc call complete RunCompletionCallback:iiC:
-
-
-"*** CALL loadUrl(): as file"
-rpc call intiated Call:CCiCC:CC
-input 0:  @THE_OBJECT
-input 1:  C(16,\x05\x00\x00\x00\x07\x00\x00\x00loadUrl\x00)
-input 2:  i(2)
-input 3:  C(48,\x05\x00\x00\x00\x19\x00\x00\x00ppapi_geturl_success.html\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00)
-input 4:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-replaying PPB_URLRequestInfo_Create:i:i:
-input 0:  i(5555)
-output 0:  i(30)
-replaying PPB_URLLoader_Create:i:i:
-input 0:  i(5555)
-output 0:  i(34)
-replaying PPB_FileIO_Create:i:i:
-input 0:  i(5555)
-output 0:  i(66)
-replaying PPB_FileIO_IsFileIO:i:i:
-input 0:  i(30)
-output 0:  i(0)
-replaying PPB_URLRequestInfo_IsURLRequestInfo:i:i:
-input 0:  i(30)
-output 0:  i(1)
-replaying PPB_URLResponseInfo_IsURLResponseInfo:i:i:
-input 0:  i(30)
-output 0:  i(0)
-replaying PPB_URLLoader_IsURLLoader:i:i:
-input 0:  i(30)
-output 0:  i(0)
-replaying PPB_FileIO_IsFileIO:i:i:
-input 0:  i(34)
-output 0:  i(0)
-replaying PPB_URLRequestInfo_IsURLRequestInfo:i:i:
-input 0:  i(34)
-output 0:  i(0)
-replaying PPB_URLResponseInfo_IsURLResponseInfo:i:i:
-input 0:  i(34)
-output 0:  i(0)
-replaying PPB_URLLoader_IsURLLoader:i:i:
-input 0:  i(34)
-output 0:  i(1)
-replaying PPB_FileIO_IsFileIO:i:i:
-input 0:  i(66)
-output 0:  i(1)
-replaying PPB_URLRequestInfo_IsURLRequestInfo:i:i:
-input 0:  i(66)
-output 0:  i(0)
-replaying PPB_URLResponseInfo_IsURLResponseInfo:i:i:
-input 0:  i(66)
-output 0:  i(0)
-replaying PPB_URLLoader_IsURLLoader:i:i:
-input 0:  i(66)
-output 0:  i(0)
-replaying PPB_URLRequestInfo_SetProperty:iiC:i:
-input 0:  i(30)
-input 1:  i(0)
-input 2:  C(40,\x05\x00\x00\x00\x19\x00\x00\x00ppapi_geturl_success.html\x00\x00\x00\x00\x00\x00\x00)
-output 0:  i(1)
-replaying PPB_URLRequestInfo_SetProperty:iiC:i:
-input 0:  i(30)
-input 1:  i(1)
-input 2:  C(16,\x05\x00\x00\x00\x03\x00\x00\x00GET\x00\x00\x00\x00\x00)
-output 0:  i(1)
-replaying PPB_URLRequestInfo_SetProperty:iiC:i:
-input 0:  i(30)
-input 1:  i(3)
-input 2:  C(8,\x02\x00\x00\x00\x01\x00\x00\x00)
-output 0:  i(1)
-replaying PPB_URLLoader_Open:iii:i:
-input 0:  i(34)
-input 1:  i(30)
-input 2:  i(4)
-output 0:  i(-1)
-rpc call complete Call:CCiCC:CC
-output 0:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-output 1:  C(8,\x00\x00\x00\x00\x00\x00\x00\x00)
-
-
-"*** DONE"
-rpc call intiated PPP_ShutdownModule::
-rpc call complete PPP_ShutdownModule::
-
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/sel_universal_ppapi_replay_prolog.stdin b/ppapi/native_client/tests/ppapi_simple_tests/sel_universal_ppapi_replay_prolog.stdin
deleted file mode 100644
index 3622ab4..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/sel_universal_ppapi_replay_prolog.stdin
+++ /dev/null
@@ -1,104 +0,0 @@
-# First register a bunch of dummy replays with zero count
-# so that those signatures will get registered during "install_upcalls"
-# Note: because of the zero count we do not have to get the parameters right
-#
-# Enumerating all known methods ahead of time helps in many ways:
-# * we can delay registering non zero count replays till later which help
-#   readability
-# * we get an error if for some reason the nexe calls one of these functions.
-#   Sadly, the nexe usually fails silently when a method is missing from a
-#   service
-#
-# This must be updated by hand when signatures change.
-
-echo
-echo "*** REPLAY PROLOG"
-
-replay 0 HasProperty:CCC:iC *
-replay 0 HasMethod:CCC:iC *
-replay 0 GetProperty:CCC:CC *
-replay 0 GetAllPropertyNames:CC:iCC *
-replay 0 SetProperty:CCCC:C *
-replay 0 RemoveProperty:CCC:C *
-replay 0 Call:CCiCC:CC *
-replay 0 Construct:CiCC:CC *
-replay 0 Deallocate:C: *
-replay 0 PPB_GetInterface:s:i *
-
-replay 0 PPB_Audio_Create:ii:i *
-replay 0 PPB_Audio_IsAudio:i:i *
-replay 0 PPB_Audio_GetCurrentConfig:i:i *
-replay 0 PPB_Audio_StopPlayback:i:i *
-replay 0 PPB_Audio_StartPlayback:i:i *
-
-replay 0 PPB_AudioConfig_CreateStereo16Bit:iii:i *
-replay 0 PPB_AudioConfig_IsAudioConfig:i:i *
-replay 0 PPB_AudioConfig_RecommendSampleFrameCount:ii:i *
-replay 0 PPB_AudioConfig_GetSampleRate:i:i *
-replay 0 PPB_AudioConfig_GetSampleFrameCount:i:i *
-
-replay 0 PPB_Core_AddRefResource:i: *
-replay 0 PPB_Core_ReleaseResource:i: *
-replay 0 PPB_Core_GetTime::d *
-replay 0 PPB_Core_CallOnMainThread:iii: *
-
-replay 0 ReleaseResourceMultipleTimes:ii: *
-
-replay 0 PPB_FileIO_Create:i:i *
-replay 0 PPB_FileIO_IsFileIO:i:i *
-replay 0 PPB_FileIO_Open:iiii:i *
-replay 0 PPB_FileIO_Read:ilii:Ci *
-
-replay 0 PPB_Graphics2D_Create:iCi:i *
-replay 0 PPB_Graphics2D_IsGraphics2D:i:i *
-replay 0 PPB_Graphics2D_Describe:i:Cii *
-replay 0 PPB_Graphics2D_PaintImageData:iiCC: *
-replay 0 PPB_Graphics2D_Scroll:iCC: *
-replay 0 PPB_Graphics2D_ReplaceContents:ii: *
-replay 0 PPB_Graphics2D_Flush:ii:i *
-
-replay 0 PPB_ImageData_GetNativeImageDataFormat::i *
-replay 0 PPB_ImageData_IsImageDataFormatSupported:i:i *
-replay 0 PPB_ImageData_Create:iiCi:i *
-replay 0 PPB_ImageData_IsImageData:i:i *
-replay 0 PPB_ImageData_Describe:i:Chii *
-
-replay 0 PPB_Instance_BindGraphics:ii:i *
-replay 0 PPB_Instance_IsFullFrame:i:i *
-
-replay 0 PPB_URLRequestInfo_Create:i:i *
-replay 0 PPB_URLRequestInfo_IsURLRequestInfo:i:i *
-replay 0 PPB_URLRequestInfo_IsURLResponseInfo:i:i *
-replay 0 PPB_URLRequestInfo_SetProperty:iiC:i *
-replay 0 PPB_URLRequestInfo_AppendDataToBody:iC:i *
-replay 0 PPB_URLRequestInfo_AppendFileToBody:illld:i *
-
-replay 0 PPB_URLLoader_Open:iii:i *
-replay 0 PPB_URLLoader_Create:i:i *
-replay 0 PPB_URLLoader_FollowRedirect:ii:i *
-replay 0 PPB_URLLoader_GetUploadProgress:i:lli *
-replay 0 PPB_URLLoader_GetDownloadProgress:i:lli *
-replay 0 PPB_URLLoader_ReadResponseBody:iii:Ci *
-replay 0 PPB_URLLoader_GetResponseInfo:i:i *
-replay 0 PPB_URLLoader_Close:i: *
-replay 0 PPB_URLLoader_IsURLLoader:i:i *
-
-replay 0 PPB_URLResponseInfo_IsURLResponseInfo:i:i *
-replay 0 PPB_URLResponseInfo_GetProperty:ii:C *
-replay 0 PPB_URLResponseInfo_GetBodyAsFileRef:i:l *
-
-replay 0 PPB_Messaging_PostMessage:iC: *
-
-# Register  signatures found in all previous replay commands for export
-# via install_upcalls
-echo
-echo "*** REGISTER REPLAY METHODS"
-replay_activate
-
-# Create a upcall service on the channel between nexe and sel_univeral.
-# The service string is save into the variable "service_string".
-echo
-echo "*** CREATE UPCALL SERVICE"
-install_upcalls service_string pepper_desc
-# the variable service string is very long and might change so we suppress it
-nondeterministic s("${service_string}") @LENGTHY_SERVICE_STRING
diff --git a/ppapi/native_client/tests/ppapi_simple_tests/test.txt b/ppapi/native_client/tests/ppapi_simple_tests/test.txt
deleted file mode 100644
index 999a079..0000000
--- a/ppapi/native_client/tests/ppapi_simple_tests/test.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Lorem ipsum dolor sit. Amet massa libero bibendum. Quis curabitur consectetuer eu. Sit mollis non euismod. Vel scelerisque volutpat interdum condimentum proin congue quis. Congue bibendum dolor ipsum. Hac purus nunc rhoncus. Odio inceptos nunc risus egestas non tempus neque. Mauris proin nibh ipsum mus risus pellentesque vitae. Etiam in duis eu tempor aliquet dolor ligula id aliquam vel lectus. Mi wisi ipsum commodo. Adipisci sodales vestibulum aliquam. Nonummy ligula nisl amet. Id et rutrum pede ornare arcu ornare senectus taciti sollicitudin in dictum class nulla mi in. Sed sodales risus fermentum. Ipsum hendrerit aliquam adipisci nunc nam curabitur sed. Dictum netus maecenas pellentesque. Cursus metus libero magnis. Pellentesque dictumst per aliquam. Elementum dis urna et. Ad in non in. A nisl bibendum faucibus. Egestas dictum lacinia condimentum. Sapien neque quisque quisque libero aliquet molestie et. Semper maecenas justo molestie. Dis in duis congue. Id sem hac ornare libero turpis conubia eget repudiandae mi enim nec adipiscing mollis phasellus wisi.
-
-Viverra elit egestas nulla. Viverra pulvinar in molestie. Wisi odio tincidunt odio. Diam ac erat arcu. Nulla odio commodo quam. Non curabitur mollis ac. Fermentum mauris consectetuer hendrerit massa vivamus amet nullam. Cursus felis sollicitudin condimentum lectus id amet suspendisse. Nunc eros non risus. Orci nec in magna. Ut nulla phasellus nec cursus leo mi semper. Id vestibulum eget sed. Arcu erat nec proin curabitur felis accumsan dolor enim quis mauris aliquip adipisicing volutpat odio molestie. Eu pulvinar amet lacinia.
-
-Pellentesque scelerisque mauris ut quis sed non aut. Metus cursus nulla cras. Vivamus duis sit mauris. Sapien urna amet wisi quam gravida sit venenatis. Tortor vel amet neque eu inceptos sit aliquam fusce id volutpat tristique. Phasellus sit mattis nisl. Dui eu senectus ligula. Quia justo sit consequat erat aenean interdum urna. Scelerisque diam ac urna. Pellentesque vitae aliquet maecenas.