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 "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/scoped_ptr.h" |
10 #include "build/build_config.h" | 11 #include "build/build_config.h" |
11 #include "content/public/test/content_test_suite_base.h" | 12 #include "content/public/test/content_test_suite_base.h" |
12 | 13 |
13 #if defined(OS_WIN) | 14 #if defined(OS_WIN) |
14 #include "base/win/scoped_com_initializer.h" | 15 #include "base/win/scoped_com_initializer.h" |
15 #endif | 16 #endif |
16 | 17 |
17 #if defined(USE_OZONE) | 18 #if defined(USE_OZONE) |
18 namespace ui { | 19 namespace ui { |
19 class ClientNativePixmapFactory; | 20 class ClientNativePixmapFactory; |
(...skipping 17 matching lines...) Expand all Loading... |
37 #if defined(USE_OZONE) | 38 #if defined(USE_OZONE) |
38 scoped_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; | 39 scoped_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; |
39 #endif | 40 #endif |
40 | 41 |
41 DISALLOW_COPY_AND_ASSIGN(ContentTestSuite); | 42 DISALLOW_COPY_AND_ASSIGN(ContentTestSuite); |
42 }; | 43 }; |
43 | 44 |
44 } // namespace content | 45 } // namespace content |
45 | 46 |
46 #endif // CONTENT_TEST_CONTENT_TEST_SUITE_H_ | 47 #endif // CONTENT_TEST_CONTENT_TEST_SUITE_H_ |
OLD | NEW |