content/test/content_test_suite.cc - Issue 1122383005: content: Rename SurfaceTextureManager::InitInstance to SetInstance.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1122383005: content: Rename SurfaceTextureManager::InitInstance to SetInstance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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/common/android/surface_texture_manager.cc ('k') | no next file » | no next file with comments »

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 #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 #include <map>	10 #include <map>

(...skipping 117 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
128 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(	128 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(

129 switches::kTestChildProcess)) {	129 switches::kTestChildProcess)) {

130 gfx::GLSurface::InitializeOneOffForTests();	130 gfx::GLSurface::InitializeOneOffForTests();

131 gpu::ApplyGpuDriverBugWorkarounds(base::CommandLine::ForCurrentProcess());	131 gpu::ApplyGpuDriverBugWorkarounds(base::CommandLine::ForCurrentProcess());

132 }	132 }

133 #endif	133 #endif

134 testing::TestEventListeners& listeners =	134 testing::TestEventListeners& listeners =

135 testing::UnitTest::GetInstance()->listeners();	135 testing::UnitTest::GetInstance()->listeners();

136 listeners.Append(new TestInitializationListener);	136 listeners.Append(new TestInitializationListener);

137 #if defined(OS_ANDROID)	137 #if defined(OS_ANDROID)

138 SurfaceTextureManager::InitInstance(new TestSurfaceTextureManager);	138 SurfaceTextureManager::SetInstance(new TestSurfaceTextureManager);

139 #endif	139 #endif

140 }	140 }

141	141

142 } // namespace content	142 } // namespace content

OLD	NEW