Merge 147334 to 1180 (M21) - Wire the AMD switchable videcard detection

content/gpu/gpu_info_collector.h

Index: content/gpu/gpu_info_collector.h
===================================================================
--- content/gpu/gpu_info_collector.h	(revision 149965)
+++ content/gpu/gpu_info_collector.h	(working copy)
@@ -42,7 +42,7 @@
 
 // Collect the DirectX Disagnostics information about the attached displays.
 bool GetDxDiagnostics(content::DxDiagNode* output);
-#endif
+#endif  // OS_WIN
 
 // All platforms have a GL version for collecting information
 CONTENT_EXPORT bool CollectGraphicsInfoGL(content::GPUInfo* gpu_info);
@@ -56,6 +56,15 @@
 // Each platform stores the driver version on the GL_VERSION string differently
 bool CollectDriverInfoGL(content::GPUInfo* gpu_info);
 
+// Advanced Micro Devices has interesting configurations on laptops were
+// there are two videocards that can alternatively a given process output.
+enum AMDVideoCardType {
+  UNKNOWN,
+  STANDALONE,
+  INTEGRATED,
+  SWITCHABLE
+};
+
 }  // namespace gpu_info_collector
 
 #endif  // CONTENT_GPU_GPU_INFO_COLLECTOR_H_