Add FlushForTesting to InterfacePtr and Binding.

mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h

 // Copyright 2015 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.
 
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_ASSOCIATED_INTERFACE_PTR_STATE_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_ASSOCIATED_INTERFACE_PTR_STATE_H_
 
 #include <stdint.h>
 
 #include <algorithm>  // For |std::swap()|.
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "mojo/public/cpp/bindings/associated_group.h"
 #include "mojo/public/cpp/bindings/associated_group_controller.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/interface_endpoint_client.h"
 #include "mojo/public/cpp/bindings/interface_id.h"
+#include "mojo/public/cpp/bindings/lib/control_message_handler.h"
 #include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 
 namespace mojo {
 namespace internal {
 
 template <typename Interface>
 class AssociatedInterfacePtrState {
  public:
@@ skipping 10 matching lines @@
   }
 
   uint32_t version() const { return version_; }
 
   uint32_t interface_id() const {
     DCHECK(is_bound());
     return endpoint_client_->interface_id();
   }
 
   void QueryVersion(const base::Callback<void(uint32_t)>& callback) {
-    // Do a static cast in case the interface contains methods with the same
-    // name. It is safe to capture |this| because the callback won't be run
-    // after this object goes away.
-    static_cast<ControlMessageProxy*>(proxy_.get())
-        ->QueryVersion(base::Bind(&AssociatedInterfacePtrState::OnQueryVersion,
-                                  base::Unretained(this), callback));
+    // It is safe to capture |this| because the callback won't be run after this
+    // object goes away.
+    endpoint_client_->control_message_proxy()->QueryVersion(
+        base::Bind(&AssociatedInterfacePtrState::OnQueryVersion,
+                   base::Unretained(this), callback));
   }
 
   void RequireVersion(uint32_t version) {
     if (version <= version_)
       return;
 
     version_ = version;
-    // Do a static cast in case the interface contains methods with the same
-    // name.
-    static_cast<ControlMessageProxy*>(proxy_.get())->RequireVersion(version);
+    endpoint_client_->control_message_proxy()->RequireVersion(version);
+  }
+
+  void FlushForTesting() {
+    if (encountered_error() || !proxy_)

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

Does it make sense to remove this check? (Currently it is done at multiple
places.)

If |endpoint_client_| is null, then it is the user's responsibility to avoid
calling this method, just like RequireVersion above.

And we can let control_message_proxy() itself checks whether error has been
encountered.

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

Done.

+      return;
+
+    endpoint_client_->control_message_proxy()->FlushForTesting();
   }
 
   void Swap(AssociatedInterfacePtrState* other) {
     using std::swap;
     swap(other->endpoint_client_, endpoint_client_);
     swap(other->proxy_, proxy_);
     swap(other->version_, version_);
   }
 
   void Bind(AssociatedInterfacePtrInfo<Interface> info,
             scoped_refptr<base::SingleThreadTaskRunner> runner) {
     DCHECK(!endpoint_client_);
     DCHECK(!proxy_);
     DCHECK_EQ(0u, version_);
     DCHECK(info.is_valid());
 
     version_ = info.version();
     endpoint_client_.reset(new InterfaceEndpointClient(
         info.PassHandle(), nullptr,
         base::WrapUnique(new typename Interface::ResponseValidator_()), false,
-        std::move(runner)));
+        std::move(runner), 0u));

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

Please comment on why we use 0 here. It might not be obvious to the readers.

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

Done.

     proxy_.reset(new Proxy(endpoint_client_.get()));
     proxy_->serialization_context()->group_controller =
         endpoint_client_->group_controller();
   }
 
   // After this method is called, the object is in an invalid state and
   // shouldn't be reused.
   AssociatedInterfacePtrInfo<Interface> PassInterface() {
     ScopedInterfaceEndpointHandle handle = endpoint_client_->PassHandle();
     endpoint_client_.reset();
@@ skipping 23 matching lines @@
 
  private:
   using Proxy = typename Interface::Proxy_;
 
   void OnQueryVersion(const base::Callback<void(uint32_t)>& callback,
                       uint32_t version) {
     version_ = version;
     callback.Run(version);
   }
 
+  void OnConnectionError() {

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

I think this is not used.

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

Done.

+    endpoint_client_->control_message_proxy()->OnConnectionError();
+  }
+
   std::unique_ptr<InterfaceEndpointClient> endpoint_client_;
   std::unique_ptr<Proxy> proxy_;
 
   uint32_t version_;
 
   DISALLOW_COPY_AND_ASSIGN(AssociatedInterfacePtrState);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_ASSOCIATED_INTERFACE_PTR_STATE_H_