Revert 282697 "Non-SFI NaCl: Fix browser_tests based on libc_free.c"

trunk/src/chrome/test/data/nacl/nonsfi/libc_free.c

 /*
  * Copyright 2014 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 minimal NaCl program without libc. It uses NaCl's stable IRT ABI.
  */
 
@@ skipping 203 matching lines @@
   Elf_auxv_t* auxv = nacl_startup_auxv(info);
   grok_auxv(auxv);
   DO_QUERY(NACL_IRT_BASIC_v0_1, __libnacl_irt_basic);
   DO_QUERY(NACL_IRT_RANDOM_v0_1, __libnacl_irt_random);
 
   struct nacl_irt_ppapihook ppapihook;
   DO_QUERY(NACL_IRT_PPAPIHOOK_v0_1, ppapihook);
 
   /* This is local as a workaround to avoid having to apply
    * relocations to global variables. */
-  struct PP_StartFunctions start_funcs;
-  start_funcs.PPP_InitializeModule = MyPPP_InitializeModule;
-  start_funcs.PPP_ShutdownModule = MyPPP_ShutdownModule;
-  start_funcs.PPP_GetInterface = MyPPP_GetInterface;
-  /* Similarly, initialize some global variables, avoiding relocations. */
-  ppp_instance.DidCreate = DidCreate;
-  ppp_instance.DidDestroy = DidDestroy;
-  ppp_instance.DidChangeView = DidChangeView;
-  ppp_instance.DidChangeFocus = DidChangeFocus;
-  ppp_instance.HandleDocumentLoad = HandleDocumentLoad;
-  ppp_messaging.HandleMessage = HandleMessage;
+  struct PP_StartFunctions start_funcs = {
+    MyPPP_InitializeModule,
+    MyPPP_ShutdownModule,
+    MyPPP_GetInterface,
+  };
+  /* Similarly, initialise some global variables, avoiding relocations. */
+  struct PPP_Instance_1_0 local_ppp_instance = {
+    DidCreate,
+    DidDestroy,
+    DidChangeView,
+    DidChangeFocus,
+    HandleDocumentLoad,
+  };
+  ppp_instance = local_ppp_instance;
+  struct PPP_Messaging_1_0 local_ppp_messaging = {
+    HandleMessage,
+  };
+  ppp_messaging = local_ppp_messaging;
 
   ppapihook.ppapi_start(&start_funcs);
 
   __libnacl_irt_basic.exit(0);
 }