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