Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Side by Side Diff: components/exo/test/exo_test_base.h

Issue 2493223002: Change exo::SurfaceFactoryOwner to exo::ExoCompositorFrameSink (Closed)
Patch Set: Undid a change on an if condition in exo::Surface::CommitSurfaceHierarchy() Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef COMPONENTS_EXO_TEST_EXO_TEST_BASE_H_ 5 #ifndef COMPONENTS_EXO_TEST_EXO_TEST_BASE_H_
6 #define COMPONENTS_EXO_TEST_EXO_TEST_BASE_H_ 6 #define COMPONENTS_EXO_TEST_EXO_TEST_BASE_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/message_loop/message_loop.h"
13 #include "base/test/test_mock_time_task_runner.h"
12 14
13 namespace exo { 15 namespace exo {
14 class WMHelper; 16 class WMHelper;
15 17
16 namespace test { 18 namespace test {
17 class ExoTestHelper; 19 class ExoTestHelper;
18 20
19 class ExoTestBase : public ash::test::AshTestBase { 21 class ExoTestBase : public ash::test::AshTestBase {
20 public: 22 public:
21 ExoTestBase(); 23 ExoTestBase();
22 ~ExoTestBase() override; 24 ~ExoTestBase() override;
23 25
24 // Overridden from testing::Test: 26 // Overridden from testing::Test:
25 void SetUp() override; 27 void SetUp() override;
26 void TearDown() override; 28 void TearDown() override;
27 29
28 ExoTestHelper* exo_test_helper() { return exo_test_helper_.get(); } 30 ExoTestHelper* exo_test_helper() { return exo_test_helper_.get(); }
29 31
30 private: 32 private:
31 std::unique_ptr<ExoTestHelper> exo_test_helper_; 33 std::unique_ptr<ExoTestHelper> exo_test_helper_;
32 std::unique_ptr<WMHelper> wm_helper_; 34 std::unique_ptr<WMHelper> wm_helper_;
33 35
34 DISALLOW_COPY_AND_ASSIGN(ExoTestBase); 36 DISALLOW_COPY_AND_ASSIGN(ExoTestBase);
35 }; 37 };
36 38
37 } // namespace test 39 } // namespace test
38 } // namespace exo 40 } // namespace exo
39 41
40 #endif // COMPONENTS_EXO_TEST_EXO_TEST_BASE_H_ 42 #endif // COMPONENTS_EXO_TEST_EXO_TEST_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698