[M108 Aura Migration][NaCl][PPAPI]Fix PPAPI unittest error

This patch fixes below PPAPI unittest error:
[1] var_value_converter_unittest.cc build error
[2] MediaStreamBufferManager unittest execute error

error[1] was already fixed in patch:
  [M108 Aura Migration][NaCl][PPFW] Enable VD Trusted Plugins functionality
  https://review.tizen.org/gerrit/#/c/platform/framework/web/chromium-efl/+/289527/

Ported patch from tizen_7.0:
  https://review.tizen.org/gerrit/#/c/270688/

Change-Id: Id837625846669d5622da9ae167ac7071a97ef5e8

diff --git a/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc b/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc
index 3e177c5..ed3b3fa 100644 (file)
--- a/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc
+++ b/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc
@@ -29,6 +29,23 @@ namespace ppapi {
 class MockDelegate : public MediaStreamBufferManager::Delegate {
  public:
   MockDelegate() : new_buffer_enqueue_counter_(0) {}
+
+#if !(defined(OFFICIAL_BUILD) && defined(NDEBUG))
+  static bool HandleStandardLogMessage(int severity,
+                                       const char* file,
+                                       int line,
+                                       size_t message_start,
+                                       const std::string& str) {
+    if (severity == logging::LOG_FATAL) {
+      fprintf(stderr, str.c_str());
+    }
+    // This function only used to monitor LogMessage, and should not
+    // block LogMessage from the original output destination.
+    // Return false to guarantee LogMessage reach original destination.
+    return false;
+  }
+#endif  //!(defined(OFFICIAL_BUILD) && defined(NDEBUG))
+
   void OnNewBufferEnqueued() override {
     new_buffer_enqueue_counter_++;
   }
@@ -88,9 +105,14 @@ TEST(MediaStreamBufferManager, General) {
     EXPECT_DEATH(manager.EnqueueBuffer(-1), "");
     EXPECT_DEATH(manager.EnqueueBuffer(kNumberOfBuffers), "");
 #else
+    auto previous_handler = logging::GetLogMessageHandler();
+    logging::SetLogMessageHandler(&MockDelegate::HandleStandardLogMessage);
+
     EXPECT_DEATH(manager.EnqueueBuffer(-1), ".*Check failed: index >= 0.*");
     EXPECT_DEATH(manager.EnqueueBuffer(kNumberOfBuffers),
                  ".*Check failed: index < number_of_buffers_.*");
+
+    logging::SetLogMessageHandler(previous_handler);
 #endif
   }