Revert the "out-of-lining of test code" change within src/media

to see if it fixes the gmock crashes we've been seeing since the
change has been made.

The original change was split between r74660, r74168, r74059

Review URL: http://codereview.chromium.org/6473006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74700 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 22 deletions

diff --git a/media/video/video_mock_objects.h b/media/video/mock_objects.h
index 1a9592c..c0f3dd9 100644
--- a/media/video/video_mock_objects.h
+++ b/media/video/mock_objects.h
@@ -13,8 +13,8 @@ namespace media {
 
 class MockVideoDecodeEngine : public VideoDecodeEngine {
  public:
-  MockVideoDecodeEngine();
-  virtual ~MockVideoDecodeEngine();
+  MockVideoDecodeEngine() {}
+  virtual ~MockVideoDecodeEngine() {}
 
   MOCK_METHOD4(Initialize, void(MessageLoop* message_loop,
                                 EventHandler* event_handler,
@@ -32,8 +32,8 @@ class MockVideoDecodeEngine : public VideoDecodeEngine {
 
 class MockVideoDecodeContext : public VideoDecodeContext {
  public:
-  MockVideoDecodeContext();
-  virtual ~MockVideoDecodeContext();
+  MockVideoDecodeContext() {}
+  virtual ~MockVideoDecodeContext() {}
 
   MOCK_METHOD0(GetDevice, void*());
   MOCK_METHOD6(AllocateVideoFrames, void(
diff --git a/media/video/video_mock_objects.cc b/media/video/video_mock_objects.cc
deleted file mode 100644
index 5873b59..0000000
--- a/media/video/video_mock_objects.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2010 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 "media/video/video_mock_objects.h"
-
-namespace media {
-
-MockVideoDecodeEngine::MockVideoDecodeEngine() {}
-
-MockVideoDecodeEngine::~MockVideoDecodeEngine() {}
-
-MockVideoDecodeContext::MockVideoDecodeContext() {}
-
-MockVideoDecodeContext::~MockVideoDecodeContext() {}
-
-
-}  // namespace media