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

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

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling DEPS to pick up ffmpeg GYP changes Created 5 years, 6 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 #if defined(OS_ANDROID) 7 #if defined(OS_ANDROID)
8 #include <android/native_window.h> 8 #include <android/native_window.h>
9 #include <android/native_window_jni.h> 9 #include <android/native_window_jni.h>
10 #endif 10 #endif
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 gfx::InitDeviceScaleFactor(1.0f); 116 gfx::InitDeviceScaleFactor(1.0f);
117 #endif 117 #endif
118 118
119 ContentTestSuiteBase::Initialize(); 119 ContentTestSuiteBase::Initialize();
120 { 120 {
121 ContentClient client; 121 ContentClient client;
122 ContentTestSuiteBase::RegisterContentSchemes(&client); 122 ContentTestSuiteBase::RegisterContentSchemes(&client);
123 } 123 }
124 RegisterPathProvider(); 124 RegisterPathProvider();
125 #if !defined(OS_IOS) 125 #if !defined(OS_IOS)
126 media::InitializeMediaLibraryForTesting(); 126 media::InitializeMediaLibrary();
127 // When running in a child process for Mac sandbox tests, the sandbox exists 127 // When running in a child process for Mac sandbox tests, the sandbox exists
128 // to initialize GL, so don't do it here. 128 // to initialize GL, so don't do it here.
129 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 129 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
130 switches::kTestChildProcess)) { 130 switches::kTestChildProcess)) {
131 gfx::GLSurface::InitializeOneOffForTests(); 131 gfx::GLSurface::InitializeOneOffForTests();
132 gpu::ApplyGpuDriverBugWorkarounds(base::CommandLine::ForCurrentProcess()); 132 gpu::ApplyGpuDriverBugWorkarounds(base::CommandLine::ForCurrentProcess());
133 } 133 }
134 #endif 134 #endif
135 testing::TestEventListeners& listeners = 135 testing::TestEventListeners& listeners =
136 testing::UnitTest::GetInstance()->listeners(); 136 testing::UnitTest::GetInstance()->listeners();
137 listeners.Append(new TestInitializationListener); 137 listeners.Append(new TestInitializationListener);
138 #if defined(OS_ANDROID) 138 #if defined(OS_ANDROID)
139 SurfaceTextureManager::SetInstance(new TestSurfaceTextureManager); 139 SurfaceTextureManager::SetInstance(new TestSurfaceTextureManager);
140 #endif 140 #endif
141 } 141 }
142 142
143 } // namespace content 143 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698