Duplicate VideoEncodeAccelerator::SupportedProfile in gpu_info.h.

content/common/gpu/media/vaapi_video_encode_accelerator.cc

 // Copyright 2014 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 "content/common/gpu/media/vaapi_video_encode_accelerator.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 86 matching lines @@
 };
 
 struct VaapiVideoEncodeAccelerator::BitstreamBufferRef {
   BitstreamBufferRef(int32 id, scoped_ptr<base::SharedMemory> shm, size_t size)
       : id(id), shm(shm.Pass()), size(size) {}
   const int32 id;
   const scoped_ptr<base::SharedMemory> shm;
   const size_t size;
 };
 
-std::vector<media::VideoEncodeAccelerator::SupportedProfile>
+std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
 VaapiVideoEncodeAccelerator::GetSupportedProfiles() {
-  std::vector<SupportedProfile> profiles;
+  std::vector<gpu::VideoEncodeAcceleratorSupportedProfile> profiles;
 
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode))
     return profiles;
 
   std::vector<media::VideoCodecProfile> hw_profiles =
       VaapiWrapper::GetSupportedEncodeProfiles(
           x_display_, base::Bind(&base::DoNothing));
 
-  media::VideoEncodeAccelerator::SupportedProfile profile;
+  gpu::VideoEncodeAcceleratorSupportedProfile profile;
   profile.max_resolution.SetSize(1920, 1088);
   profile.max_framerate_numerator = kDefaultFramerate;
   profile.max_framerate_denominator = 1;
   for (size_t i = 0; i < hw_profiles.size(); i++) {
     profile.profile = hw_profiles[i];
     profiles.push_back(profile);
   }
   return profiles;
 }
 
@@ skipping 929 matching lines @@
 }
 
 VaapiVideoEncodeAccelerator::EncodeJob::EncodeJob()
     : coded_buffer(VA_INVALID_ID), keyframe(false) {
 }
 
 VaapiVideoEncodeAccelerator::EncodeJob::~EncodeJob() {
 }
 
 }  // namespace content