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

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

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 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
« no previous file with comments | « content/shell/app/shell_main_delegate.cc ('k') | extensions/test/extensions_unittests_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 media::InitializeMediaLibrary(); 84 media::InitializeMediaLibrary();
85 // When running in a child process for Mac sandbox tests, the sandbox exists 85 // When running in a child process for Mac sandbox tests, the sandbox exists
86 // to initialize GL, so don't do it here. 86 // to initialize GL, so don't do it here.
87 bool is_child_process = base::CommandLine::ForCurrentProcess()->HasSwitch( 87 bool is_child_process = base::CommandLine::ForCurrentProcess()->HasSwitch(
88 switches::kTestChildProcess); 88 switches::kTestChildProcess);
89 if (!is_child_process) { 89 if (!is_child_process) {
90 gpu::GPUInfo gpu_info; 90 gpu::GPUInfo gpu_info;
91 gpu::CollectBasicGraphicsInfo(&gpu_info); 91 gpu::CollectBasicGraphicsInfo(&gpu_info);
92 gpu::ApplyGpuDriverBugWorkarounds(gpu_info, 92 gpu::ApplyGpuDriverBugWorkarounds(gpu_info,
93 base::CommandLine::ForCurrentProcess()); 93 base::CommandLine::ForCurrentProcess());
94 gfx::GLSurfaceTestSupport::InitializeOneOff(); 94 gl::GLSurfaceTestSupport::InitializeOneOff();
95 } 95 }
96 testing::TestEventListeners& listeners = 96 testing::TestEventListeners& listeners =
97 testing::UnitTest::GetInstance()->listeners(); 97 testing::UnitTest::GetInstance()->listeners();
98 listeners.Append(new TestInitializationListener); 98 listeners.Append(new TestInitializationListener);
99 #if defined(OS_ANDROID) 99 #if defined(OS_ANDROID)
100 gpu::SurfaceTextureManager::SetInstance( 100 gpu::SurfaceTextureManager::SetInstance(
101 gpu::InProcessSurfaceTextureManager::GetInstance()); 101 gpu::InProcessSurfaceTextureManager::GetInstance());
102 content::BrowserMediaPlayerManager::InitSurfaceTexturePeer(); 102 content::BrowserMediaPlayerManager::InitSurfaceTexturePeer();
103 #endif 103 #endif
104 } 104 }
105 105
106 } // namespace content 106 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/app/shell_main_delegate.cc ('k') | extensions/test/extensions_unittests_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698