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/base_switches.h" | 8 #include "base/base_switches.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 #include "media/base/media.h" | 33 #include "media/base/media.h" |
34 #include "ui/gl/test/gl_surface_test_support.h" | 34 #include "ui/gl/test/gl_surface_test_support.h" |
35 #endif | 35 #endif |
36 | 36 |
37 #if defined(OS_ANDROID) | 37 #if defined(OS_ANDROID) |
38 #include "content/browser/android/in_process_surface_texture_manager.h" | 38 #include "content/browser/android/in_process_surface_texture_manager.h" |
39 #endif | 39 #endif |
40 | 40 |
41 #if defined(USE_OZONE) | 41 #if defined(USE_OZONE) |
42 #include "ui/ozone/public/client_native_pixmap_factory.h" | 42 #include "ui/ozone/public/client_native_pixmap_factory.h" |
43 #include "ui/ozone/public/ozone_platform.h" | |
44 #endif | 43 #endif |
45 | 44 |
46 namespace content { | 45 namespace content { |
47 namespace { | 46 namespace { |
48 | 47 |
49 class TestInitializationListener : public testing::EmptyTestEventListener { | 48 class TestInitializationListener : public testing::EmptyTestEventListener { |
50 public: | 49 public: |
51 TestInitializationListener() : test_content_client_initializer_(NULL) { | 50 TestInitializationListener() : test_content_client_initializer_(NULL) { |
52 } | 51 } |
53 | 52 |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 listeners.Append(new TestInitializationListener); | 111 listeners.Append(new TestInitializationListener); |
113 #if defined(OS_ANDROID) | 112 #if defined(OS_ANDROID) |
114 gpu::SurfaceTextureManager::SetInstance( | 113 gpu::SurfaceTextureManager::SetInstance( |
115 InProcessSurfaceTextureManager::GetInstance()); | 114 InProcessSurfaceTextureManager::GetInstance()); |
116 #endif | 115 #endif |
117 #if defined(USE_OZONE) | 116 #if defined(USE_OZONE) |
118 if (!is_child_process) { | 117 if (!is_child_process) { |
119 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); | 118 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); |
120 ui::ClientNativePixmapFactory::SetInstance( | 119 ui::ClientNativePixmapFactory::SetInstance( |
121 client_native_pixmap_factory_.get()); | 120 client_native_pixmap_factory_.get()); |
122 ui::ClientNativePixmapFactory::GetInstance()->Initialize( | |
123 ui::OzonePlatform::GetInstance()->OpenClientNativePixmapDevice()); | |
124 } | 121 } |
125 #endif | 122 #endif |
126 } | 123 } |
127 | 124 |
128 } // namespace content | 125 } // namespace content |
OLD | NEW |