gpu/config/gpu_info_collector_linux.cc - Issue 1547793004: Make gpu black list work again on Linux

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_linux.cc

Issue 1547793004: Make gpu black list work again on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Clear existing gpu testing switches before each test Created 4 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:

Index: gpu/config/gpu_info_collector_linux.cc

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

index e201ce049ed25c4ab27721cb174251b04a4fadab..2e88ab9dae402569dc34af8f3e91649c7e19bd10 100644

--- a/gpu/config/gpu_info_collector_linux.cc

+++ b/gpu/config/gpu_info_collector_linux.cc

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

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

#include "base/message_loop/message_loop.h"

+#include "base/strings/string_number_conversions.h"

#include "base/strings/string_piece.h"

#include "base/strings/string_split.h"

#include "base/strings/string_tokenizer.h"

@@ -127,6 +128,8 @@ CollectInfoResult CollectPCIVideoCardInfo(GPUInfo* gpu_info) {

gpu.vendor_id = device->vendor_id;

gpu.device_id = device->device_id;

+ ParseTestingIds(&gpu.vendor_id, &gpu.device_id);

if (!primary_gpu_identified) {

primary_gpu_identified = true;

gpu_info->gpu = gpu;