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

Unified Diff: components/mus/ws/window_tree_unittest.cc

Issue 1782123003: Makes WindowTree take the AccessPolicy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 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 | « components/mus/ws/window_tree_factory.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/window_tree_unittest.cc
diff --git a/components/mus/ws/window_tree_unittest.cc b/components/mus/ws/window_tree_unittest.cc
index bd55e09dd94349da4f5c0d6cea039427f6c6f49d..440c378f4b367be3b28096cd192ab084be23c551 100644
--- a/components/mus/ws/window_tree_unittest.cc
+++ b/components/mus/ws/window_tree_unittest.cc
@@ -16,6 +16,7 @@
#include "components/mus/surfaces/surfaces_state.h"
#include "components/mus/ws/connection_manager.h"
#include "components/mus/ws/connection_manager_delegate.h"
+#include "components/mus/ws/default_access_policy.h"
#include "components/mus/ws/display_binding.h"
#include "components/mus/ws/ids.h"
#include "components/mus/ws/platform_display.h"
@@ -25,6 +26,7 @@
#include "components/mus/ws/server_window_surface_manager_test_api.h"
#include "components/mus/ws/test_change_tracker.h"
#include "components/mus/ws/test_utils.h"
+#include "components/mus/ws/window_manager_access_policy.h"
#include "components/mus/ws/window_tree.h"
#include "components/mus/ws/window_tree_binding.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
@@ -107,7 +109,8 @@ class TestDisplayBinding : public DisplayBinding {
WindowTree* CreateWindowTree(ServerWindow* root) override {
return connection_manager_->EmbedAtWindow(
root, mojo::shell::mojom::kRootUserID,
- mus::mojom::WindowTreeClientPtr());
+ mus::mojom::WindowTreeClientPtr(),
+ make_scoped_ptr(new WindowManagerAccessPolicy));
}
Display* display_;
@@ -224,7 +227,8 @@ class WindowTreeTest : public testing::Test {
WindowTree* CreateNewTree(const UserId& user_id,
TestWindowTreeBinding** binding) {
WindowTree* tree =
- new WindowTree(connection_manager_.get(), user_id, nullptr);
+ new WindowTree(connection_manager_.get(), user_id, nullptr,
+ make_scoped_ptr(new DefaultAccessPolicy));
*binding = new TestWindowTreeBinding;
connection_manager_->AddTree(make_scoped_ptr(tree),
make_scoped_ptr(*binding), nullptr);
« no previous file with comments | « components/mus/ws/window_tree_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698