Mojo: Report bindings validation errors via MojoNotifyBadMessage

mojo/public/cpp/bindings/tests/connector_unittest.cc

 // Copyright 2013 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/public/cpp/bindings/lib/connector.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <utility>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "mojo/public/cpp/bindings/lib/message_builder.h"
 #include "mojo/public/cpp/bindings/tests/message_queue.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
 class MessageAccumulator : public MessageReceiver {
  public:
   MessageAccumulator() {}
   explicit MessageAccumulator(const Closure& closure) : closure_(closure) {}
 
-  bool Accept(Message* message) override {
+  Result Accept(Message* message) override {
     queue_.Push(message);
     if (!closure_.is_null()) {
       Closure closure = closure_;
       closure_.reset();
       closure.Run();
     }
-    return true;
+    return Result::ForSuccess();
   }
 
   bool IsEmpty() const { return queue_.IsEmpty(); }
 
   void Pop(Message* message) { queue_.Pop(message); }
 
   void set_closure(const Closure& closure) { closure_ = closure; }
 
   size_t size() const { return queue_.size(); }
 
  private:
   MessageQueue queue_;
   Closure closure_;
 };
 
 class ConnectorDeletingMessageAccumulator : public MessageAccumulator {
  public:
   ConnectorDeletingMessageAccumulator(internal::Connector** connector)
       : connector_(connector) {}
 
-  bool Accept(Message* message) override {
+  Result Accept(Message* message) override {
     delete *connector_;
     *connector_ = nullptr;
     return MessageAccumulator::Accept(message);
   }
 
  private:
   internal::Connector** connector_;
 };
 
 class ReentrantMessageAccumulator : public MessageAccumulator {
  public:
   ReentrantMessageAccumulator(internal::Connector* connector)
       : connector_(connector), number_of_calls_(0) {}
 
-  bool Accept(Message* message) override {
-    if (!MessageAccumulator::Accept(message))
-      return false;
+  Result Accept(Message* message) override {
+    Result result = MessageAccumulator::Accept(message);
+    if (!result.Succeeded())
+      return result;
     number_of_calls_++;
     if (number_of_calls_ == 1) {
-      return connector_->WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
+      bool result =
+          connector_->WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
+      DCHECK(result);
+      return Result::ForSuccess();
     }
-    return true;
+    return Result::ForSuccess();
   }
 
   int number_of_calls() { return number_of_calls_; }
 
  private:
   internal::Connector* connector_;
   int number_of_calls_;
 };
 
 class ConnectorTest : public testing::Test {
@@ skipping 195 matching lines @@
   Message message;
   AllocMessage(kText, &message);
 
   // Close the other end of the pipe.
   handle1_.reset();
 
   // Not observed yet because we haven't spun the message loop yet.
   EXPECT_FALSE(connector0.encountered_error());
 
   // Write failures are not reported.
-  bool ok = connector0.Accept(&message);
-  EXPECT_TRUE(ok);
+  MessageReceiver::Result result = connector0.Accept(&message);
+  EXPECT_TRUE(result.Succeeded());
 
   // Still not observed.
   EXPECT_FALSE(connector0.encountered_error());
 
   // Spin the message loop, and then we should start observing the closed pipe.
   base::RunLoop run_loop;
   connector0.set_connection_error_handler(run_loop.QuitClosure());
   run_loop.Run();
 
   EXPECT_TRUE(connector0.encountered_error());
@@ skipping 169 matching lines @@
         error_handler_called1 = true;
         run_loop2.Quit();
       });
 
   const char kText[] = "hello world";
 
   Message message;
   AllocMessage(kText, &message);
 
   connector0.Accept(&message);
-  connector0.RaiseError();
+  connector0.RaiseError(MessageReceiver::Result::ForUnknownError());
 
   base::RunLoop run_loop3;
   MessageAccumulator accumulator(run_loop3.QuitClosure());
   connector1.set_incoming_receiver(&accumulator);
 
   run_loop3.Run();
 
   // Messages sent prior to RaiseError() still arrive at the other end.
   ASSERT_FALSE(accumulator.IsEmpty());
 
@@ skipping 85 matching lines @@
   connector1.set_incoming_receiver(&accumulator);
 
   run_loop.Run();
 
   ASSERT_EQ(2u, accumulator.size());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo