gpu/command_buffer/service/feature_info_unittest.cc - Issue 1135943002: Pull in various gpu/command_buffer fixes from chromium

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/command_buffer/service/feature_info_unittest.cc

Issue 1135943002: Pull in various gpu/command_buffer fixes from chromium (Closed) Base URL: git@github.com:domokit/mojo.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:

Index: gpu/command_buffer/service/feature_info_unittest.cc

diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc

index 177ef1038b73cc99693e11f935f65ab11b12dc58..f4526b57e97460ef925cb679c58e3457eca77698 100644

--- a/gpu/command_buffer/service/feature_info_unittest.cc

+++ b/gpu/command_buffer/service/feature_info_unittest.cc

@@ -8,10 +8,10 @@

#include "base/memory/scoped_ptr.h"

#include "base/strings/string_number_conversions.h"

#include "gpu/command_buffer/service/gpu_service_test.h"

-#include "gpu/command_buffer/service/gpu_switches.h"

#include "gpu/command_buffer/service/test_helper.h"

#include "gpu/command_buffer/service/texture_manager.h"

#include "gpu/config/gpu_driver_bug_workaround_type.h"

+#include "gpu/config/gpu_switches.h"

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

#include "ui/gl/gl_fence.h"

#include "ui/gl/gl_implementation.h"