Add explicit "ppapi/" to #includes in ppapi/native_client/tests

The Chrome style is to use the full path of the header file.  This
cleanup should let us remove "ppapi" from the header file search path.
Having "ppapi/" be implicit is left over from when these source files
were moved from the NaCl repo into the Chrome repo.

BUG=https://code.google.com/p/nativeclient/issues/detail?id=2500
TEST=build

Review URL: https://codereview.chromium.org/19590005

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

26 files changed, 63 insertions, 55 deletions

diff --git a/ppapi/native_client/tests/nacl_browser/browser_dynamic_library/browser_dlopen_test.cc b/ppapi/native_client/tests/nacl_browser/browser_dynamic_library/browser_dlopen_test.cc
index c2ac14b..18c2f6a 100644
--- a/ppapi/native_client/tests/nacl_browser/browser_dynamic_library/browser_dlopen_test.cc
+++ b/ppapi/native_client/tests/nacl_browser/browser_dynamic_library/browser_dlopen_test.cc
@@ -8,10 +8,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
-#include "native_client/tests/ppapi_test_lib/testable_callback.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/testable_callback.h"
 
 
 namespace {
diff --git a/ppapi/native_client/tests/nacl_browser/fault_injection/fault_pm_nameservice_test.cc b/ppapi/native_client/tests/nacl_browser/fault_injection/fault_pm_nameservice_test.cc
index 7362b53..61ed0f3 100644
--- a/ppapi/native_client/tests/nacl_browser/fault_injection/fault_pm_nameservice_test.cc
+++ b/ppapi/native_client/tests/nacl_browser/fault_injection/fault_pm_nameservice_test.cc
@@ -24,13 +24,14 @@
 #include "native_client/src/public/imc_syscalls.h"
 #include "native_client/src/public/name_service.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
-#include "native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h"
-#include "native_client/src/untrusted/nacl_ppapi_util/string_buffer.h"
 
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/var.h"
 
+#include "ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h"
+#include "ppapi/native_client/src/untrusted/nacl_ppapi_util/string_buffer.h"
+
 #define RNG_OUTPUT_BYTES  1024
 
 #define BYTES_PER_LINE    32
diff --git a/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/test_runner_ppapi.c b/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/test_runner_ppapi.c
index 93a133b..0d57dfb 100644
--- a/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/test_runner_ppapi.c
+++ b/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/test_runner_ppapi.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "native_client/src/shared/ppapi_proxy/ppruntime.h"
+#include "ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h"
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_errors.h"
diff --git a/ppapi/native_client/tests/nacl_browser/manifest_file/irt_manifest_file_test.cc b/ppapi/native_client/tests/nacl_browser/manifest_file/irt_manifest_file_test.cc
index 219488b..2c9ec51 100644
--- a/ppapi/native_client/tests/nacl_browser/manifest_file/irt_manifest_file_test.cc
+++ b/ppapi/native_client/tests/nacl_browser/manifest_file/irt_manifest_file_test.cc
@@ -14,13 +14,13 @@
 #include <string>
 #include <sstream>
 
-#include "native_client/src/shared/ppapi_proxy/ppruntime.h"
 #include "native_client/src/untrusted/irt/irt.h"
 #include "native_client/src/untrusted/nacl/nacl_irt.h"
 
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/var.h"
+#include "ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h"
 
 std::string str;
 
diff --git a/ppapi/native_client/tests/nacl_browser/manifest_file/pm_manifest_file_test.cc b/ppapi/native_client/tests/nacl_browser/manifest_file/pm_manifest_file_test.cc
index 9a7ee9b..bfa26dd 100644
--- a/ppapi/native_client/tests/nacl_browser/manifest_file/pm_manifest_file_test.cc
+++ b/ppapi/native_client/tests/nacl_browser/manifest_file/pm_manifest_file_test.cc
@@ -29,15 +29,15 @@
 
 // TODO(bsy): move weak_ref module to the shared directory
 #include "native_client/src/trusted/weak_ref/weak_ref.h"
-#include "native_client/src/trusted/weak_ref/call_on_main_thread.h"
-
-#include "native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h"
-#include "native_client/src/untrusted/nacl_ppapi_util/string_buffer.h"
 
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/var.h"
 
+#include "ppapi/native_client/src/trusted/weak_ref/call_on_main_thread.h"
+#include "ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h"
+#include "ppapi/native_client/src/untrusted/nacl_ppapi_util/string_buffer.h"
+
 class PostStringMessageWrapper
     : public nacl_ppapi::EventThreadWorkStateWrapper<nacl_ppapi::VoidResult> {
  public:
diff --git a/ppapi/native_client/tests/nacl_browser/manifest_file/pm_pre_init_manifest_file_test.cc b/ppapi/native_client/tests/nacl_browser/manifest_file/pm_pre_init_manifest_file_test.cc
index b8cbe83..1339ebc 100644
--- a/ppapi/native_client/tests/nacl_browser/manifest_file/pm_pre_init_manifest_file_test.cc
+++ b/ppapi/native_client/tests/nacl_browser/manifest_file/pm_pre_init_manifest_file_test.cc
@@ -29,17 +29,16 @@
 
 // TODO(bsy): move weak_ref module to the shared directory
 #include "native_client/src/trusted/weak_ref/weak_ref.h"
-#include "native_client/src/trusted/weak_ref/call_on_main_thread.h"
-
-#include "native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h"
-#include "native_client/src/untrusted/nacl_ppapi_util/string_buffer.h"
-
-#include "native_client/src/shared/ppapi_proxy/ppruntime.h"
 
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/var.h"
 
+#include "ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h"
+#include "ppapi/native_client/src/trusted/weak_ref/call_on_main_thread.h"
+#include "ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h"
+#include "ppapi/native_client/src/untrusted/nacl_ppapi_util/string_buffer.h"
+
 std::string *manifest_contents = NULL;
 
 void TestManifestContents() {
diff --git a/ppapi/native_client/tests/nacl_browser/nameservice/pm_nameservice_test.cc b/ppapi/native_client/tests/nacl_browser/nameservice/pm_nameservice_test.cc
index 7362b53..61ed0f3 100644
--- a/ppapi/native_client/tests/nacl_browser/nameservice/pm_nameservice_test.cc
+++ b/ppapi/native_client/tests/nacl_browser/nameservice/pm_nameservice_test.cc
@@ -24,13 +24,14 @@
 #include "native_client/src/public/imc_syscalls.h"
 #include "native_client/src/public/name_service.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
-#include "native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h"
-#include "native_client/src/untrusted/nacl_ppapi_util/string_buffer.h"
 
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/var.h"
 
+#include "ppapi/native_client/src/untrusted/nacl_ppapi_util/nacl_ppapi_util.h"
+#include "ppapi/native_client/src/untrusted/nacl_ppapi_util/string_buffer.h"
+
 #define RNG_OUTPUT_BYTES  1024
 
 #define BYTES_PER_LINE    32
diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_instance_crash.cc b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_instance_crash.cc
index 23659db..44328de 100644
--- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_instance_crash.cc
+++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_instance_crash.cc
@@ -7,13 +7,12 @@
 #include <cstring>
 
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/ppb.h"
-#include "ppapi/c/ppp_instance.h"
-
 #include "ppapi/c/ppp.h"
+#include "ppapi/c/ppp_instance.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 int32_t PPP_InitializeModule(PP_Module module_id,
                              PPB_GetInterface get_browser_interface) {
diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_messaging_crash.cc b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_messaging_crash.cc
index eeea6e6..481b5db 100644
--- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_messaging_crash.cc
+++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_messaging_crash.cc
@@ -7,7 +7,6 @@
 #include <cstring>
 
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
@@ -18,6 +17,8 @@
 #include "ppapi/c/ppp_messaging.h"
 #include "ppapi/c/ppp.h"
 
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
+
 PP_EXPORT int32_t PPP_InitializeModule(PP_Module module_id,
                                        PPB_GetInterface get_browser_interface) {
   printf("PPP_InitializeModule\n");
diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_printing_crash.cc b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_printing_crash.cc
index 7603f36..c2b660e 100644
--- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_printing_crash.cc
+++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_printing_crash.cc
@@ -7,7 +7,6 @@
 #include <cstring>
 
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
@@ -18,6 +17,8 @@
 #include "ppapi/c/dev/ppp_printing_dev.h"
 #include "ppapi/c/ppp.h"
 
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
+
 PP_EXPORT int32_t PPP_InitializeModule(PP_Module module_id,
                                        PPB_GetInterface get_browser_interface) {
   printf("PPP_InitializeModule\n");
diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize_crash.cc b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize_crash.cc
index 9ef3d16..9910f3a 100644
--- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize_crash.cc
+++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_initialize_crash.cc
@@ -6,16 +6,16 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/include/nacl_macros.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
+#include "native_client/src/shared/platform/nacl_check.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb.h"
-#include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/ppp.h"
+#include "ppapi/c/ppp_instance.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 PP_EXPORT int32_t PPP_InitializeModule(PP_Module module_id,
                                        PPB_GetInterface get_browser_interface) {
diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate_crash.cc b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate_crash.cc
index 7214838..0b4b7da 100644
--- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate_crash.cc
+++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_ppp_instance_didcreate_crash.cc
@@ -7,16 +7,17 @@
 #include <cstring>
 
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
+
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_var.h"
-
 #include "ppapi/c/ppb.h"
 #include "ppapi/c/ppb_instance.h"
-#include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/ppp.h"
+#include "ppapi/c/ppp_instance.h"
+
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 PP_EXPORT int32_t PPP_InitializeModule(PP_Module module_id,
                                        PPB_GetInterface get_browser_interface) {
diff --git a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_in_callback.cc b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_in_callback.cc
index 568551e..b9f605b 100644
--- a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_in_callback.cc
+++ b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_in_callback.cc
@@ -5,8 +5,8 @@
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_core.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 
 namespace {
diff --git a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_off_main_thread.cc b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_off_main_thread.cc
index 5204255..c69941c 100644
--- a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_off_main_thread.cc
+++ b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_off_main_thread.cc
@@ -9,7 +9,7 @@
 #include <unistd.h>
 
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 namespace {
 
diff --git a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_ppapi_off_main_thread.cc b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_ppapi_off_main_thread.cc
index 64bb269..9583575 100644
--- a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_ppapi_off_main_thread.cc
+++ b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_ppapi_off_main_thread.cc
@@ -9,9 +9,9 @@
 #include <pthread.h>
 
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
 #include "ppapi/c/ppb_url_request_info.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 namespace {
 
diff --git a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_check_failure.cc b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_check_failure.cc
index 43d7d8a..4635d4f 100644
--- a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_check_failure.cc
+++ b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_check_failure.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 namespace {
 
diff --git a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_exit_call.cc b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_exit_call.cc
index cece44a..1ff41a1 100644
--- a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_exit_call.cc
+++ b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_via_exit_call.cc
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 namespace {
 
diff --git a/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/ppapi_extension_mime_handler.cc b/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/ppapi_extension_mime_handler.cc
index aeb0e4f..51ea210 100644
--- a/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/ppapi_extension_mime_handler.cc
+++ b/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/ppapi_extension_mime_handler.cc
@@ -6,8 +6,6 @@
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_errors.h"
@@ -16,6 +14,9 @@
 #include "ppapi/c/ppb_url_loader.h"
 #include "ppapi/c/ppp_instance.h"
 
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
+
 namespace {
 
 
diff --git a/ppapi/native_client/tests/ppapi_browser/manifest/manifest_good.cc b/ppapi/native_client/tests/ppapi_browser/manifest/manifest_good.cc
index 9418e4b..ac0fabf 100644
--- a/ppapi/native_client/tests/ppapi_browser/manifest/manifest_good.cc
+++ b/ppapi/native_client/tests/ppapi_browser/manifest/manifest_good.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 void SetupTests() {
   // none
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_instance/ppapi_ppb_instance.cc b/ppapi/native_client/tests/ppapi_browser/ppb_instance/ppapi_ppb_instance.cc
index 460a7fa..3cafd28 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_instance/ppapi_ppb_instance.cc
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_instance/ppapi_ppb_instance.cc
@@ -3,14 +3,15 @@
 // found in the LICENSE file.
 
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
 
 #include "ppapi/c/pp_size.h"
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/ppb_graphics_2d.h"
 
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
+
 namespace {
 
 
diff --git a/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.cc b/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.cc
index f77d58b..0313aad 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.cc
+++ b/ppapi/native_client/tests/ppapi_browser/ppp_instance/ppapi_ppp_instance.cc
@@ -8,8 +8,6 @@
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_errors.h"
@@ -17,6 +15,9 @@
 #include "ppapi/c/ppb_view.h"
 #include "ppapi/c/ppp_instance.h"
 
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
+
 namespace {
 
 PP_Bool DidCreate(PP_Instance instance,
diff --git a/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.cc b/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.cc
index 0a11450..38ccf10 100644
--- a/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.cc
+++ b/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.cc
@@ -29,8 +29,8 @@
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/ppb_view.h"
 
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/internal_utils.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/internal_utils.h"
 
 // Use for dev interfaces that might not be present.
 const void* GetBrowserInterface(const char* interface_name) {
diff --git a/ppapi/native_client/tests/ppapi_test_lib/internal_utils.cc b/ppapi/native_client/tests/ppapi_test_lib/internal_utils.cc
index 37a6749..c49aee1 100644
--- a/ppapi/native_client/tests/ppapi_test_lib/internal_utils.cc
+++ b/ppapi/native_client/tests/ppapi_test_lib/internal_utils.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "native_client/tests/ppapi_test_lib/internal_utils.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/internal_utils.h"
 
 namespace {
 
diff --git a/ppapi/native_client/tests/ppapi_test_lib/module_instance.cc b/ppapi/native_client/tests/ppapi_test_lib/module_instance.cc
index b7a530d..ac9f824 100644
--- a/ppapi/native_client/tests/ppapi_test_lib/module_instance.cc
+++ b/ppapi/native_client/tests/ppapi_test_lib/module_instance.cc
@@ -14,9 +14,6 @@
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/internal_utils.h"
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
 
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/pp_errors.h"
@@ -29,6 +26,10 @@
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/ppp_messaging.h"
 
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/internal_utils.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
+
 ///////////////////////////////////////////////////////////////////////////////
 // Plugin interface registration
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/ppapi/native_client/tests/ppapi_test_lib/test_interface.cc b/ppapi/native_client/tests/ppapi_test_lib/test_interface.cc
index c574bea..374ca79 100644
--- a/ppapi/native_client/tests/ppapi_test_lib/test_interface.cc
+++ b/ppapi/native_client/tests/ppapi_test_lib/test_interface.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "native_client/tests/ppapi_test_lib/test_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/test_interface.h"
 
 #include <string.h>
 #include <map>
@@ -10,8 +10,6 @@
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/internal_utils.h"
 
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
@@ -26,6 +24,9 @@
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/internal_utils.h"
+
 void PostTestMessage(nacl::string test_name, nacl::string message) {
   nacl::string test_message = test_name;
   test_message += ":";
diff --git a/ppapi/native_client/tests/ppapi_test_lib/testable_callback.cc b/ppapi/native_client/tests/ppapi_test_lib/testable_callback.cc
index 23bdb0a..6f65b66 100644
--- a/ppapi/native_client/tests/ppapi_test_lib/testable_callback.cc
+++ b/ppapi/native_client/tests/ppapi_test_lib/testable_callback.cc
@@ -4,8 +4,8 @@
 
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/c/pp_errors.h"
-#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
-#include "native_client/tests/ppapi_test_lib/testable_callback.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h"
+#include "ppapi/native_client/tests/ppapi_test_lib/testable_callback.h"
 
 TestableCallback::TestableCallback(PP_Instance instance, bool force_async)
     : have_result_(false),