diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-07 16:07:33 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-07 16:07:33 +0000 |
| commit | 402ed256c68272cef07fb4590f5aad68ca24bdcd (patch) | |
| tree | dcdd852f6ac3a685b0c91f6a4d6817016aa659c4 /ppapi | |
| parent | b233a5810373eb44f8ad060504fae8ef23a54bc4 (diff) | |
| download | chromium_src-402ed256c68272cef07fb4590f5aad68ca24bdcd.zip chromium_src-402ed256c68272cef07fb4590f5aad68ca24bdcd.tar.gz chromium_src-402ed256c68272cef07fb4590f5aad68ca24bdcd.tar.bz2 | |
Rename PPB_VideoDecoder_Dev test and example code to avoid collisions.
BUG=281689
R=fischman@chromium.org, teravest@chromium.org
Review URL: https://codereview.chromium.org/269283002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268797 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/examples/video_decode/video_decode_dev.cc (renamed from ppapi/examples/video_decode/video_decode.cc) | 2 | ||||
| -rw-r--r-- | ppapi/examples/video_decode/video_decode_dev.html (renamed from ppapi/examples/video_decode/video_decode.html) | 4 | ||||
| -rw-r--r-- | ppapi/ppapi_sources.gypi | 4 | ||||
| -rw-r--r-- | ppapi/ppapi_tests.gypi | 4 | ||||
| -rw-r--r-- | ppapi/tests/test_video_decoder_dev.cc (renamed from ppapi/tests/test_video_decoder.cc) | 12 | ||||
| -rw-r--r-- | ppapi/tests/test_video_decoder_dev.h (renamed from ppapi/tests/test_video_decoder.h) | 11 |
6 files changed, 19 insertions, 18 deletions
diff --git a/ppapi/examples/video_decode/video_decode.cc b/ppapi/examples/video_decode/video_decode_dev.cc index d1f7181..d6cb592 100644 --- a/ppapi/examples/video_decode/video_decode.cc +++ b/ppapi/examples/video_decode/video_decode_dev.cc @@ -5,10 +5,10 @@ #include <string.h> #include <iostream> -#include <sstream> #include <list> #include <map> #include <set> +#include <sstream> #include <vector> #include "ppapi/c/pp_errors.h" diff --git a/ppapi/examples/video_decode/video_decode.html b/ppapi/examples/video_decode/video_decode_dev.html index 13d42fc..8e098ca 100644 --- a/ppapi/examples/video_decode/video_decode.html +++ b/ppapi/examples/video_decode/video_decode_dev.html @@ -6,12 +6,12 @@ found in the LICENSE file. --> <head> - <title>Video Decode Example</title> + <title>Video Decode (Dev) Example</title> </head> <body> -<embed id="plugin" type="application/x-ppapi-example-video-decode" +<embed id="plugin" type="application/x-ppapi-example-video-decode-dev" width="640" height="480"/> </body> diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi index 6f72e03..43a17dd 100644 --- a/ppapi/ppapi_sources.gypi +++ b/ppapi/ppapi_sources.gypi @@ -569,8 +569,8 @@ 'tests/test_url_util.h', 'tests/test_utils.cc', 'tests/test_utils.h', - 'tests/test_video_decoder.cc', - 'tests/test_video_decoder.h', + 'tests/test_video_decoder_dev.cc', + 'tests/test_video_decoder_dev.h', 'tests/test_x509_certificate_private.cc', 'tests/test_x509_certificate_private.h', diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi index e6d4156..da4b026 100644 --- a/ppapi/ppapi_tests.gypi +++ b/ppapi/ppapi_tests.gypi @@ -443,7 +443,7 @@ ], }, { - 'target_name': 'ppapi_example_video_decode', + 'target_name': 'ppapi_example_video_decode_dev', 'dependencies': [ 'ppapi_example_skeleton', 'ppapi.gyp:ppapi_cpp', @@ -453,7 +453,7 @@ 'lib/gl/include', ], 'sources': [ - 'examples/video_decode/video_decode.cc', + 'examples/video_decode/video_decode_dev.cc', 'examples/video_decode/testdata.h', ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. diff --git a/ppapi/tests/test_video_decoder.cc b/ppapi/tests/test_video_decoder_dev.cc index dc36685..86c2c13 100644 --- a/ppapi/tests/test_video_decoder.cc +++ b/ppapi/tests/test_video_decoder_dev.cc @@ -2,30 +2,30 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ppapi/tests/test_video_decoder.h" +#include "ppapi/tests/test_video_decoder_dev.h" #include "ppapi/c/dev/ppb_video_decoder_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_var.h" #include "ppapi/tests/testing_instance.h" -REGISTER_TEST_CASE(VideoDecoder); +REGISTER_TEST_CASE(VideoDecoderDev); -bool TestVideoDecoder::Init() { +bool TestVideoDecoderDev::Init() { video_decoder_interface_ = static_cast<const PPB_VideoDecoder_Dev*>( pp::Module::Get()->GetBrowserInterface(PPB_VIDEODECODER_DEV_INTERFACE)); return video_decoder_interface_ && CheckTestingInterface(); } -void TestVideoDecoder::RunTests(const std::string& filter) { +void TestVideoDecoderDev::RunTests(const std::string& filter) { RUN_TEST(CreateFailure, filter); } -void TestVideoDecoder::QuitMessageLoop() { +void TestVideoDecoderDev::QuitMessageLoop() { testing_interface_->QuitMessageLoop(instance_->pp_instance()); } -std::string TestVideoDecoder::TestCreateFailure() { +std::string TestVideoDecoderDev::TestCreateFailure() { PP_Resource decoder = video_decoder_interface_->Create( instance_->pp_instance(), 0, static_cast<PP_VideoDecoder_Profile>(-1)); if (decoder != 0) diff --git a/ppapi/tests/test_video_decoder.h b/ppapi/tests/test_video_decoder_dev.h index e6d7e66..6a13ca3 100644 --- a/ppapi/tests/test_video_decoder.h +++ b/ppapi/tests/test_video_decoder_dev.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef PPAPI_TESTS_TEST_VIDEO_DECODER_H_ -#define PPAPI_TESTS_TEST_VIDEO_DECODER_H_ +#ifndef PPAPI_TESTS_TEST_VIDEO_DECODER_DEV_H_ +#define PPAPI_TESTS_TEST_VIDEO_DECODER_DEV_H_ #include <string> @@ -11,9 +11,10 @@ #include "ppapi/c/pp_stdint.h" #include "ppapi/tests/test_case.h" -class TestVideoDecoder : public TestCase { +class TestVideoDecoderDev : public TestCase { public: - explicit TestVideoDecoder(TestingInstance* instance) : TestCase(instance) {} + explicit TestVideoDecoderDev(TestingInstance* instance) + : TestCase(instance) {} // TestCase implementation. virtual bool Init(); @@ -28,4 +29,4 @@ class TestVideoDecoder : public TestCase { const PPB_VideoDecoder_Dev* video_decoder_interface_; }; -#endif // PPAPI_TESTS_TEST_VIDEO_DECODER_H_ +#endif // PPAPI_TESTS_TEST_VIDEO_DECODER_DEV_H_ |