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

3 files changed, 20 insertions, 6 deletions

diff --git a/remoting/jingle_glue/jingle_glue_mock_objects.cc b/remoting/jingle_glue/jingle_glue_mock_objects.cc
new file mode 100644
index 0000000..4ec59e7
--- /dev/null
+++ b/remoting/jingle_glue/jingle_glue_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/jingle_glue/jingle_glue_mock_objects.h"
+
+namespace remoting {
+
+MockStream::MockStream() {}
+
+MockStream::~MockStream() {}
+
+}  // namespace remoting
diff --git a/remoting/jingle_glue/mock_objects.h b/remoting/jingle_glue/jingle_glue_mock_objects.h
index 08e3cea..505e563 100644
--- a/remoting/jingle_glue/mock_objects.h
+++ b/remoting/jingle_glue/jingle_glue_mock_objects.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef REMOTING_JINGLE_GLUE_MOCK_OBJECTS_H_
-#define REMOTING_JINGLE_GLUE_MOCK_OBJECTS_H_
+#ifndef REMOTING_JINGLE_GLUE_JINGLE_GLUE_MOCK_OBJECTS_H_
+#define REMOTING_JINGLE_GLUE_JINGLE_GLUE_MOCK_OBJECTS_H_
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/libjingle/source/talk/base/stream.h"
@@ -12,7 +12,8 @@ namespace remoting {
 
 class MockStream : public talk_base::StreamInterface {
  public:
-  virtual ~MockStream() { }
+  MockStream();
+  virtual ~MockStream();
 
   MOCK_CONST_METHOD0(GetState, talk_base::StreamState());
 
@@ -28,4 +29,4 @@ class MockStream : public talk_base::StreamInterface {
 
 }  // namespace remoting
 
-#endif  // REMOTING_JINGLE_GLUE_MOCK_OBJECTS_H_
+#endif  // REMOTING_JINGLE_GLUE_JINGLE_GLUE_MOCK_OBJECTS_H_
diff --git a/remoting/jingle_glue/stream_socket_adapter_unittest.cc b/remoting/jingle_glue/stream_socket_adapter_unittest.cc
index 01997dc..3a7df0f 100644
--- a/remoting/jingle_glue/stream_socket_adapter_unittest.cc
+++ b/remoting/jingle_glue/stream_socket_adapter_unittest.cc
@@ -9,7 +9,7 @@
 #include "net/base/net_errors.h"
 #include "net/socket/socket.h"
 #include "remoting/jingle_glue/stream_socket_adapter.h"
-#include "remoting/jingle_glue/mock_objects.h"
+#include "remoting/jingle_glue/jingle_glue_mock_objects.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/p2p/base/transportchannel.h"