| Index: components/exo/touch_unittest.cc
|
| diff --git a/components/exo/touch_unittest.cc b/components/exo/touch_unittest.cc
|
| index afdeee4eb9c90d8e099604ca7478431d469aad7f..ad4569b197914f4e5ebc6f79792d92d286b8afa7 100644
|
| --- a/components/exo/touch_unittest.cc
|
| +++ b/components/exo/touch_unittest.cc
|
| @@ -42,7 +42,7 @@ TEST_F(TouchTest, OnTouchDown) {
|
| scoped_ptr<Surface> bottom_surface(new Surface);
|
| scoped_ptr<ShellSurface> bottom_shell_surface(
|
| new ShellSurface(bottom_surface.get()));
|
| - bottom_shell_surface->SetToplevel();
|
| + 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),
|
| @@ -54,7 +54,7 @@ TEST_F(TouchTest, OnTouchDown) {
|
| scoped_ptr<Surface> top_surface(new Surface);
|
| scoped_ptr<ShellSurface> top_shell_surface(
|
| new ShellSurface(top_surface.get()));
|
| - top_shell_surface->SetToplevel();
|
| + 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),
|
| @@ -89,7 +89,7 @@ TEST_F(TouchTest, OnTouchDown) {
|
| TEST_F(TouchTest, OnTouchUp) {
|
| scoped_ptr<Surface> surface(new Surface);
|
| scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
|
| - shell_surface->SetToplevel();
|
| + shell_surface->Init();
|
| gfx::Size buffer_size(10, 10);
|
| scoped_ptr<Buffer> buffer(new Buffer(
|
| exo_test_helper()->CreateGpuMemoryBuffer(buffer_size), GL_TEXTURE_2D));
|
| @@ -121,7 +121,7 @@ TEST_F(TouchTest, OnTouchUp) {
|
| TEST_F(TouchTest, OnTouchMotion) {
|
| scoped_ptr<Surface> surface(new Surface);
|
| scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
|
| - shell_surface->SetToplevel();
|
| + shell_surface->Init();
|
| gfx::Size buffer_size(10, 10);
|
| scoped_ptr<Buffer> buffer(new Buffer(
|
| exo_test_helper()->CreateGpuMemoryBuffer(buffer_size), GL_TEXTURE_2D));
|
| @@ -159,7 +159,7 @@ TEST_F(TouchTest, OnTouchMotion) {
|
| TEST_F(TouchTest, OnTouchCancel) {
|
| scoped_ptr<Surface> surface(new Surface);
|
| scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
|
| - shell_surface->SetToplevel();
|
| + shell_surface->Init();
|
| gfx::Size buffer_size(10, 10);
|
| scoped_ptr<Buffer> buffer(new Buffer(
|
| exo_test_helper()->CreateGpuMemoryBuffer(buffer_size), GL_TEXTURE_2D));
|
|
|