NaCl: create a separate namespace for Mojo handles.

shell/native_application_support.cc

 // 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.
 
 #include "shell/native_application_support.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_miscellaneous_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_sub_image_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_thunks.h"
 #include "mojo/public/platform/native/gles2_thunks.h"
+#include "mojo/public/platform/native/system_impl_private_thunks.h"
 #include "mojo/public/platform/native/system_thunks.h"
 
 namespace mojo {
 namespace shell {
 
 namespace {
 
 template <typename Thunks>
 bool SetThunks(Thunks (*make_thunks)(),
                const char* function_name,
@@ skipping 32 matching lines @@
                           InterfaceRequest<Application> application_request) {
   // Tolerate |app_library| being null, to make life easier for callers.
   if (!app_library)
     return false;
 
   if (!SetThunks(&MojoMakeSystemThunks, "MojoSetSystemThunks", app_library)) {
     LOG(ERROR) << "MojoSetSystemThunks not found";
     return false;
   }
 
+  // TODO(ncbray): enforce the private nature of this API, somehow?
+  SetThunks(&MojoMakeSystemImplControlThunksPrivate,
+            "MojoSetSystemImplControlThunksPrivate", app_library);
+  SetThunks(&MojoMakeSystemImplThunksPrivate, "MojoSetSystemImplThunksPrivate",
+            app_library);
+
   if (SetThunks(&MojoMakeGLES2ControlThunks, "MojoSetGLES2ControlThunks",
                 app_library)) {
     // If we have the control thunks, we should also have the GLES2
     // implementation thunks.
     if (!SetThunks(&MojoMakeGLES2ImplThunks, "MojoSetGLES2ImplThunks",
                    app_library)) {
       LOG(ERROR)
           << "MojoSetGLES2ControlThunks found, but not MojoSetGLES2ImplThunks";
       return false;
     }
@@ skipping 35 matching lines @@
   // |MojoMain()| takes ownership of the service handle.
   MojoHandle handle = application_request.PassMessagePipe().release().value();
   MojoResult result = main_function(handle);
   LOG_IF(ERROR, result != MOJO_RESULT_OK)
       << "MojoMain returned error (result: " << result << ")";
   return true;
 }
 
 }  // namespace shell
 }  // namespace mojo