Hook up BeginFrameSource to SurfaceFactoryClient via SurfaceManager

components/mus/ws/window_tree_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 399 matching lines @@
 
 }  // namespace
 
 // -----------------------------------------------------------------------------
 
 class WindowTreeTest : public testing::Test {
  public:
   WindowTreeTest()
       : wm_client_(nullptr),
         cursor_id_(0),
-        display_manager_factory_(&cursor_id_) {}
+        display_manager_factory_(&cursor_id_),
+        surfaces_state_(new SurfacesState()) {}
   ~WindowTreeTest() override {}
 
   // WindowTreeImpl for the window manager.
   WindowTreeImpl* wm_connection() {
     return connection_manager_->GetConnection(1);
   }
 
   TestWindowTreeClient* last_window_tree_client() {
     return delegate_.last_client();
   }
@@ skipping 39 matching lines @@
   void SetupEventTargeting(TestWindowTreeClient** out_client,
                            WindowTreeImpl** window_tree_connection,
                            ServerWindow** window);
 
  protected:
   // testing::Test:
   void SetUp() override {
     DisplayManager::set_factory_for_testing(&display_manager_factory_);
     // TODO(fsamuel): This is probably broken. We need a root.
     connection_manager_.reset(
-        new ConnectionManager(&delegate_, scoped_refptr<SurfacesState>()));
-    window_tree_host_ = new WindowTreeHostImpl(
-        connection_manager_.get(), nullptr, scoped_refptr<GpuState>(),
-        scoped_refptr<mus::SurfacesState>());
+        new ConnectionManager(&delegate_, surfaces_state_));
+    window_tree_host_ =
+        new WindowTreeHostImpl(connection_manager_.get(), nullptr,
+                               scoped_refptr<GpuState>(), surfaces_state_);
     // TODO(fsamuel): This is way too magical. We need to find a better way to
     // manage lifetime.
     host_connection_ = new TestWindowTreeHostConnection(
         window_tree_host_, connection_manager_.get());
     window_tree_host_->Init(make_scoped_ptr(host_connection_));
     wm_client_ = delegate_.last_client();
   }
 
  protected:
   // TestWindowTreeClient that is used for the WM connection.
   TestWindowTreeClient* wm_client_;
   int32_t cursor_id_;
   TestDisplayManagerFactory display_manager_factory_;
   TestConnectionManagerDelegate delegate_;
   TestWindowTreeHostConnection* host_connection_;
   WindowTreeHostImpl* window_tree_host_ = nullptr;
+  scoped_refptr<SurfacesState> surfaces_state_;
   scoped_ptr<ConnectionManager> connection_manager_;
   base::MessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeTest);
 };
 
 // Creates a new window in wm_connection(), adds it to the root, embeds a
 // new client in the window and creates a child of said window. |window| is
 // set to the child of |window_tree_connection| that is created.
 void WindowTreeTest::SetupEventTargeting(
@@ skipping 430 matching lines @@
   mojom_window_tree->ReleaseCapture(++change_id,
                                     WindowIdToTransportId(root_window->id()));
   EXPECT_EQ(window, host->GetCaptureWindow());
   mojom_window_tree->ReleaseCapture(++change_id,
                                     WindowIdToTransportId(window->id()));
   EXPECT_EQ(nullptr, host->GetCaptureWindow());
 }
 
 }  // namespace ws
 }  // namespace mus