diff options
author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 16:48:16 +0000 |
---|---|---|
committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 16:48:16 +0000 |
commit | e758d4cabf8a5ba6b1cc7a5c50ba332dd22cd55b (patch) | |
tree | 795415902e6998ef5ee9797a06801c6fd1c8e055 /jingle/notifier/base/weak_xmpp_client_unittest.cc | |
parent | ae2dfa8a611aa8d7301fcc3765c24b1f5fa8c9c5 (diff) | |
download | chromium_src-e758d4cabf8a5ba6b1cc7a5c50ba332dd22cd55b.zip chromium_src-e758d4cabf8a5ba6b1cc7a5c50ba332dd22cd55b.tar.gz chromium_src-e758d4cabf8a5ba6b1cc7a5c50ba332dd22cd55b.tar.bz2 |
Update webrtc&libjingle 6774:6825.
BUG=N/A
R=hellner@chromium.org
TBR=darin@chromium.org, hclam@chromium.org, jochen@chromium.org, palmer@chromium.org, wez@chromium.org
Commit on behalf of hellner@. Original CL tried and approved in https://codereview.chromium.org/429113002/
Review URL: https://codereview.chromium.org/450463002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/notifier/base/weak_xmpp_client_unittest.cc')
-rw-r--r-- | jingle/notifier/base/weak_xmpp_client_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jingle/notifier/base/weak_xmpp_client_unittest.cc b/jingle/notifier/base/weak_xmpp_client_unittest.cc index c1058e9..a4c9c7b 100644 --- a/jingle/notifier/base/weak_xmpp_client_unittest.cc +++ b/jingle/notifier/base/weak_xmpp_client_unittest.cc @@ -9,9 +9,9 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "jingle/glue/task_pump.h" -#include "talk/base/sigslot.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/base/sigslot.h" namespace notifier { |