Duplicate VideoEncodeAccelerator::SupportedProfile in gpu_info.h.

gpu/config/gpu_info.cc

 // 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.
 
 #include "gpu/config/gpu_info.h"
 
 namespace {
 
 void EnumerateGPUDevice(gpu::GPUInfo::Enumerator* enumerator,
                         const gpu::GPUInfo::GPUDevice& device) {
   enumerator->BeginGPUDevice();
   enumerator->AddInt("vendorId", device.vendor_id);
   enumerator->AddInt("deviceId", device.device_id);
   enumerator->AddBool("active", device.active);
   enumerator->AddString("vendorString", device.vendor_string);
   enumerator->AddString("deviceString", device.device_string);
   enumerator->EndGPUDevice();
 }
 
 void EnumerateVideoEncodeAcceleratorSupportedProfile(
     gpu::GPUInfo::Enumerator* enumerator,
-    const media::VideoEncodeAccelerator::SupportedProfile profile) {
+    const gpu::VideoEncodeAcceleratorSupportedProfile profile) {
   enumerator->BeginVideoEncodeAcceleratorSupportedProfile();
   enumerator->AddInt("profile", profile.profile);
   enumerator->AddInt("maxResolutionWidth", profile.max_resolution.width());
   enumerator->AddInt("maxResolutionHeight", profile.max_resolution.height());
   enumerator->AddInt("maxFramerateNumerator", profile.max_framerate_numerator);
   enumerator->AddInt("maxFramerateDenominator",
                      profile.max_framerate_denominator);
   enumerator->EndVideoEncodeAcceleratorSupportedProfile();
 }
 
@@ skipping 61 matching lines @@
     bool software_rendering;
     bool direct_rendering;
     bool sandboxed;
     int process_crash_count;
     CollectInfoResult basic_info_state;
     CollectInfoResult context_info_state;
 #if defined(OS_WIN)
     CollectInfoResult dx_diagnostics_info_state;
     DxDiagNode dx_diagnostics;
 #endif
-    std::vector<media::VideoEncodeAccelerator::SupportedProfile>
+    std::vector<VideoEncodeAcceleratorSupportedProfile>
         video_encode_accelerator_supported_profiles;
   };
 
   // If this assert fails then most likely something below needs to be updated.
   // Note that this assert is only approximate. If a new field is added to
   // GPUInfo which fits within the current padding then it will not be caught.
   COMPILE_ASSERT(
       sizeof(GPUInfo) == sizeof(GPUInfoKnownFields),
       Fields_Have_Changed_In_GPUInfo_So_Update_Below);
 
@@ skipping 45 matching lines @@
   // TODO(kbr): add dx_diagnostics on Windows.
   for (size_t ii = 0; ii < video_encode_accelerator_supported_profiles.size();
        ++ii) {
     EnumerateVideoEncodeAcceleratorSupportedProfile(
         enumerator, video_encode_accelerator_supported_profiles[ii]);
   }
   enumerator->EndAuxAttributes();
 }
 
 }  // namespace gpu