Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(804)

Unified Diff: remoting/jingle_glue/jingle_glue_mock_objects.h

Issue 6250198: More out-of-lining of test code, along with a bunch of GMOCK objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Really fix the gyp files this time Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/jingle_glue/jingle_glue_mock_objects.h
diff --git a/remoting/jingle_glue/mock_objects.h b/remoting/jingle_glue/jingle_glue_mock_objects.h
similarity index 73%
rename from remoting/jingle_glue/mock_objects.h
rename to remoting/jingle_glue/jingle_glue_mock_objects.h
index 08e3cea9103af51f798d7fd7d8b879d8146d535c..505e563a4eb52b4405992d10937af41d638d3249 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_

Powered by Google App Engine
This is Rietveld 408576698