Add FlushForTesting to InterfacePtr and Binding.

mojo/public/cpp/bindings/lib/router.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/public/cpp/bindings/lib/router.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
+#include "mojo/public/cpp/bindings/lib/validation_util.h"
 #include "mojo/public/cpp/bindings/sync_call_restrictions.h"
 
 namespace mojo {
 namespace internal {
 
 // ----------------------------------------------------------------------------
 
 namespace {
 
 void DCheckIfInvalid(const base::WeakPtr<Router>& router,
@@ skipping 85 matching lines @@
 
 bool Router::HandleIncomingMessageThunk::Accept(Message* message) {
   return router_->HandleIncomingMessage(message);
 }
 
 // ----------------------------------------------------------------------------
 
 Router::Router(ScopedMessagePipeHandle message_pipe,
                FilterChain filters,
                bool expects_sync_requests,
-               scoped_refptr<base::SingleThreadTaskRunner> runner)
+               scoped_refptr<base::SingleThreadTaskRunner> runner,
+               int interface_version)
     : thunk_(this),
       filters_(std::move(filters)),
       connector_(std::move(message_pipe),
                  Connector::SINGLE_THREADED_SEND,
                  std::move(runner)),
       incoming_receiver_(nullptr),
       next_request_id_(0),
       testing_mode_(false),
       pending_task_for_messages_(false),
       encountered_error_(false),
+      control_message_proxy_(this),
+      control_message_handler_(interface_version),
       weak_factory_(this) {
   filters_.SetSink(&thunk_);
   if (expects_sync_requests)
     connector_.AllowWokenUpBySyncWatchOnSameThread();
   connector_.set_incoming_receiver(&filters_);
   connector_.set_connection_error_handler(
       base::Bind(&Router::OnConnectionError, base::Unretained(this)));
+  filters_.Append(base::MakeUnique<ControlMessageValidator>());
 }
 
 Router::~Router() {}
 
 void Router::AddFilter(std::unique_ptr<MessageReceiver> filter) {
   filters_.Append(std::move(filter));
 }
 
 bool Router::Accept(Message* message) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 97 matching lines @@
   // haven't notified the user because we want to process all the queued
   // messages first. We should do it now.
   if (connector_.encountered_error() && !encountered_error_)
     OnConnectionError();
 }
 
 bool Router::HandleMessageInternal(Message* message) {
   DCHECK(!encountered_error_);
 
   if (message->has_flag(Message::kFlagExpectsResponse)) {
-    if (!incoming_receiver_)
+    if (!incoming_receiver_ &&

[yzshen1, 2016/08/29 23:24:58]

Maybe we don't need this check (and also line 303)

[Sam McNally, 2016/08/30 03:05:52]

Done.

+        !mojo::internal::ControlMessageHandler::IsControlMessage(message)) {
       return false;
-
+    }
     MessageReceiverWithStatus* responder = new ResponderThunk(
         weak_factory_.GetWeakPtr(), connector_.task_runner());
-    bool ok = incoming_receiver_->AcceptWithResponder(message, responder);
+    bool ok = false;
+    if (mojo::internal::ControlMessageHandler::IsControlMessage(message)) {
+      ok = control_message_handler_.AcceptWithResponder(message, responder);
+    } else {
+      ok = incoming_receiver_->AcceptWithResponder(message, responder);
+    }
     if (!ok)
       delete responder;
     return ok;
 
   } else if (message->has_flag(Message::kFlagIsResponse)) {
     uint64_t request_id = message->request_id();
 
     if (message->has_flag(Message::kFlagIsSync)) {
       auto it = sync_responses_.find(request_id);
       if (it == sync_responses_.end()) {
         DCHECK(testing_mode_);
         return false;
       }
       it->second->response = std::move(*message);
       *it->second->response_received = true;
       return true;
     }
 
     auto it = async_responders_.find(request_id);
     if (it == async_responders_.end()) {
       DCHECK(testing_mode_);
       return false;
     }
     std::unique_ptr<MessageReceiver> responder = std::move(it->second);
     async_responders_.erase(it);
     return responder->Accept(message);
   } else {
+    if (mojo::internal::ControlMessageHandler::IsControlMessage(message))
+      return control_message_handler_.Accept(message);
+
     if (!incoming_receiver_)
       return false;
 
     return incoming_receiver_->Accept(message);
   }
 }
 
 void Router::OnConnectionError() {
   if (encountered_error_)
     return;
 
   if (!pending_messages_.empty()) {
     // After all the pending messages are processed, we will check whether an
     // error has been encountered and run the user's connection error handler
     // if necessary.
     DCHECK(pending_task_for_messages_);
     return;
   }
 
   if (connector_.during_sync_handle_watcher_callback()) {
     // We don't want the error handler to reenter an ongoing sync call.
     connector_.task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&Router::OnConnectionError, weak_factory_.GetWeakPtr()));
     return;
   }
 
+  control_message_proxy_.OnConnectionError();
+
   encountered_error_ = true;
 
   // The callbacks may hold on to resources. There is no need to keep them any
   // longer.
   async_responders_.clear();
 
   if (!error_handler_.is_null())
     error_handler_.Run();
 }
 
 // ----------------------------------------------------------------------------
 
 }  // namespace internal
 }  // namespace mojo