Some small refactoring and renaming of sel_universel pepper emulation components.

src/trusted/sel_universal/pepper_emu_core.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.
 //
 
 // Note: this file defines hooks for all pepper related srpc calls
 // it would be nice to keep this synchronized with
 // src/shared/ppapi_proxy/ppb_rpc_server.cc
 // which is a generated file
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/shared/platform/nacl_log.h"
-#include "native_client/src/trusted/sel_universal/multimedia.h"
 #include "native_client/src/trusted/sel_universal/pepper_emu.h"
+#include "native_client/src/trusted/sel_universal/primitives.h"
 #include "native_client/src/trusted/sel_universal/rpc_universal.h"
 #include "native_client/src/trusted/sel_universal/srpc_helper.h"
 
 #include <stdio.h>
 #include <string>
 
 namespace {
 
 // we currently only use this for pushing events upstream
 IMultimedia* GlobalMultiMediaInterface = 0;
@@ skipping 84 matching lines @@
   // Register Core and misc interfaces
   ncl->AddUpcallRpc(TUPLE(PPB_Core_ReleaseResource, :i:));
   ncl->AddUpcallRpc(TUPLE(PPB_GetInterface, :s:i));
   ncl->AddUpcallRpc(TUPLE(ReleaseResourceMultipleTimes, :ii:));
   ncl->AddUpcallRpc(TUPLE(PPB_Core_CallOnMainThread, :iii:));
   // This is the only rpc for now that can be called from
   // a nexe thread other than main
   // c.f. src/shared/ppapi_proxy/upcall_server.cc
   ncl->AddUpcallRpcSecondary(TUPLE(PPB_Core_CallOnMainThread, :iii:));
 }