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

Unified Diff: ash/mus/window_manager_unittest.cc

Issue 2741063002: Setup DiscardableMemory in the ash process (Closed)
Patch Set: Rebase Created 3 years, 9 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
« no previous file with comments | « no previous file | services/ui/ws/window_manager_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager_unittest.cc
diff --git a/ash/mus/window_manager_unittest.cc b/ash/mus/window_manager_unittest.cc
index 90d3bc04eeda94f660a3c4321d1cf29f72928e29..4fb7e82a5a81e1b71ee1a7f5d9b90b0ab3c5a8c6 100644
--- a/ash/mus/window_manager_unittest.cc
+++ b/ash/mus/window_manager_unittest.cc
@@ -91,7 +91,8 @@ TEST_F(MusWindowManagerTest, OpenWindow) {
// Connect to mus and create a new top level window. The request goes to
// |ash|, but is async.
- aura::WindowTreeClient client(connector(), &window_tree_delegate);
+ aura::WindowTreeClient client(connector(), &window_tree_delegate, nullptr,
+ nullptr, nullptr, false);
client.ConnectViaWindowTreeFactory();
aura::test::EnvTestHelper().SetWindowTreeClient(&client);
std::map<std::string, std::vector<uint8_t>> properties;
@@ -110,7 +111,8 @@ TEST_F(MusWindowManagerTest, OpenWindow) {
auto tree_client_request = MakeRequest(&tree_client);
client.Embed(child_window, std::move(tree_client), 0u, base::Bind(&OnEmbed));
aura::WindowTreeClient child_client(connector(), &window_tree_delegate,
- nullptr, std::move(tree_client_request));
+ nullptr, std::move(tree_client_request),
+ nullptr, false);
window_tree_delegate.WaitForEmbed();
ASSERT_TRUE(!child_client.GetRoots().empty());
window_tree_delegate.DestroyWindowTreeHost();
« no previous file with comments | « no previous file | services/ui/ws/window_manager_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698