Revert of Use the updated AMD switchable info collection code.

gpu/config/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 GPU_CONFIG_GPU_INFO_COLLECTOR_H_
 #define GPU_CONFIG_GPU_INFO_COLLECTOR_H_
 
 #include "base/basictypes.h"
 #include "build/build_config.h"
 #include "gpu/config/gpu_info.h"
@@ skipping 48 matching lines @@
 // stage.
 GPU_EXPORT void MergeGPUInfo(GPUInfo* basic_gpu_info,
                              const GPUInfo& context_gpu_info);
 
 // MergeGPUInfo() when GL driver is used.
 GPU_EXPORT void MergeGPUInfoGL(GPUInfo* basic_gpu_info,
                                const GPUInfo& context_gpu_info);
 
 // Advanced Micro Devices has interesting configurations on laptops were
 // there are two videocards that can alternatively a given process output.
-// TODO(zmo): remove them when we remove the GetAMDVideocardType() in the
-//            internal src/third_party/amd.
 enum AMDVideoCardType {
   UNKNOWN,
   STANDALONE,
   INTEGRATED,
   SWITCHABLE
 };
 
 }  // namespace gpu
 
 #endif  // GPU_CONFIG_GPU_INFO_COLLECTOR_H_