Some small refactoring and renaming of sel_universel pepper emulation components.

src/trusted/sel_universal/sel_universal.cc

 /*
  * Copyright (c) 2011 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.
  */
 
 // Second generation sel_universal implemented in C++ and with optional
 // multimedia support via SDL
 
 #include <stdio.h>
@@ skipping 14 matching lines @@
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/desc/nrd_all_modules.h"
 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
 #include "native_client/src/trusted/reverse_service/reverse_service.h"
 #include "native_client/src/trusted/sel_universal/replay_handler.h"
 #include "native_client/src/trusted/sel_universal/rpc_universal.h"
 
 #if defined(NACL_SEL_UNIVERSAL_INCLUDE_SDL)
 // NOTE: we need to include this so that it can "hijack" main
 #include <SDL/SDL.h>
-#include "native_client/src/trusted/sel_universal/multimedia_handler.h"
+#include "native_client/src/trusted/sel_universal/pepper_emu_handler.h"
 #endif
 
 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
 
 using std::ifstream;
 using std::map;
 using std::string;
 using std::vector;
 using nacl::DescWrapper;
 
@@ skipping 240 matching lines @@
   loop.AddHandler("shmem", HandlerShmem);
   loop.AddHandler("readonly_file", HandlerReadonlyFile);
   loop.AddHandler("sleep", HandlerSleep);
   loop.AddHandler("map_shmem", HandlerMap);
   loop.AddHandler("save_to_file", HandlerSaveToFile);
   loop.AddHandler("load_from_file", HandlerLoadFromFile);
   loop.AddHandler("file_size", HandlerFileSize);
   loop.AddHandler("sync_socket_create", HandlerSyncSocketCreate);
   loop.AddHandler("sync_socket_write", HandlerSyncSocketWrite);
 #if  NACL_SEL_UNIVERSAL_INCLUDE_SDL
-  loop.AddHandler("sdl_initialize", HandlerSDLInitialize);
-  loop.AddHandler("sdl_event_loop", HandlerSDLEventLoop);
+  // obsolete names
+  loop.AddHandler("sdl_initialize", HandlerPepperEmuInitialize);
+  loop.AddHandler("sdl_event_loop", HandlerPepperEmuEventLoop);
+  // new names
+  loop.AddHandler("pepper_emu_initialize", HandlerPepperEmuInitialize);
+  loop.AddHandler("pepper_emu_event_loop", HandlerPepperEmuEventLoop);
 #endif
 
   NaClLog(1, "populating initial vars\n");
   for (map<string, string>::iterator it = initial_vars.begin();
        it != initial_vars.end();
        ++it) {
     loop.SetVariable(it->first, it->second);
   }
 
   const bool success = initial_commands.size() > 0 ?
@@ skipping 16 matching lines @@
   NaClSrpcModuleInit();
   NaClNrdAllModulesInit();
 
   int exit_status = raii_main(argc, argv);
 
   NaClSrpcModuleFini();
   NaClNrdAllModulesFini();
 
   return exit_status;
 }