Commit 423ac499 authored by mfomitchev's avatar mfomitchev Committed by Commit bot

Re-adding and fixing StructTraitsTest for events and latency.

StructTraitsTest for events and latency were removed from the build by
accident in https://codereview.chromium.org/2783973002.

BUG=686865

Review-Url: https://codereview.chromium.org/2802923002
Cr-Commit-Position: refs/heads/master@{#462902}
parent ee4b55e3
...@@ -407,6 +407,7 @@ if (!is_ios) { ...@@ -407,6 +407,7 @@ if (!is_ios) {
"blink/web_input_event_unittest.cc", "blink/web_input_event_unittest.cc",
"devices/mojo/device_struct_traits_unittest.cc", "devices/mojo/device_struct_traits_unittest.cc",
"gestures/blink/web_gesture_curve_impl_unittest.cc", "gestures/blink/web_gesture_curve_impl_unittest.cc",
"mojo/struct_traits_unittest.cc",
] ]
deps += [ deps += [
"//cc", "//cc",
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#include "ui/events/keycodes/dom/dom_code.h" #include "ui/events/keycodes/dom/dom_code.h"
#include "ui/events/mojo/event.mojom.h" #include "ui/events/mojo/event.mojom.h"
#include "ui/events/mojo/event_struct_traits.h" #include "ui/events/mojo/event_struct_traits.h"
#include "ui/events/mojo/traits_test_service.mojom.h"
#include "ui/latency/mojo/latency_info_struct_traits.h"
namespace ui { namespace ui {
......
...@@ -24,8 +24,8 @@ test("latency_unittests") { ...@@ -24,8 +24,8 @@ test("latency_unittests") {
deps = [ deps = [
":latency", ":latency",
"//base", "//base",
"//base/test:run_all_unittests",
"//base/test:test_support", "//base/test:test_support",
"//mojo/edk/test:run_all_unittests",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
] ]
...@@ -33,11 +33,13 @@ test("latency_unittests") { ...@@ -33,11 +33,13 @@ test("latency_unittests") {
if (!is_ios) { if (!is_ios) {
sources += [ sources += [
"ipc/latency_info_param_traits_unittest.cc", "ipc/latency_info_param_traits_unittest.cc",
"mojo/struct_traits_unittest", "mojo/struct_traits_unittest.cc",
] ]
deps += [ deps += [
"//ipc:test_support", "//ipc:test_support",
"//mojo/public/cpp/bindings",
"//ui/latency/ipc", "//ui/latency/ipc",
"//ui/latency/mojo:test_interfaces",
] ]
} }
} }
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/binding_set.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "ui/events/mojo/latency_info_struct_traits.h" #include "ui/latency/mojo/latency_info_struct_traits.h"
#include "ui/events/mojo/traits_test_service.mojom.h" #include "ui/latency/mojo/traits_test_service.mojom.h"
namespace ui { namespace ui {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment