Some small refactoring and renaming of sel_universel pepper emulation components.

src/trusted/sel_universal/primitives_sdl.cc

 /*
  * 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.
  */
 
 /*
  * Concrete implemenatation of IMultimedia interface using SDL
  */
 
 #include <SDL/SDL.h>
 #include <SDL/SDL_timer.h>
 
 #include <string.h>
 
 #include <functional>
 #include <queue>
 #include "ppapi/c/pp_input_event.h"
 
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 
 // TODO(robertm): the next include file should be moved to src/untrusted
-#include "native_client/src/trusted/sel_universal/multimedia.h"
+#include "native_client/src/trusted/sel_universal/primitives.h"
 #include "native_client/src/trusted/sel_universal/workqueue.h"
 
 // from sdl_ppapi_event_translator.cc
 // TODO(robertm): add header when this becomes more complex
 /* @IGNORE_LINES_FOR_CODE_HYGIENE[2] */
 extern bool ConvertSDLEventToPPAPI(
   const SDL_Event& sdl_event, PP_InputEvent* pp_event);
 
 // This file implements a IMultimedia interface using SDL
 
@@ skipping 378 matching lines @@
   state->mm->PushUserEvent(0, state->code, state->data1, state->data2);
   delete state;
   // stop timer
   return 0;
 }
 
 // Factor, so we can hide class MultimediaSDL from the outside world
 IMultimedia* MakeMultimediaSDL(int width, int heigth, const char* title) {
   return new MultimediaSDL(width, heigth, title);
 }