Revert 279958 "Revert "Revert 279650 "Add VaapiVideoEncodeAccele..."

trunk/src/content/common/gpu/media/vaapi_h264_decoder_unittest.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 <string>
 
 // This has to be included first.
 // See http://code.google.com/p/googletest/issues/detail?id=371
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 109 matching lines @@
                                       base::FilePath output_file) {
   x_display_ = XOpenDisplay(NULL);
   if (!x_display_) {
     LOG(ERROR) << "Can't open X display";
     return false;
   }
 
   media::VideoCodecProfile profile = media::H264PROFILE_BASELINE;
   base::Closure report_error_cb =
       base::Bind(&LogOnError, VaapiH264Decoder::VAAPI_ERROR);
-  wrapper_ = VaapiWrapper::Create(
-      VaapiWrapper::kDecode, profile, x_display_, report_error_cb);
+  wrapper_ = VaapiWrapper::Create(profile, x_display_, report_error_cb);
   if (!wrapper_.get()) {
     LOG(ERROR) << "Can't create vaapi wrapper";
     return false;
   }
 
   decoder_.reset(new VaapiH264Decoder(
       wrapper_.get(),
       base::Bind(&VaapiH264DecoderLoop::OutputPicture, base::Unretained(this)),
       base::Bind(&LogOnError)));
 
@@ skipping 235 matching lines @@
       content::g_md5sum = it->second;
       continue;
     }
     if (it->first == "v" || it->first == "vmodule")
       continue;
     LOG(FATAL) << "Unexpected switch: " << it->first << ":" << it->second;
   }
 
   return RUN_ALL_TESTS();
 }