OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 5 #include "mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.h" |
6 | 6 |
7 #include "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h" | 7 #include "ui/gl/gl_surface.h" |
8 | 8 |
9 namespace mojo { | 9 namespace mojo { |
10 namespace services { | 10 namespace services { |
11 namespace view_manager { | 11 namespace view_manager { |
12 | 12 |
13 ViewManager::ViewManager(Shell* shell) | 13 ViewManagerTestSuite::ViewManagerTestSuite(int argc, char** argv) |
14 : shell_(shell) {} | 14 : TestSuite(argc, argv) {} |
15 | 15 |
16 ViewManager::~ViewManager() {} | 16 ViewManagerTestSuite::~ViewManagerTestSuite() { |
| 17 } |
17 | 18 |
18 void ViewManager::Init() { | 19 void ViewManagerTestSuite::Initialize() { |
19 synchronizer_.reset(new ViewManagerSynchronizer(this)); | 20 base::TestSuite::Initialize(); |
| 21 gfx::GLSurface::InitializeOneOffForTests(); |
20 } | 22 } |
21 | 23 |
22 } // namespace view_manager | 24 } // namespace view_manager |
23 } // namespace services | 25 } // namespace services |
24 } // namespace mojo | 26 } // namespace mojo |
OLD | NEW |