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

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

Issue 1673783004: Hook up BeginFrameSource to SurfaceFactoryClient via SurfaceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Register id namespace on Android 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_finder_unittest.cc ('k') | content/browser/compositor/delegated_frame_host.h » ('j') | 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 17f59eb267b7de38db71e0fb7f501580d20cf0ca..e0b5eb1bb821bf1507f61f6ec2979f1be4e3495d 100644
--- a/components/mus/ws/window_tree_unittest.cc
+++ b/components/mus/ws/window_tree_unittest.cc
@@ -163,7 +163,8 @@ class WindowTreeTest : public testing::Test {
WindowTreeTest()
: wm_client_(nullptr),
cursor_id_(0),
- platform_display_factory_(&cursor_id_) {}
+ platform_display_factory_(&cursor_id_),
+ surfaces_state_(new SurfacesState()) {}
~WindowTreeTest() override {}
// WindowTree for the window manager.
@@ -217,10 +218,10 @@ class WindowTreeTest : public testing::Test {
void SetUp() override {
PlatformDisplay::set_factory_for_testing(&platform_display_factory_);
connection_manager_.reset(
- new ConnectionManager(&delegate_, scoped_refptr<SurfacesState>()));
+ new ConnectionManager(&delegate_, surfaces_state_));
display_ = new Display(connection_manager_.get(), nullptr,
scoped_refptr<GpuState>(),
- scoped_refptr<mus::SurfacesState>());
+ surfaces_state_);
display_binding_ =
new TestDisplayBinding(display_, connection_manager_.get());
display_->Init(make_scoped_ptr(display_binding_));
@@ -236,6 +237,7 @@ class WindowTreeTest : public testing::Test {
// Owned by ConnectionManager.
TestDisplayBinding* display_binding_;
Display* display_ = nullptr;
+ scoped_refptr<SurfacesState> surfaces_state_;
scoped_ptr<ConnectionManager> connection_manager_;
base::MessageLoop message_loop_;
« no previous file with comments | « components/mus/ws/window_finder_unittest.cc ('k') | content/browser/compositor/delegated_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698