Update WindowTree::OnWindowInputEventAck to include handled

components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc

 // 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.
 
 #include "components/mus/public/cpp/lib/window_tree_client_impl.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/input_event_handler.h"
 #include "components/mus/public/cpp/lib/window_private.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/tests/test_window.h"
 #include "components/mus/public/cpp/tests/test_window_tree.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/cpp/window_tracker.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/geometry/rect.h"
 
+namespace {
+
+void DoNothingBool(bool result) {}
+
+}  // namespace
+
 namespace mus {
 
 mojo::Array<uint8_t> Int32ToPropertyTransportValue(int32_t value) {
   const std::vector<uint8_t> bytes =
       mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(value);
   mojo::Array<uint8_t> transport_value;
   transport_value.resize(bytes.size());
   memcpy(&transport_value.front(), &(bytes.front()), bytes.size());
   return transport_value;
 }
@@ skipping 75 matching lines @@
  public:
   TestInputEventHandler()
       : received_event_(false), should_manually_ack_(false) {}
   ~TestInputEventHandler() override {}
 
   void set_should_manually_ack() { should_manually_ack_ = true; }
 
   void AckEvent() {
     DCHECK(should_manually_ack_);
     DCHECK(!ack_callback_.is_null());
-    ack_callback_.Run();
-    ack_callback_ = base::Closure();
+    ack_callback_.Run(true);
+    ack_callback_ = base::Bind(&::DoNothingBool);
   }
 
   void Reset() {
     received_event_ = false;
-    ack_callback_ = base::Closure();
+    ack_callback_ = base::Bind(&::DoNothingBool);
   }
   bool received_event() const { return received_event_; }
 
  private:
   // InputEventHandler:
-  void OnWindowInputEvent(Window* target,
-                          mojom::EventPtr event,
-                          scoped_ptr<base::Closure>* ack_callback) override {
+  void OnWindowInputEvent(
+      Window* target,
+      mojom::EventPtr event,
+      scoped_ptr<base::Callback<void(bool)>>* ack_callback) override {
     EXPECT_FALSE(received_event_)
         << "Observer was not reset after receiving event.";
     received_event_ = true;
     if (should_manually_ack_) {
       ack_callback_ = *ack_callback->get();
       ack_callback->reset();
     }
   }
 
   bool received_event_;
   bool should_manually_ack_;
-  base::Closure ack_callback_;
+  base::Callback<void(bool)> ack_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(TestInputEventHandler);
 };
 
 using WindowTreeClientImplTest = testing::Test;
 
 // Verifies bounds are reverted if the server replied that the change failed.
 TEST_F(WindowTreeClientImplTest, SetBoundsFailed) {
   WindowTreeSetup setup;
   Window* root = setup.GetFirstRoot();
@@ skipping 637 matching lines @@
 
   setup.window_tree_client()->OnChangeCompleted(change_id2, false);
   EXPECT_FALSE(child->HasCapture());
   EXPECT_TRUE(root->HasCapture());
 
   setup.window_tree_client()->OnLostCapture(root->id());
   EXPECT_FALSE(root->HasCapture());
 }
 
 }  // namespace mus