Revert 226305 "Fix code style and gyp files in cast to build cas..."

media/cast/video_receiver/video_decoder_unittest.cc

 // Copyright 2013 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 "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_thread.h"
@@ skipping 17 matching lines @@
     public base::RefCountedThreadSafe<TestVideoDecoderCallback> {
  public:
   TestVideoDecoderCallback()
       : num_called_(0) {}
   void DecodeComplete(scoped_ptr<I420VideoFrame> frame,
       const base::TimeTicks render_time) {
     num_called_++;
   }
 
   int number_times_called() {return num_called_;}
-
- protected:
-  virtual ~TestVideoDecoderCallback() {}
-
  private:
-  friend class base::RefCountedThreadSafe<TestVideoDecoderCallback>;
-
   int num_called_;
 };
 
 class VideoDecoderTest : public ::testing::Test {
  protected:
   VideoDecoderTest() {
     // Configure to vp8.
     config_.codec = kVp8;
     config_.use_external_decoder = false;
     video_decoder_callback_ = new TestVideoDecoderCallback();
   }
 
-  virtual ~VideoDecoderTest() {}
+  ~VideoDecoderTest() {}
   virtual void SetUp() {
     task_runner_ = new test::FakeTaskRunner(&testing_clock_);
     cast_thread_ = new CastThread(task_runner_, NULL, NULL,
                                   NULL, task_runner_);
     decoder_ = new VideoDecoder(cast_thread_, config_);
   }
 
   scoped_refptr<VideoDecoder> decoder_;
   VideoReceiverConfig config_;
   EncodedVideoFrame encoded_frame_;
@@ skipping 21 matching lines @@
                  video_decoder_callback_.get());
   encoded_frame_.data.assign(kFrameSize, 0);
   encoded_frame_.codec = kExternalVideo;
   EXPECT_DEATH(decoder_->DecodeVideoFrame(&encoded_frame_, render_time,
       frame_decoded_callback, base::Bind(ReleaseFrame, &encoded_frame_)),
           "Invalid codec");
 }
 
 }  // namespace cast
 }  // namespace media