Adds thunks for getting platform handles

mojo/runner/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 "mojo/runner/native_application_support.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
+#include "mojo/platform_handle/platform_handle_private_thunks.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_thunks.h"
 
 namespace mojo {
@@ skipping 98 matching lines @@
   if (init_command_line_args) {
     int argc = 0;
     base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
     const char** argv = new const char* [cmd_line->argv().size()];
     for (auto& arg : cmd_line->argv())
       argv[argc++] = arg.c_str();
     init_command_line_args(argc, argv);
   }
 #endif
 
+  // Apps need not include platform handle thunks.
+  SetThunks(&MojoMakePlatformHandlePrivateThunks,
+            "MojoSetPlatformHandlePrivateThunks", app_library);
+
   typedef MojoResult (*MojoMainFunction)(MojoHandle);
   MojoMainFunction main_function = reinterpret_cast<MojoMainFunction>(
       base::GetFunctionPointerFromNativeLibrary(app_library, "MojoMain"));
   if (!main_function) {
     LOG(ERROR) << "MojoMain not found";
     return false;
   }
   // |MojoMain()| takes ownership of the service handle.
   MojoHandle handle = application_request.PassMessagePipe().release().value();
   MojoResult result = main_function(handle);
   if (result != MOJO_RESULT_OK) {
     LOG(ERROR) << "MojoMain returned error (result: " << result << ")";
   }
   return true;
 }
 
 }  // namespace runner
 }  // namespace mojo