diff --git a/webrtc/video_engine/test/common/frame_generator_capturer.h b/webrtc/video_engine/test/common/frame_generator_capturer.h
index 40ad47e4e2..3c2ec2393a 100644
--- a/webrtc/video_engine/test/common/frame_generator_capturer.h
+++ b/webrtc/video_engine/test/common/frame_generator_capturer.h
@@ -26,6 +26,8 @@ class FrameGenerator;
 
 class FrameGeneratorCapturer : public VideoCapturer {
  public:
+  // The FrameGeneratorCapturer takes ownership of the FrameGenerator, which
+  // will be freed when the FrameGeneratorCapturer is deleted.
   static FrameGeneratorCapturer* Create(newapi::VideoSendStreamInput* input,
                                         FrameGenerator* frame_generator,
                                         int target_fps);
@@ -47,7 +49,7 @@ class FrameGeneratorCapturer : public VideoCapturer {
   scoped_ptr<EventWrapper> tick_;
   scoped_ptr<CriticalSectionWrapper> lock_;
   scoped_ptr<ThreadWrapper> thread_;
-  FrameGenerator* frame_generator_;
+  scoped_ptr<FrameGenerator> frame_generator_;
 
   int target_fps_;
 };
diff --git a/webrtc/video_engine/test/full_stack.cc b/webrtc/video_engine/test/full_stack.cc
index ba830c390c..382e89aaf0 100644
--- a/webrtc/video_engine/test/full_stack.cc
+++ b/webrtc/video_engine/test/full_stack.cc
@@ -304,18 +304,15 @@ TEST_P(FullStackTest, NoPacketLoss) {
 
   Clock* test_clock = Clock::GetRealTimeClock();
 
-  scoped_ptr<test::YuvFileFrameGenerator> file_frame_generator(
-      test::YuvFileFrameGenerator::Create(
-          test::ResourcePath(params.clip.name, "yuv").c_str(),
-          params.clip.width,
-          params.clip.height,
-          test_clock));
-  ASSERT_TRUE(file_frame_generator.get() != NULL);
-
   scoped_ptr<test::FrameGeneratorCapturer> file_capturer(
       test::FrameGeneratorCapturer::Create(
-          &analyzer, file_frame_generator.get(), params.clip.fps));
-  ASSERT_TRUE(file_capturer.get() != NULL);
+          &analyzer,
+          test::YuvFileFrameGenerator::Create(
+              test::ResourcePath(params.clip.name, "yuv").c_str(),
+              params.clip.width,
+              params.clip.height,
+              test_clock),
+          params.clip.fps));
 
   newapi::VideoReceiveStream::Config receive_config =
       call->GetDefaultReceiveConfig();