diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 20:44:00 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 20:44:00 +0000 |
| commit | 28dc42112899ad4c118cb55ddb3af6437471243f (patch) | |
| tree | 7a536b151c9e2137c9249e85b01f9e649216367c /remoting/base | |
| parent | b2c71fa0ab3d6a1ef3a8d47b4a827d3539208da6 (diff) | |
| download | chromium_src-28dc42112899ad4c118cb55ddb3af6437471243f.zip chromium_src-28dc42112899ad4c118cb55ddb3af6437471243f.tar.gz chromium_src-28dc42112899ad4c118cb55ddb3af6437471243f.tar.bz2 | |
Another big out-of-lining of test code. Hits a lot of gmock objects
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/6413036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base')
| -rw-r--r-- | remoting/base/base_mock_objects.cc | 13 | ||||
| -rw-r--r-- | remoting/base/base_mock_objects.h (renamed from remoting/base/mock_objects.h) | 9 | ||||
| -rw-r--r-- | remoting/base/codec_test.cc | 2 |
3 files changed, 19 insertions, 5 deletions
diff --git a/remoting/base/base_mock_objects.cc b/remoting/base/base_mock_objects.cc new file mode 100644 index 0000000..d76a965 --- /dev/null +++ b/remoting/base/base_mock_objects.cc @@ -0,0 +1,13 @@ +// 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 "remoting/base/base_mock_objects.h" + +namespace remoting { + +MockEncoder::MockEncoder() {} + +MockEncoder::~MockEncoder() {} + +} // namespace remoting diff --git a/remoting/base/mock_objects.h b/remoting/base/base_mock_objects.h index 12143ad..92f17bf 100644 --- a/remoting/base/mock_objects.h +++ b/remoting/base/base_mock_objects.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef REMOTING_BASE_MOCK_OBJECTS_H_ -#define REMOTING_BASE_MOCK_OBJECTS_H_ +#ifndef REMOTING_BASE_BASE_MOCK_OBJECTS_H_ +#define REMOTING_BASE_BASE_MOCK_OBJECTS_H_ #include "remoting/base/capture_data.h" #include "remoting/base/decoder.h" @@ -14,7 +14,8 @@ namespace remoting { class MockEncoder : public Encoder { public: - MockEncoder() {} + MockEncoder(); + virtual ~MockEncoder(); MOCK_METHOD3(Encode, void( scoped_refptr<CaptureData> capture_data, @@ -27,4 +28,4 @@ class MockEncoder : public Encoder { } // namespace remoting -#endif // REMOTING_BASE_MOCK_OBJECTS_H_ +#endif // REMOTING_BASE_BASE_MOCK_OBJECTS_H_ diff --git a/remoting/base/codec_test.cc b/remoting/base/codec_test.cc index 093eea0..bfa2d64 100644 --- a/remoting/base/codec_test.cc +++ b/remoting/base/codec_test.cc @@ -6,10 +6,10 @@ #include <stdlib.h> #include "media/base/video_frame.h" +#include "remoting/base/base_mock_objects.h" #include "remoting/base/codec_test.h" #include "remoting/base/decoder.h" #include "remoting/base/encoder.h" -#include "remoting/base/mock_objects.h" #include "remoting/base/util.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/rect.h" |