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

Unified Diff: jingle/glue/jingle_glue_mock_objects.h

Issue 450463002: Update webrtc&libjingle 6774:6825. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 4 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
« no previous file with comments | « jingle/glue/chrome_async_socket_unittest.cc ('k') | jingle/glue/logging_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/glue/jingle_glue_mock_objects.h
===================================================================
--- jingle/glue/jingle_glue_mock_objects.h (revision 287594)
+++ jingle/glue/jingle_glue_mock_objects.h (working copy)
@@ -6,24 +6,24 @@
#define JINGLE_GLUE_JINGLE_GLUE_MOCK_OBJECTS_H_
#include "testing/gmock/include/gmock/gmock.h"
-#include "third_party/libjingle/source/talk/base/stream.h"
+#include "third_party/webrtc/base/stream.h"
namespace jingle_glue {
-class MockStream : public talk_base::StreamInterface {
+class MockStream : public rtc::StreamInterface {
public:
MockStream();
virtual ~MockStream();
- MOCK_CONST_METHOD0(GetState, talk_base::StreamState());
+ MOCK_CONST_METHOD0(GetState, rtc::StreamState());
- MOCK_METHOD4(Read, talk_base::StreamResult(void*, size_t, size_t*, int*));
- MOCK_METHOD4(Write, talk_base::StreamResult(const void*, size_t,
+ MOCK_METHOD4(Read, rtc::StreamResult(void*, size_t, size_t*, int*));
+ MOCK_METHOD4(Write, rtc::StreamResult(const void*, size_t,
size_t*, int*));
MOCK_CONST_METHOD1(GetAvailable, bool(size_t*));
MOCK_METHOD0(Close, void());
- MOCK_METHOD3(PostEvent, void(talk_base::Thread*, int, int));
+ MOCK_METHOD3(PostEvent, void(rtc::Thread*, int, int));
MOCK_METHOD2(PostEvent, void(int, int));
};
« no previous file with comments | « jingle/glue/chrome_async_socket_unittest.cc ('k') | jingle/glue/logging_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698