OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 ASH_TEST_TEST_SUITE_H_ | 5 #ifndef ASH_TEST_TEST_SUITE_H_ |
6 #define ASH_TEST_TEST_SUITE_H_ | 6 #define ASH_TEST_TEST_SUITE_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/test/test_discardable_memory_shmem_allocator.h" |
9 #include "base/test/test_suite.h" | 10 #include "base/test/test_suite.h" |
10 | 11 |
11 #if defined(OS_WIN) | 12 #if defined(OS_WIN) |
12 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
13 #include "base/win/scoped_com_initializer.h" | 14 #include "base/win/scoped_com_initializer.h" |
14 #endif | 15 #endif |
15 | 16 |
16 namespace ash { | 17 namespace ash { |
17 namespace test { | 18 namespace test { |
18 | 19 |
19 class AuraShellTestSuite : public base::TestSuite { | 20 class AuraShellTestSuite : public base::TestSuite { |
20 public: | 21 public: |
21 AuraShellTestSuite(int argc, char** argv); | 22 AuraShellTestSuite(int argc, char** argv); |
22 | 23 |
23 protected: | 24 protected: |
24 // base::TestSuite: | 25 // base::TestSuite: |
25 void Initialize() override; | 26 void Initialize() override; |
26 void Shutdown() override; | 27 void Shutdown() override; |
27 | 28 |
28 private: | 29 private: |
29 #if defined(OS_WIN) | 30 #if defined(OS_WIN) |
30 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; | 31 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; |
31 #endif | 32 #endif |
| 33 |
| 34 base::TestDiscardableMemoryShmemAllocator discardable_memory_allocator_; |
32 }; | 35 }; |
33 | 36 |
34 } // namespace test | 37 } // namespace test |
35 } // namespace ash | 38 } // namespace ash |
36 | 39 |
37 #endif // ASH_TEST_TEST_SUITE_H_ | 40 #endif // ASH_TEST_TEST_SUITE_H_ |
OLD | NEW |