exo: Improve window placement.

components/exo/touch_unittest.cc

 // Copyright 2015 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 "ash/shell.h"
 #include "ash/wm/window_positioner.h"
 #include "ash/wm/window_util.h"
 #include "components/exo/buffer.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/surface.h"
@@ skipping 24 matching lines @@
   MOCK_METHOD3(OnTouchMotion, void(base::TimeDelta, int, const gfx::Point&));
   MOCK_METHOD0(OnTouchCancel, void());
 };
 
 TEST_F(TouchTest, OnTouchDown) {
   ash::WindowPositioner::DisableAutoPositioning(true);
 
   scoped_ptr<Surface> bottom_surface(new Surface);
   scoped_ptr<ShellSurface> bottom_shell_surface(
       new ShellSurface(bottom_surface.get()));
-  bottom_shell_surface->Init();
   gfx::Size bottom_buffer_size(10, 10);
   scoped_ptr<Buffer> bottom_buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(bottom_buffer_size),
                  GL_TEXTURE_2D));
   bottom_surface->Attach(bottom_buffer.get());
   bottom_surface->Commit();
   ash::wm::CenterWindow(bottom_shell_surface->GetWidget()->GetNativeWindow());
 
   scoped_ptr<Surface> top_surface(new Surface);
   scoped_ptr<ShellSurface> top_shell_surface(
       new ShellSurface(top_surface.get()));
-  top_shell_surface->Init();
   gfx::Size top_buffer_size(8, 8);
   scoped_ptr<Buffer> top_buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(top_buffer_size),
                  GL_TEXTURE_2D));
   top_surface->Attach(top_buffer.get());
   top_surface->Commit();
   ash::wm::CenterWindow(top_shell_surface->GetWidget()->GetNativeWindow());
 
   MockTouchDelegate delegate;
   scoped_ptr<Touch> touch(new Touch(&delegate));
@@ skipping 14 matching lines @@
   generator.set_current_location(bottom_surface->GetBoundsInScreen().origin());
   generator.PressTouchId(2);
 
   EXPECT_CALL(delegate, OnTouchDestroying(touch.get()));
   touch.reset();
 }
 
 TEST_F(TouchTest, OnTouchUp) {
   scoped_ptr<Surface> surface(new Surface);
   scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
-  shell_surface->Init();
   gfx::Size buffer_size(10, 10);
   scoped_ptr<Buffer> buffer(new Buffer(
       exo_test_helper()->CreateGpuMemoryBuffer(buffer_size), GL_TEXTURE_2D));
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockTouchDelegate delegate;
   scoped_ptr<Touch> touch(new Touch(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
@@ skipping 11 matching lines @@
   EXPECT_CALL(delegate, OnTouchUp(testing::_, 2));
   generator.ReleaseTouchId(2);
 
   EXPECT_CALL(delegate, OnTouchDestroying(touch.get()));
   touch.reset();
 }
 
 TEST_F(TouchTest, OnTouchMotion) {
   scoped_ptr<Surface> surface(new Surface);
   scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
-  shell_surface->Init();
   gfx::Size buffer_size(10, 10);
   scoped_ptr<Buffer> buffer(new Buffer(
       exo_test_helper()->CreateGpuMemoryBuffer(buffer_size), GL_TEXTURE_2D));
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockTouchDelegate delegate;
   scoped_ptr<Touch> touch(new Touch(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
@@ skipping 17 matching lines @@
   generator.set_current_location(surface->GetBoundsInScreen().origin());
   generator.PressMoveAndReleaseTouchBy(100, 100);
 
   EXPECT_CALL(delegate, OnTouchDestroying(touch.get()));
   touch.reset();
 }
 
 TEST_F(TouchTest, OnTouchCancel) {
   scoped_ptr<Surface> surface(new Surface);
   scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
-  shell_surface->Init();
   gfx::Size buffer_size(10, 10);
   scoped_ptr<Buffer> buffer(new Buffer(
       exo_test_helper()->CreateGpuMemoryBuffer(buffer_size), GL_TEXTURE_2D));
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockTouchDelegate delegate;
   scoped_ptr<Touch> touch(new Touch(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
@@ skipping 11 matching lines @@
   ui::TouchEvent cancel_event(ui::ET_TOUCH_CANCELLED, gfx::Point(), 1,
                               generator.Now());
   generator.Dispatch(&cancel_event);
 
   EXPECT_CALL(delegate, OnTouchDestroying(touch.get()));
   touch.reset();
 }
 
 }  // namespace
 }  // namespace exo