services/ui/ws/window_tree_unittest.cc - Issue 2511883006: Mojo C++ bindings: switch services/ui/public/interfaces mojom target to use STL types.

Unified Diff: services/ui/ws/window_tree_unittest.cc

Issue 2511883006: Mojo C++ bindings: switch services/ui/public/interfaces mojom target to use STL types. (Closed)

Patch Set: . Created 4 years, 1 month 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

Index: services/ui/ws/window_tree_unittest.cc

diff --git a/services/ui/ws/window_tree_unittest.cc b/services/ui/ws/window_tree_unittest.cc

index 6e0d53ae73e8b47ff54f64bfc3e97a149f9cc9ef..a9e787af74d15443ad222fc0beb11102d976a9ee 100644

--- a/services/ui/ws/window_tree_unittest.cc

+++ b/services/ui/ws/window_tree_unittest.cc

@@ -631,13 +631,13 @@ TEST_F(WindowTreeTest, NewTopLevelWindow) {

child_binding->client()->set_record_on_change_completed(true);

// Create a new top level window.

- mojo::Map<mojo::String, mojo::Array<uint8_t>> properties;

+ std::unordered_map<std::string, std::vector<uint8_t>> properties;

const uint32_t initial_change_id = 17;

// Explicitly use an id that does not contain the client id.

const ClientWindowId embed_window_id2_in_child(45 << 16 | 27);

static_cast<mojom::WindowTree*>(child_tree)

->NewTopLevelWindow(initial_change_id, embed_window_id2_in_child.id,

- std::move(properties));

+ properties);

// The binding should be paused until the wm acks the change.

uint32_t wm_change_id = 0u;

@@ -1080,13 +1080,13 @@ TEST_F(WindowTreeTest, ValidMoveLoopWithWM) {

child_binding->client()->set_record_on_change_completed(true);

// Create a new top level window.

- mojo::Map<mojo::String, mojo::Array<uint8_t>> properties;

+ std::unordered_map<std::string, std::vector<uint8_t>> properties;

const uint32_t initial_change_id = 17;

// Explicitly use an id that does not contain the client id.

const ClientWindowId embed_window_id2_in_child(45 << 16 | 27);

static_cast<mojom::WindowTree*>(child_tree)

->NewTopLevelWindow(initial_change_id, embed_window_id2_in_child.id,

- std::move(properties));

+ properties);

// The binding should be paused until the wm acks the change.

uint32_t wm_change_id = 0u;

@@ -1125,13 +1125,13 @@ TEST_F(WindowTreeTest, MoveLoopAckOKByWM) {

child_binding->client()->set_record_on_change_completed(true);

// Create a new top level window.

- mojo::Map<mojo::String, mojo::Array<uint8_t>> properties;

+ std::unordered_map<std::string, std::vector<uint8_t>> properties;

const uint32_t initial_change_id = 17;

// Explicitly use an id that does not contain the client id.

const ClientWindowId embed_window_id2_in_child(45 << 16 | 27);

static_cast<mojom::WindowTree*>(child_tree)

->NewTopLevelWindow(initial_change_id, embed_window_id2_in_child.id,

- std::move(properties));

+ properties);

// The binding should be paused until the wm acks the change.

uint32_t wm_change_id = 0u;

@@ -1180,13 +1180,13 @@ TEST_F(WindowTreeTest, WindowManagerCantMoveLoop) {

child_binding->client()->set_record_on_change_completed(true);

// Create a new top level window.

- mojo::Map<mojo::String, mojo::Array<uint8_t>> properties;

+ std::unordered_map<std::string, std::vector<uint8_t>> properties;

const uint32_t initial_change_id = 17;

// Explicitly use an id that does not contain the client id.

const ClientWindowId embed_window_id2_in_child(45 << 16 | 27);

static_cast<mojom::WindowTree*>(child_tree)

->NewTopLevelWindow(initial_change_id, embed_window_id2_in_child.id,

- std::move(properties));

+ properties);

// The binding should be paused until the wm acks the change.

uint32_t wm_change_id = 0u;

@@ -1225,13 +1225,13 @@ TEST_F(WindowTreeTest, RevertWindowBoundsOnMoveLoopFailure) {

child_binding->client()->set_record_on_change_completed(true);

// Create a new top level window.

- mojo::Map<mojo::String, mojo::Array<uint8_t>> properties;

+ std::unordered_map<std::string, std::vector<uint8_t>> properties;

const uint32_t initial_change_id = 17;

// Explicitly use an id that does not contain the client id.

const ClientWindowId embed_window_id2_in_child(45 << 16 | 27);

static_cast<mojom::WindowTree*>(child_tree)

->NewTopLevelWindow(initial_change_id, embed_window_id2_in_child.id,

- std::move(properties));

+ properties);

// The binding should be paused until the wm acks the change.

uint32_t wm_change_id = 0u;

« no previous file with comments | « services/ui/ws/window_tree_client_unittest.cc ('k') | ui/aura/mus/drag_drop_controller_mus.cc » ('j') | no next file with comments »