More out-of-lining of test code, along with a bunch of GMOCK objects.

Most notably, rename various mock_objects.h files in remoting/ because after deinlining, there were compile failures. This fixes Windows compiling because you can't have two implementation files with the same name in a project, even if they are in different directories. (The output from one compile will clobber the others!)

BUG=none
TEST=compiles

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

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

2 files changed, 7 insertions, 0 deletions

diff --git a/media/tools/omx_test/file_reader_util.cc b/media/tools/omx_test/file_reader_util.cc
index 1ba7cea..a599d2f 100644
--- a/media/tools/omx_test/file_reader_util.cc
+++ b/media/tools/omx_test/file_reader_util.cc
@@ -46,6 +46,8 @@ YuvFileReader::YuvFileReader(const FilePath& path,
       output_nv21_(enable_csc) {
 }
 
+YuvFileReader::~YuvFileReader() {}
+
 void YuvFileReader::Read(uint8** output, int* size) {
   if (!file()) {
     *size = 0;
@@ -230,6 +232,8 @@ H264FileReader::H264FileReader(const FilePath& path)
       used_(0) {
 }
 
+H264FileReader::~H264FileReader() {}
+
 void H264FileReader::Read(uint8** output, int *size) {
   // Fill the buffer when it's less than half full.
   int read = 0;
diff --git a/media/tools/omx_test/file_reader_util.h b/media/tools/omx_test/file_reader_util.h
index 4bd028f..01216e8 100644
--- a/media/tools/omx_test/file_reader_util.h
+++ b/media/tools/omx_test/file_reader_util.h
@@ -61,6 +61,8 @@ class YuvFileReader : public BasicFileReader {
                 int height,
                 int loop_count,
                 bool output_nv21);
+  virtual ~YuvFileReader();
+
   virtual void Read(uint8** output, int* size);
 
  private:
@@ -105,6 +107,7 @@ class FFmpegFileReader : public FileReader {
 class H264FileReader : public BasicFileReader {
  public:
   explicit H264FileReader(const FilePath& path);
+  virtual ~H264FileReader();
   virtual void Read(uint8** output, int* size);
 
  private: