diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 00:18:24 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 00:18:24 +0000 |
| commit | 0a071a315daf2a8af0f7b85c84127cda268db2f5 (patch) | |
| tree | 6927656c616bb451c2b31605a964b9cf7529632b /remoting/host/chromoting_host_unittest.cc | |
| parent | cfbf0a1af6efcfdfdb540a59d8c167a9736a405c (diff) | |
| download | chromium_src-0a071a315daf2a8af0f7b85c84127cda268db2f5.zip chromium_src-0a071a315daf2a8af0f7b85c84127cda268db2f5.tar.gz chromium_src-0a071a315daf2a8af0f7b85c84127cda268db2f5.tar.bz2 | |
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
Diffstat (limited to 'remoting/host/chromoting_host_unittest.cc')
| -rw-r--r-- | remoting/host/chromoting_host_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc index 2a4be8c..a72b504 100644 --- a/remoting/host/chromoting_host_unittest.cc +++ b/remoting/host/chromoting_host_unittest.cc @@ -6,10 +6,10 @@ #include "remoting/host/capturer_fake.h" #include "remoting/host/chromoting_host.h" #include "remoting/host/chromoting_host_context.h" +#include "remoting/host/host_mock_objects.h" #include "remoting/host/in_memory_host_config.h" -#include "remoting/host/mock_objects.h" #include "remoting/proto/video.pb.h" -#include "remoting/protocol/mock_objects.h" +#include "remoting/protocol/protocol_mock_objects.h" #include "remoting/protocol/session_config.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" |