Revert 149966 on 1180 (M21) - Merge 147334 to 1180 (M21) - Wire the AMD switchable videcard detecti…

content/gpu/gpu_info_collector.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_GPU_GPU_INFO_COLLECTOR_H_
 #define CONTENT_GPU_GPU_INFO_COLLECTOR_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "build/build_config.h"
@@ skipping 24 matching lines @@
                                            content::GPUInfo* gpu_info);
 
 // Collects D3D driver version/date through registry lookup.
 // Note that this does not require a D3D context.
 // device_id here is the raw data in DISPLAY_DEVICE.
 CONTENT_EXPORT bool CollectDriverInfoD3D(const std::wstring& device_id,
                                          content::GPUInfo* gpu_info);
 
 // Collect the DirectX Disagnostics information about the attached displays.
 bool GetDxDiagnostics(content::DxDiagNode* output);
-#endif  // OS_WIN
+#endif
 
 // All platforms have a GL version for collecting information
 CONTENT_EXPORT bool CollectGraphicsInfoGL(content::GPUInfo* gpu_info);
 
 // Collect GL and Shading language version information
 bool CollectGLVersionInfo(content::GPUInfo* gpu_info);
 
 // Platform specific method for collecting vendor and device ids
 bool CollectVideoCardInfo(content::GPUInfo* gpu_info);
 
 // 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_