Revert of Second attempt to land change to remove NativeViewportService and

mojo/shell/in_process_dynamic_service_runner.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/shell/in_process_dynamic_service_runner.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 94 matching lines @@
                   &app_library_)) {
       // If we have the control thunks, we probably also have the
       // GLES2 implementation thunks.
       if (!SetThunks(&MojoMakeGLES2ImplThunks,
                      "MojoSetGLES2ImplThunks",
                      &app_library_)) {
         // In the component build, Mojo Apps link against mojo_gles2_impl.
 #if !defined(COMPONENT_BUILD)
         // Warn on this really weird case: The library requires the GLES2
         // control functions, but doesn't require the GLES2 implementation.
-        LOG(WARNING) << app_path_.value()
-                     << " has MojoSetGLES2ControlThunks, "
-                        "but doesn't have MojoSetGLES2ImplThunks.";
+        LOG(WARNING) << "App library has MojoSetGLES2ControlThunks, but "
+                        "doesn't have MojoSetGLES2ImplThunks.";
 #endif
       }
 
       // If the application is using GLES2 extension points, register those
       // thunks. Applications may use or not use any of these, so don't warn if
       // they are missing.
       SetThunks(MojoMakeGLES2ImplChromiumTextureMailboxThunks,
                 "MojoSetGLES2ImplChromiumTextureMailboxThunks",
                 &app_library_);
       SetThunks(MojoMakeGLES2ImplChromiumSyncPointThunks,
@@ skipping 10 matching lines @@
       LOG(ERROR) << "Entrypoint MojoMain not found: " << app_path_.value();
       break;
     }
 
     // |MojoMain()| takes ownership of the service handle.
     MojoResult result = main_function(service_handle_.release().value());
     if (result < MOJO_RESULT_OK)
       LOG(ERROR) << "MojoMain returned an error: " << result;
   } while (false);
 
-  app_completed_callback_runner_.Run();
+  bool success = app_completed_callback_runner_.Run();
   app_completed_callback_runner_.Reset();
+  LOG_IF(ERROR, !success) << "Failed post run app_completed_callback";
 }
 
 }  // namespace shell
 }  // namespace mojo