From 0a071a315daf2a8af0f7b85c84127cda268db2f5 Mon Sep 17 00:00:00 2001 From: "erg@google.com" Date: Tue, 8 Feb 2011 00:18:24 +0000 Subject: 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 --- remoting/protocol/connection_to_client_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'remoting/protocol/connection_to_client_unittest.cc') diff --git a/remoting/protocol/connection_to_client_unittest.cc b/remoting/protocol/connection_to_client_unittest.cc index 1420392..42ac018 100644 --- a/remoting/protocol/connection_to_client_unittest.cc +++ b/remoting/protocol/connection_to_client_unittest.cc @@ -6,7 +6,7 @@ #include "remoting/base/mock_objects.h" #include "remoting/protocol/fake_session.h" #include "remoting/protocol/connection_to_client.h" -#include "remoting/protocol/mock_objects.h" +#include "remoting/protocol/protocol_mock_objects.h" #include "testing/gmock/include/gmock/gmock.h" using ::testing::_; -- cgit v1.1