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
dednal · May 7, 2014 · 402ed25 · 402ed25
1 parent b233a58
commit 402ed25
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 20 deletions.
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -710,8 +710,8 @@ TEST_PPAPI_IN_PROCESS(Memory)
 TEST_PPAPI_OUT_OF_PROCESS(Memory)
 TEST_PPAPI_NACL(Memory)
 
-TEST_PPAPI_IN_PROCESS(VideoDecoder)
-TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder)
+TEST_PPAPI_IN_PROCESS(VideoDecoderDev)
+TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev)
 
 // FileIO tests.
 #define RUN_FILEIO_SUBTESTS \

diff --git a/ppapi/examples/video_decode/video_decode.cc → ...examples/video_decode/video_decode_dev.cc b/ppapi/examples/video_decode/video_decode.cc → ...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/...i/examples/video_decode/video_decode.html → ...amples/video_decode/video_decode_dev.html b/...i/examples/video_decode/video_decode.html → ...amples/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
@@ -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
@@ -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 → ppapi/tests/test_video_decoder_dev.cc b/ppapi/tests/test_video_decoder.cc → 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 → ppapi/tests/test_video_decoder_dev.h b/ppapi/tests/test_video_decoder.h → ppapi/tests/test_video_decoder_dev.h
@@ -2,18 +2,19 @@
 // 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>
 
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
 #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_