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/remoting.gyp | |
| 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/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 88b75ce..0ee8142 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -468,19 +468,21 @@ 'host/access_verifier_unittest.cc', 'host/chromoting_host_context_unittest.cc', 'host/chromoting_host_unittest.cc', - 'host/differ_unittest.cc', 'host/differ_block_unittest.cc', + 'host/differ_unittest.cc', 'host/heartbeat_sender_unittest.cc', 'host/host_key_pair_unittest.cc', + 'host/host_mock_objects.cc', + 'host/host_mock_objects.h', 'host/json_host_config_unittest.cc', - 'host/mock_objects.h', 'host/screen_recorder_unittest.cc', 'host/test_key_pair.h', 'jingle_glue/channel_socket_adapter_unittest.cc', + 'jingle_glue/iq_request_unittest.cc', 'jingle_glue/jingle_client_unittest.cc', + 'jingle_glue/jingle_glue_mock_objects.cc', + 'jingle_glue/jingle_glue_mock_objects.h', 'jingle_glue/jingle_thread_unittest.cc', - 'jingle_glue/iq_request_unittest.cc', - 'jingle_glue/mock_objects.h', 'jingle_glue/stream_socket_adapter_unittest.cc', 'protocol/connection_to_client_unittest.cc', 'protocol/fake_session.cc', @@ -488,7 +490,8 @@ 'protocol/jingle_session_unittest.cc', 'protocol/message_decoder_unittest.cc', 'protocol/message_reader_unittest.cc', - 'protocol/mock_objects.h', + 'protocol/protocol_mock_objects.cc', + 'protocol/protocol_mock_objects.h', 'protocol/rtp_video_reader_unittest.cc', 'protocol/rtp_video_writer_unittest.cc', 'protocol/session_manager_pair.cc', |