Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Side by Side Diff: content/test/content_test_suite.cc

Issue 1770073002: SurfaceTexture* => gpu/ipc/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved to android directory Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 gpu::CollectBasicGraphicsInfo(&gpu_info); 104 gpu::CollectBasicGraphicsInfo(&gpu_info);
105 gpu::ApplyGpuDriverBugWorkarounds(gpu_info, 105 gpu::ApplyGpuDriverBugWorkarounds(gpu_info,
106 base::CommandLine::ForCurrentProcess()); 106 base::CommandLine::ForCurrentProcess());
107 gfx::GLSurfaceTestSupport::InitializeOneOff(); 107 gfx::GLSurfaceTestSupport::InitializeOneOff();
108 } 108 }
109 #endif 109 #endif
110 testing::TestEventListeners& listeners = 110 testing::TestEventListeners& listeners =
111 testing::UnitTest::GetInstance()->listeners(); 111 testing::UnitTest::GetInstance()->listeners();
112 listeners.Append(new TestInitializationListener); 112 listeners.Append(new TestInitializationListener);
113 #if defined(OS_ANDROID) 113 #if defined(OS_ANDROID)
114 SurfaceTextureManager::SetInstance( 114 gpu::SurfaceTextureManager::SetInstance(
115 InProcessSurfaceTextureManager::GetInstance()); 115 InProcessSurfaceTextureManager::GetInstance());
116 #endif 116 #endif
117 #if defined(USE_OZONE) 117 #if defined(USE_OZONE)
118 if (!is_child_process) { 118 if (!is_child_process) {
119 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); 119 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create();
120 ui::ClientNativePixmapFactory::SetInstance( 120 ui::ClientNativePixmapFactory::SetInstance(
121 client_native_pixmap_factory_.get()); 121 client_native_pixmap_factory_.get());
122 ui::ClientNativePixmapFactory::GetInstance()->Initialize( 122 ui::ClientNativePixmapFactory::GetInstance()->Initialize(
123 ui::OzonePlatform::GetInstance()->OpenClientNativePixmapDevice()); 123 ui::OzonePlatform::GetInstance()->OpenClientNativePixmapDevice());
124 } 124 }
125 #endif 125 #endif
126 } 126 }
127 127
128 } // namespace content 128 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698