Move rtc_video_decoder* from media/filter/ to content/renderer/media/.

media/base/pipeline_impl_unittest.cc

 // Copyright (c) 2011 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>
 
 #include "base/callback.h"
 #include "base/stl_util-inl.h"
 #include "base/threading/simple_thread.h"
 #include "media/base/pipeline_impl.h"
@@ skipping 16 matching lines @@
 
 namespace media {
 
 // Total bytes of the data source.
 static const int kTotalBytes = 1024;
 
 // Buffered bytes of the data source.
 static const int kBufferedBytes = 1024;
 
 // Test url for raw video pipeline.
-static const std::string kUrlMedia = "media://raw_video_stream";
+static const char kUrlRawVideo[] = "://raw_video_stream";

[scherkus (not reviewing), 2011/06/29 00:39:28]

why not just append the x-raw-video: scheme here and avoid the append?

[Ronghua, 2011/06/29 20:36:39]

I don't want to hard code the "x-raw-media" here, but I don't know how to append
kRawMediaScheme to kUrlRawVideo here.

 
 // Used for setting expectations on pipeline callbacks.  Using a StrictMock
 // also lets us test for missing callbacks.
 class CallbackHelper {
  public:
   CallbackHelper() {}
   virtual ~CallbackHelper() {}
 
   MOCK_METHOD1(OnStart, void(PipelineStatus));
   MOCK_METHOD1(OnSeek, void(PipelineStatus));
@@ skipping 151 matching lines @@
     InitializePipeline(build_status, start_status, "");
   }
 
   void InitializePipeline(PipelineStatus build_status,
                           PipelineStatus start_status,
                           const std::string& url) {
     // Expect an initialization callback.
     EXPECT_CALL(callbacks_, OnStart(start_status));
 
     bool run_build = true;
-    if (url.compare(kUrlMedia) == 0)
+    if (url.find(kRawMediaScheme) == 0)
         run_build = false;

[scherkus (not reviewing), 2011/06/29 00:39:28]

this is over-indented -- can you fix?

[Ronghua, 2011/06/29 20:36:39]

Done.

 
     pipeline_->Start(mocks_->filter_collection(true,
                                                true,
                                                run_build,
                                                build_status),
                      url,
                      NewCallback(reinterpret_cast<CallbackHelper*>(&callbacks_),
                                  &CallbackHelper::OnStart));
 
     message_loop_.RunAllPending();
@@ skipping 202 matching lines @@
   InitializePipeline(PIPELINE_OK);
   EXPECT_TRUE(pipeline_->IsInitialized());
   EXPECT_FALSE(pipeline_->HasAudio());
   EXPECT_TRUE(pipeline_->HasVideo());
 }
 
 TEST_F(PipelineImplTest, RawVideoStream) {
   InitializeVideoDecoder(NULL);
   InitializeVideoRenderer();
 
-  InitializePipeline(PIPELINE_OK, PIPELINE_OK, kUrlMedia);
+  InitializePipeline(PIPELINE_OK, PIPELINE_OK,
+      std::string(kRawMediaScheme).append(kUrlRawVideo));
   EXPECT_TRUE(pipeline_->IsInitialized());
   EXPECT_FALSE(pipeline_->HasAudio());
   EXPECT_TRUE(pipeline_->HasVideo());
 }
 
 TEST_F(PipelineImplTest, AudioVideoStream) {
   CreateAudioStream();
   CreateVideoStream();
   MockDemuxerStreamVector streams;
   streams.push_back(audio_stream());
@@ skipping 448 matching lines @@
   TestPipelineStatusNotification(0);
 }
 
 // Test that different-thread, some-delay callback (the expected common case)
 // works correctly.
 TEST(PipelineStatusNotificationTest, DelayedCallback) {
   TestPipelineStatusNotification(20);
 }
 
 }  // namespace media