diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-10 04:22:08 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-10 04:22:08 +0000 |
| commit | 40108058c3c6e8243d0fe60c0a1b5985133de4f6 (patch) | |
| tree | 0c76d6cfce3c45d01ea5ad2749e82ec8bf4b3fc9 /jingle | |
| parent | 86b87fda182e9701ee491f58b3b119dedfcfe691 (diff) | |
| download | chromium_src-40108058c3c6e8243d0fe60c0a1b5985133de4f6.zip chromium_src-40108058c3c6e8243d0fe60c0a1b5985133de4f6.tar.gz chromium_src-40108058c3c6e8243d0fe60c0a1b5985133de4f6.tar.bz2 | |
Roll libjingle 291:294.
Fix a bug in content_browsertest (callWithoutMsidAndBundle). It works previously because there's another bug in sdp parser, so two wrongs make it right.
Review URL: https://codereview.chromium.org/12717003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/channel_socket_adapter_unittest.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc index 6a51640..c9b0bb7 100644 --- a/jingle/glue/channel_socket_adapter_unittest.cc +++ b/jingle/glue/channel_socket_adapter_unittest.cc @@ -38,6 +38,7 @@ class MockTransportChannel : public cricket::TransportChannel { MOCK_METHOD3(SendPacket, int(const char* data, size_t len, int flags)); MOCK_METHOD2(SetOption, int(talk_base::Socket::Option opt, int value)); MOCK_METHOD0(GetError, int()); + MOCK_CONST_METHOD0(GetRole, cricket::TransportRole()); }; class TransportChannelSocketAdapterTest : public testing::Test { |