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 CONTENT_TEST_CONTENT_TEST_SUITE_H_ | 5 #ifndef CONTENT_TEST_CONTENT_TEST_SUITE_H_ |
6 #define CONTENT_TEST_CONTENT_TEST_SUITE_H_ | 6 #define CONTENT_TEST_CONTENT_TEST_SUITE_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
9 #include "base/macros.h" | 11 #include "base/macros.h" |
10 #include "base/memory/scoped_ptr.h" | |
11 #include "build/build_config.h" | 12 #include "build/build_config.h" |
12 #include "content/public/test/content_test_suite_base.h" | 13 #include "content/public/test/content_test_suite_base.h" |
13 | 14 |
14 #if defined(OS_WIN) | 15 #if defined(OS_WIN) |
15 #include "base/win/scoped_com_initializer.h" | 16 #include "base/win/scoped_com_initializer.h" |
16 #endif | 17 #endif |
17 | 18 |
18 #if defined(USE_OZONE) | 19 #if defined(USE_OZONE) |
19 namespace ui { | 20 namespace ui { |
20 class ClientNativePixmapFactory; | 21 class ClientNativePixmapFactory; |
21 } // namespace ui | 22 } // namespace ui |
22 #endif | 23 #endif |
23 | 24 |
24 namespace content { | 25 namespace content { |
25 | 26 |
26 class ContentTestSuite : public ContentTestSuiteBase { | 27 class ContentTestSuite : public ContentTestSuiteBase { |
27 public: | 28 public: |
28 ContentTestSuite(int argc, char** argv); | 29 ContentTestSuite(int argc, char** argv); |
29 ~ContentTestSuite() override; | 30 ~ContentTestSuite() override; |
30 | 31 |
31 protected: | 32 protected: |
32 void Initialize() override; | 33 void Initialize() override; |
33 | 34 |
34 private: | 35 private: |
35 #if defined(OS_WIN) | 36 #if defined(OS_WIN) |
36 base::win::ScopedCOMInitializer com_initializer_; | 37 base::win::ScopedCOMInitializer com_initializer_; |
37 #endif | 38 #endif |
38 #if defined(USE_OZONE) | 39 #if defined(USE_OZONE) |
39 scoped_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; | 40 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; |
40 #endif | 41 #endif |
41 | 42 |
42 DISALLOW_COPY_AND_ASSIGN(ContentTestSuite); | 43 DISALLOW_COPY_AND_ASSIGN(ContentTestSuite); |
43 }; | 44 }; |
44 | 45 |
45 } // namespace content | 46 } // namespace content |
46 | 47 |
47 #endif // CONTENT_TEST_CONTENT_TEST_SUITE_H_ | 48 #endif // CONTENT_TEST_CONTENT_TEST_SUITE_H_ |
OLD | NEW |