Mojo C++ bindings: Simplify associated interface API.

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

Index: mojo/public/cpp/bindings/lib/interface_ptr_state.h
diff --git a/mojo/public/cpp/bindings/lib/interface_ptr_state.h b/mojo/public/cpp/bindings/lib/interface_ptr_state.h
index e69360561b2824201e2def5fb4ffb1a6d0ebac7f..8f5b4ffab3868bb215b989488f7ae1a6ebf58ce1 100644
--- a/mojo/public/cpp/bindings/lib/interface_ptr_state.h
+++ b/mojo/public/cpp/bindings/lib/interface_ptr_state.h
@@ -25,8 +25,6 @@
 #include "mojo/public/cpp/bindings/interface_endpoint_client.h"
 #include "mojo/public/cpp/bindings/interface_id.h"
 #include "mojo/public/cpp/bindings/interface_ptr_info.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/lib/multiplex_router.h"
 #include "mojo/public/cpp/bindings/message_header_validator.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
@@ -60,7 +58,7 @@ class InterfacePtrState {
 
     // 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(
+    endpoint_client_->QueryVersion(base::Bind(
         &InterfacePtrState::OnQueryVersion, base::Unretained(this), callback));
   }
 
@@ -71,12 +69,12 @@ class InterfacePtrState {
       return;
 
     version_ = version;
-    endpoint_client_->control_message_proxy()->RequireVersion(version);
+    endpoint_client_->RequireVersion(version);
   }
 
   void FlushForTesting() {
     ConfigureProxyIfNecessary();
-    endpoint_client_->control_message_proxy()->FlushForTesting();
+    endpoint_client_->FlushForTesting();
   }
 
   void CloseWithReason(uint32_t custom_reason, const std::string& description) {