Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Unified Diff: ppapi/native_client/tests/ppapi_geturl/module.cc

Issue 8589005: Remove NaCl file from ppapi_geturl test. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/native_client/tests/ppapi_geturl/module.cc
===================================================================
--- ppapi/native_client/tests/ppapi_geturl/module.cc (revision 110348)
+++ ppapi/native_client/tests/ppapi_geturl/module.cc (working copy)
@@ -13,8 +13,6 @@
#include "native_client/src/include/nacl_macros.h"
#include "native_client/src/include/portability.h"
#include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/src/untrusted/ppapi/nacl_file.h"
-#include "native_client/tests/ppapi_geturl/nacl_file_main.h"
#include "native_client/tests/ppapi_geturl/url_load_request.h"
#include "ppapi/c/pp_completion_callback.h"
@@ -44,53 +42,13 @@
PPP_Messaging messaging_interface;
Module* singleton_ = NULL;
-void RunTests(void* user_data) {
- int* count = reinterpret_cast<int*>(user_data);
- *count -= 1;
- if (*count == 0)
- test_nacl_file();
-}
} // namespace
-void HTMLLoaded(void* user_data, int32_t result) {
- CHECK(PP_OK == result);
- printf("--- HTMLLoaded() SUCCESS: completion callback got PP_OK\n");
- RunTests(user_data);
-}
-
-void RobotLoaded(void* user_data, int32_t result) {
- CHECK(PP_ERROR_NOACCESS == result);
- printf("--- RobotLoaded() SUCCESS: unable to LoadUrl on cross-domain\n");
- RunTests(user_data);
-}
-
-void NonExistLoaded(void* user_data, int32_t result) {
- CHECK(PP_ERROR_FAILED == result);
- printf("--- NonExistLoaded() SUCCESS: callback got PP_ERROR_FAILED\n");
- RunTests(user_data);
-}
-
-PP_Bool Instance_DidCreate(PP_Instance pp_instance,
+PP_Bool Instance_DidCreate(PP_Instance /*pp_instance*/,
uint32_t /*argc*/,
const char* /*argn*/[],
const char* /*argv*/[]) {
printf("--- Instance_DidCreate\n");
- int* url_count = new int(3);
- PP_CompletionCallback html_cb =
- PP_MakeCompletionCallback(HTMLLoaded, url_count);
- int32_t result = LoadUrl(pp_instance, "ppapi_geturl_success.html", html_cb);
- CHECK(PP_OK_COMPLETIONPENDING == result);
-
- PP_CompletionCallback robot_cb =
- PP_MakeCompletionCallback(RobotLoaded, url_count);
- result = LoadUrl(pp_instance, "http://www.google.com/robots.txt", robot_cb);
- CHECK(PP_OK_COMPLETIONPENDING == result);
-
- PP_CompletionCallback non_exist_cb =
- PP_MakeCompletionCallback(NonExistLoaded, url_count);
- result = LoadUrl(pp_instance, "ppapi_nonexistent_url.html", non_exist_cb);
- CHECK(PP_OK_COMPLETIONPENDING == result);
-
return PP_TRUE;
}
« no previous file with comments | « ppapi/native_client/tests/ppapi_geturl/build.scons ('k') | ppapi/native_client/tests/ppapi_geturl/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698