Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Unified Diff: mojo/public/cpp/bindings/tests/struct_traits_unittest.cc

Issue 2259283003: Mojo C++ bindings: share DataView class between chromium and blink variants. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@92_change_traits_param
Patch Set: . Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/public/cpp/bindings/tests/struct_traits_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc b/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc
index f281981ecd93eec41d5bd2ffa28520d203a58b30..f21b4c8693b8774209f039c880d0c72793f50d4c 100644
--- a/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc
@@ -70,6 +70,11 @@ class ChromiumRectServiceImpl : public RectService {
callback.Run(largest_rect_);
}
+ void PassSharedRect(const SharedRect& r,
+ const PassSharedRectCallback& callback) override {
+ callback.Run(r);
+ }
+
private:
RectChromium largest_rect_;
};
@@ -93,6 +98,11 @@ class BlinkRectServiceImpl : public blink::RectService {
callback.Run(largest_rect_);
}
+ void PassSharedRect(const SharedRect& r,
+ const PassSharedRectCallback& callback) override {
+ callback.Run(r);
+ }
+
private:
RectBlink largest_rect_;
};
@@ -200,6 +210,13 @@ TEST_F(StructTraitsTest, ChromiumProxyToChromiumService) {
ExpectResult(RectChromium(1, 1, 4, 5), loop.QuitClosure()));
loop.Run();
}
+ {
+ base::RunLoop loop;
+ chromium_proxy->PassSharedRect(
+ {1, 2, 3, 4},
+ ExpectResult(SharedRect({1, 2, 3, 4}), loop.QuitClosure()));
+ loop.Run();
+ }
}
TEST_F(StructTraitsTest, ChromiumToBlinkService) {
@@ -213,6 +230,13 @@ TEST_F(StructTraitsTest, ChromiumToBlinkService) {
ExpectResult(RectChromium(2, 2, 5, 5), loop.QuitClosure()));
loop.Run();
}
+ {
+ base::RunLoop loop;
+ chromium_proxy->PassSharedRect(
+ {1, 2, 3, 4},
+ ExpectResult(SharedRect({1, 2, 3, 4}), loop.QuitClosure()));
+ loop.Run();
+ }
// The Blink service should drop our connection because RectBlink's
// deserializer rejects negative origins.
{
@@ -236,6 +260,13 @@ TEST_F(StructTraitsTest, BlinkProxyToBlinkService) {
ExpectResult(RectBlink(10, 10, 20, 20), loop.QuitClosure()));
loop.Run();
}
+ {
+ base::RunLoop loop;
+ blink_proxy->PassSharedRect(
+ {4, 3, 2, 1},
+ ExpectResult(SharedRect({4, 3, 2, 1}), loop.QuitClosure()));
+ loop.Run();
+ }
}
TEST_F(StructTraitsTest, BlinkProxyToChromiumService) {
@@ -249,6 +280,13 @@ TEST_F(StructTraitsTest, BlinkProxyToChromiumService) {
ExpectResult(RectBlink(1, 1, 4, 5), loop.QuitClosure()));
loop.Run();
}
+ {
+ base::RunLoop loop;
+ blink_proxy->PassSharedRect(
+ {4, 3, 2, 1},
+ ExpectResult(SharedRect({4, 3, 2, 1}), loop.QuitClosure()));
+ loop.Run();
+ }
}
void ExpectStructWithTraits(const StructWithTraitsImpl& expected,
« no previous file with comments | « mojo/public/cpp/bindings/tests/shared_rect_traits.h ('k') | mojo/public/cpp/bindings/tests/struct_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698