| 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/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 if (!is_child_process) { | 88 if (!is_child_process) { |
| 89 gpu::GPUInfo gpu_info; | 89 gpu::GPUInfo gpu_info; |
| 90 gpu::CollectBasicGraphicsInfo(&gpu_info); | 90 gpu::CollectBasicGraphicsInfo(&gpu_info); |
| 91 gpu::ApplyGpuDriverBugWorkarounds(gpu_info, | 91 gpu::ApplyGpuDriverBugWorkarounds(gpu_info, |
| 92 base::CommandLine::ForCurrentProcess()); | 92 base::CommandLine::ForCurrentProcess()); |
| 93 gl::GLSurfaceTestSupport::InitializeOneOff(); | 93 gl::GLSurfaceTestSupport::InitializeOneOff(); |
| 94 } | 94 } |
| 95 testing::TestEventListeners& listeners = | 95 testing::TestEventListeners& listeners = |
| 96 testing::UnitTest::GetInstance()->listeners(); | 96 testing::UnitTest::GetInstance()->listeners(); |
| 97 listeners.Append(new TestInitializationListener); | 97 listeners.Append(new TestInitializationListener); |
| 98 #if defined(OS_ANDROID) | |
| 99 content::BrowserMediaPlayerManager::InitSurfaceTexturePeer(); | |
| 100 #endif | |
| 101 } | 98 } |
| 102 | 99 |
| 103 } // namespace content | 100 } // namespace content |
| OLD | NEW |