Mandoline: Merge Surfaces and Views apps

components/view_manager/view_manager_service_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 <string>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "components/view_manager/client_connection.h"
 #include "components/view_manager/connection_manager.h"
 #include "components/view_manager/connection_manager_delegate.h"
 #include "components/view_manager/display_manager.h"
 #include "components/view_manager/display_manager_factory.h"
 #include "components/view_manager/ids.h"
 #include "components/view_manager/public/cpp/types.h"
 #include "components/view_manager/public/cpp/util.h"
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
 #include "components/view_manager/server_view.h"
+#include "components/view_manager/surfaces/surfaces_state.h"
 #include "components/view_manager/test_change_tracker.h"
 #include "components/view_manager/view_manager_root_connection.h"
 #include "components/view_manager/view_manager_service_impl.h"
 #include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect.h"
 
 using mojo::Array;
 using mojo::ERROR_CODE_NONE;
@@ skipping 198 matching lines @@
 };
 
 // Factory that dispenses TestDisplayManagers.
 class TestDisplayManagerFactory : public DisplayManagerFactory {
  public:
   TestDisplayManagerFactory() {}
   ~TestDisplayManagerFactory() {}
   DisplayManager* CreateDisplayManager(
       bool is_headless,
       mojo::ApplicationImpl* app_impl,
-      const scoped_refptr<gles2::GpuState>& gpu_state) override {
+      const scoped_refptr<gles2::GpuState>& gpu_state,
+      const scoped_refptr<surfaces::SurfacesState>& surfaces_state) override {
     return new TestDisplayManager();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestDisplayManagerFactory);
 };
 
 mojo::EventPtr CreatePointerDownEvent(int x, int y) {
   mojo::EventPtr event(mojo::Event::New());
   event->action = mojo::EVENT_TYPE_POINTER_DOWN;
@@ skipping 43 matching lines @@
   TestViewManagerRootConnection* root_connection() { return root_connection_; }
 
  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_));
     ViewManagerRootImpl* root = new ViewManagerRootImpl(
         connection_manager_.get(), true /* is_headless */, nullptr,
-        scoped_refptr<gles2::GpuState>());
+        scoped_refptr<gles2::GpuState>(),
+        scoped_refptr<surfaces::SurfacesState>());
     // TODO(fsamuel): This is way too magical. We need to find a better way to
     // manage lifetime.
     root_connection_ = new TestViewManagerRootConnection(
         make_scoped_ptr(root), connection_manager_.get());
     root->Init(root_connection_);
     wm_client_ = delegate_.last_client();
   }
 
  private:
   // TestViewManagerClient that is used for the WM connection.
@@ skipping 285 matching lines @@
                                 CreatePointerDownEvent(61, 22));
   EXPECT_EQ(root_connection()->view_manager_root()->root_view(),
             connection_manager()->GetFocusedView());
   ASSERT_EQ(wm_client()->tracker()->changes()->size(), 1u);
   EXPECT_EQ("InputEvent view=0,2 event_action=4",
             ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
   EXPECT_TRUE(connection1_client->tracker()->changes()->empty());
 }
 
 }  // namespace view_manager