summaryrefslogtreecommitdiffstats
path: root/components/mus/ws/test_utils.cc
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2016-03-09 16:51:25 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-10 00:52:38 +0000
commit737c314215715069841946ccdb4bdc73a4d0db08 (patch)
tree20ba9d6149524ed2f4fa489360fcb297517d94fb /components/mus/ws/test_utils.cc
parent044355b27f57075d21ef68442cd397f31366dc80 (diff)
downloadchromium_src-737c314215715069841946ccdb4bdc73a4d0db08.zip
chromium_src-737c314215715069841946ccdb4bdc73a4d0db08.tar.gz
chromium_src-737c314215715069841946ccdb4bdc73a4d0db08.tar.bz2
Adds AccessControlManager and wires up user ids
The AccessControlManager is used to tell mus the active user. BUG=577274 TEST=bot only change R=ben@chromium.org Review URL: https://codereview.chromium.org/1781733002 Cr-Commit-Position: refs/heads/master@{#380276}
Diffstat (limited to 'components/mus/ws/test_utils.cc')
-rw-r--r--components/mus/ws/test_utils.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/components/mus/ws/test_utils.cc b/components/mus/ws/test_utils.cc
index 1f3b0dc..2cb7491 100644
--- a/components/mus/ws/test_utils.cc
+++ b/components/mus/ws/test_utils.cc
@@ -87,10 +87,7 @@ TestPlatformDisplayFactory::TestPlatformDisplayFactory(
TestPlatformDisplayFactory::~TestPlatformDisplayFactory() {}
-PlatformDisplay* TestPlatformDisplayFactory::CreatePlatformDisplay(
- mojo::Connector* connector,
- const scoped_refptr<GpuState>& gpu_state,
- const scoped_refptr<mus::SurfacesState>& surfaces_state) {
+PlatformDisplay* TestPlatformDisplayFactory::CreatePlatformDisplay() {
return new TestPlatformDisplay(cursor_id_storage_);
}
@@ -280,8 +277,7 @@ void TestConnectionManagerDelegate::CreateDefaultDisplays() {
for (int i = 0; i < num_displays_to_create_; ++i) {
// Display manages its own lifetime.
Display* display =
- new Display(connection_manager_, nullptr, scoped_refptr<GpuState>(),
- scoped_refptr<mus::SurfacesState>());
+ new Display(connection_manager_, PlatformDisplayInitParams());
display->Init(nullptr);
}
}