summaryrefslogtreecommitdiffstats
path: root/jingle/glue/mock_task.cc
diff options
context:
space:
mode:
authorronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-31 22:19:46 +0000
committerronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-31 22:19:46 +0000
commitbf45dff0ca703e5ad3bb6c6754ebdcb0c1b1296a (patch)
treec8f5b0600665f3597d8c036411f565b6ba79515e /jingle/glue/mock_task.cc
parent00e1d2773de880b96aff7e2d33b2b0914778901f (diff)
downloadchromium_src-bf45dff0ca703e5ad3bb6c6754ebdcb0c1b1296a.zip
chromium_src-bf45dff0ca703e5ad3bb6c6754ebdcb0c1b1296a.tar.gz
chromium_src-bf45dff0ca703e5ad3bb6c6754ebdcb0c1b1296a.tar.bz2
Update webrtc&libjingle 6774:6799.
BUG=N/A R=hellner@chromium.org TBR=darin@chromium.org, hclam@chromium.org, jochen@chromium.org, palmer@chromium.org, sergeyu@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/429253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/glue/mock_task.cc')
-rw-r--r--jingle/glue/mock_task.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/jingle/glue/mock_task.cc b/jingle/glue/mock_task.cc
index 8894fbe..f9de76c 100644
--- a/jingle/glue/mock_task.cc
+++ b/jingle/glue/mock_task.cc
@@ -6,7 +6,7 @@
namespace jingle_glue {
-MockTask::MockTask(TaskParent* parent) : talk_base::Task(parent) {}
+MockTask::MockTask(TaskParent* parent) : rtc::Task(parent) {}
MockTask::~MockTask() {}