Changes routing of input events in view manager

mojo/services/view_manager/view_manager_unittest.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 <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 46 matching lines @@
 
   // Runs a message loop until the single instance has been created.
   static ViewManagerProxy* WaitForInstance() {
     if (!instance_)
       RunMainLoop();
     ViewManagerProxy* instance = instance_;
     instance_ = NULL;
     return instance;
   }
 
+  ViewManagerService* view_manager() { return view_manager_; }
+
   // Runs the main loop until |count| changes have been received.
   std::vector<Change> DoRunLoopUntilChangesCount(size_t count) {
     DCHECK_EQ(0u, quit_count_);
     if (tracker_->changes()->size() >= count) {
       CopyChangesFromTracker();
       return changes_;
     }
     quit_count_ = count - tracker_->changes()->size();
     // Run the current message loop. When |count| Changes have been received,
     // we'll quit.
@@ skipping 207 matching lines @@
   TestViewManagerClientConnection() : connection_(&tracker_) {
     tracker_.set_delegate(&connection_);
   }
 
   // InterfaceImp:
   virtual void OnConnectionEstablished() OVERRIDE {
     connection_.set_router(internal_state()->router());
     connection_.set_view_manager(client());
   }
 
-  // IViewMangerClient:
+  // ViewMangerClient:
   virtual void OnViewManagerConnectionEstablished(
       ConnectionSpecificId connection_id,
       const String& creator_url,
       Id next_server_change_id,
       Array<NodeDataPtr> nodes) OVERRIDE {
     tracker_.OnViewManagerConnectionEstablished(
         connection_id, creator_url, next_server_change_id, nodes.Pass());
   }
   virtual void OnRootsAdded(Array<NodeDataPtr> nodes) OVERRIDE {
     tracker_.OnRootsAdded(nodes.Pass());
@@ skipping 31 matching lines @@
   virtual void OnNodeViewReplaced(Id node,
                                   Id new_view_id,
                                   Id old_view_id) OVERRIDE {
     tracker_.OnNodeViewReplaced(node, new_view_id, old_view_id);
   }
   virtual void OnViewInputEvent(Id view_id,
                                 EventPtr event,
                                 const Callback<void()>& callback) OVERRIDE {
     tracker_.OnViewInputEvent(view_id, event.Pass());
   }
+  virtual void DispatchOnViewInputEvent(Id view_id,
+                                        mojo::EventPtr event) OVERRIDE {
+  }
 
  private:
   TestChangeTracker tracker_;
   ViewManagerProxy connection_;
 
   DISALLOW_COPY_AND_ASSIGN(TestViewManagerClientConnection);
 };
 
 // Used with ViewManagerService::Embed(). Creates a
 // TestViewManagerClientConnection, which creates and owns the ViewManagerProxy.
@@ skipping 966 matching lines @@
     ASSERT_TRUE(connection_->Embed(node_ids));
     connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("OnRootsAdded", changes[0]);
     EXPECT_EQ("[node=1,2 parent=1,1 view=null]",
               ChangeNodeDescription(connection2_->changes()));
   }
 }
 
+TEST_F(ViewManagerTest, OnViewInput) {
+  // Create node 1 and assign a view from connection 2 to it.
+  ASSERT_TRUE(connection_->CreateNode(BuildNodeId(1, 1)));
+  ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
+  ASSERT_TRUE(connection2_->CreateView(BuildViewId(2, 11)));
+  ASSERT_TRUE(connection2_->SetView(BuildNodeId(1, 1), BuildViewId(2, 11)));
+
+  // Dispatch an event to the view and verify its received.
+  {
+    EventPtr event(Event::New());
+    event->action = 1;
+    connection_->view_manager()->DispatchOnViewInputEvent(
+        BuildViewId(2, 11),
+        event.Pass());
+    connection2_->DoRunLoopUntilChangesCount(1);
+    const Changes changes(ChangesToDescription1(connection2_->changes()));
+    ASSERT_EQ(1u, changes.size());
+    EXPECT_EQ("InputEvent view=2,11 event_action=1", changes[0]);
+  }
+}
+
 // TODO(sky): add coverage of test that destroys connections and ensures other
 // connections get deletion notification (or advanced server id).
 
 // TODO(sky): need to better track changes to initial connection. For example,
 // that SetBounsdNodes/AddNode and the like don't result in messages to the
 // originating connection.
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo