gpu/config/gpu_info_collector_unittest.cc - Issue 135213003: Ensure GL initialization only happens once, and provide common init path

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

Unified Diff: gpu/config/gpu_info_collector_unittest.cc

Issue 135213003: Ensure GL initialization only happens once, and provide common init path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: initgl: rebase Created 6 years, 11 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 side-by-side diff with in-line comments

Download patch

« gpu/config/gpu_info_collector_android.cc ('K') | « gpu/config/gpu_info_collector_android.cc ('k') | gpu/tools/compositor_model_bench/compositor_model_bench.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/config/gpu_info_collector_unittest.cc

diff --git a/gpu/config/gpu_info_collector_unittest.cc b/gpu/config/gpu_info_collector_unittest.cc

index 9c0adbf85985aea5ab152a45418951d60a4b8a18..0629359762830a24fc773d7af8bf0b7616ff2313 100644

--- a/gpu/config/gpu_info_collector_unittest.cc

+++ b/gpu/config/gpu_info_collector_unittest.cc

@@ -7,7 +7,6 @@

#include "gpu/config/gpu_info_collector.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

-#include "ui/gl/gl_implementation.h"

#include "ui/gl/gl_mock.h"

using ::gfx::MockGLInterface;

@@ -21,11 +20,6 @@ class GPUInfoCollectorTest : public testing::Test {

virtual ~GPUInfoCollectorTest() { }

virtual void SetUp() {

- // TODO(kbr): make this setup robust in the case where

- // GLSurface::InitializeOneOff() has already been called by

- // another unit test. http://crbug.com/100285

- gfx::SetGLGetProcAddressProc(gfx::MockGLInterface::GetGLProcAddress);

- gfx::InitializeStaticGLBindings(gfx::kGLImplementationMockGL);

gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());

::gfx::MockGLInterface::SetGLInterface(gl_.get());

#if defined(OS_WIN)