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

Side by Side Diff: mash/test/mash_test_suite.h

Issue 2639513002: mash: Do not use InProcessContextFactory in tests. (Closed)
Patch Set: . Created 3 years, 11 months 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
« no previous file with comments | « mash/test/DEPS ('k') | mash/test/mash_test_suite.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 MASH_TEST_TEST_SUITE_H_ 5 #ifndef MASH_TEST_TEST_SUITE_H_
6 #define MASH_TEST_TEST_SUITE_H_ 6 #define MASH_TEST_TEST_SUITE_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/test/test_discardable_memory_allocator.h" 11 #include "base/test/test_discardable_memory_allocator.h"
12 #include "base/test/test_suite.h" 12 #include "base/test/test_suite.h"
13 13
14 namespace aura { 14 namespace aura {
15 class Env; 15 class Env;
16 } 16 }
17 17
18 namespace mash { 18 namespace mash {
19 namespace test { 19 namespace test {
20 20
21 class TestContextFactory;
22
21 class MashTestSuite : public base::TestSuite { 23 class MashTestSuite : public base::TestSuite {
22 public: 24 public:
23 MashTestSuite(int argc, char** argv); 25 MashTestSuite(int argc, char** argv);
24 ~MashTestSuite() override; 26 ~MashTestSuite() override;
25 27
26 protected: 28 protected:
27 // base::TestSuite: 29 // base::TestSuite:
28 void Initialize() override; 30 void Initialize() override;
29 void Shutdown() override; 31 void Shutdown() override;
30 32
31 private: 33 private:
32 base::TestDiscardableMemoryAllocator discardable_memory_allocator_; 34 base::TestDiscardableMemoryAllocator discardable_memory_allocator_;
33 std::unique_ptr<aura::Env> env_; 35 std::unique_ptr<aura::Env> env_;
36 std::unique_ptr<TestContextFactory> compositor_context_factory_;
34 37
35 DISALLOW_COPY_AND_ASSIGN(MashTestSuite); 38 DISALLOW_COPY_AND_ASSIGN(MashTestSuite);
36 }; 39 };
37 40
38 } // namespace test 41 } // namespace test
39 } // namespace mash 42 } // namespace mash
40 43
41 #endif // MASH_TEST_TEST_SUITE_H_ 44 #endif // MASH_TEST_TEST_SUITE_H_
OLDNEW
« no previous file with comments | « mash/test/DEPS ('k') | mash/test/mash_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698