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 #include "content/test/content_test_suite.h" | 5 #include "content/test/content_test_suite.h" |
6 | 6 |
7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "content/public/common/content_client.h" | 9 #include "content/public/common/content_client.h" |
10 #include "content/public/common/content_paths.h" | 10 #include "content/public/common/content_paths.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "base/command_line.h" | 29 #include "base/command_line.h" |
30 #include "media/base/media.h" | 30 #include "media/base/media.h" |
31 #include "ui/gl/test/gl_surface_test_support.h" | 31 #include "ui/gl/test/gl_surface_test_support.h" |
32 #endif | 32 #endif |
33 | 33 |
34 #if defined(OS_ANDROID) | 34 #if defined(OS_ANDROID) |
35 #include "content/browser/android/in_process_surface_texture_manager.h" | 35 #include "content/browser/android/in_process_surface_texture_manager.h" |
36 #endif | 36 #endif |
37 | 37 |
38 #if defined(USE_OZONE) | 38 #if defined(USE_OZONE) |
39 #include "ui/ozone/public/client_native_pixmap_factory.h" | 39 #include "content/test/test_client_native_pixmap_factory_ozone.h" |
40 #endif | 40 #endif |
41 | 41 |
42 namespace content { | 42 namespace content { |
43 namespace { | 43 namespace { |
44 | 44 |
45 class TestInitializationListener : public testing::EmptyTestEventListener { | 45 class TestInitializationListener : public testing::EmptyTestEventListener { |
46 public: | 46 public: |
47 TestInitializationListener() : test_content_client_initializer_(NULL) { | 47 TestInitializationListener() : test_content_client_initializer_(NULL) { |
48 } | 48 } |
49 | 49 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 listeners.Append(new TestInitializationListener); | 105 listeners.Append(new TestInitializationListener); |
106 #if defined(OS_ANDROID) | 106 #if defined(OS_ANDROID) |
107 SurfaceTextureManager::SetInstance( | 107 SurfaceTextureManager::SetInstance( |
108 InProcessSurfaceTextureManager::GetInstance()); | 108 InProcessSurfaceTextureManager::GetInstance()); |
109 #endif | 109 #endif |
110 #if defined(OS_MACOSX) && !defined(OS_IOS) | 110 #if defined(OS_MACOSX) && !defined(OS_IOS) |
111 IOSurfaceManager::SetInstance(InProcessIOSurfaceManager::GetInstance()); | 111 IOSurfaceManager::SetInstance(InProcessIOSurfaceManager::GetInstance()); |
112 #endif | 112 #endif |
113 #if defined(USE_OZONE) | 113 #if defined(USE_OZONE) |
114 if (!is_child_process) { | 114 if (!is_child_process) { |
115 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); | |
116 ui::ClientNativePixmapFactory::SetInstance( | 115 ui::ClientNativePixmapFactory::SetInstance( |
117 client_native_pixmap_factory_.get()); | 116 TestClientNativePixmapFactory::GetInstance()); |
118 } | 117 } |
119 #endif | 118 #endif |
120 } | 119 } |
121 | 120 |
122 } // namespace content | 121 } // namespace content |
OLD | NEW |