diff options
| author | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 23:50:09 +0000 |
|---|---|---|
| committer | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 23:50:09 +0000 |
| commit | d08baed84e8aed2343a697c6d1627d3b456e3e02 (patch) | |
| tree | 7dd88c7c6b82475919881932340d314a9ef9ed72 /jingle/glue/mock_task.cc | |
| parent | 504cc9199a69d10a4a2296697afb4736e1b53231 (diff) | |
| download | chromium_src-d08baed84e8aed2343a697c6d1627d3b456e3e02.zip chromium_src-d08baed84e8aed2343a697c6d1627d3b456e3e02.tar.gz chromium_src-d08baed84e8aed2343a697c6d1627d3b456e3e02.tar.bz2 | |
Revert "Update webrtc&libjingle 6774:6799."
This reverts commit bf45dff0ca703e5ad3bb6c6754ebdcb0c1b1296a.
(https://codereview.chromium.org/429253003)
Broke sizes on Linux
http://build.chromium.org/p/chromium/builders/Linux/builds/51786
https://code.google.com/p/webrtc/source/browse/trunk/webrtc/base/linux.cc
defines static std::string lsb_release_string; among other things
It's guarded in WEBRTC_CHROMIUM_BUILDs. Maybe it should be
WEBRTC_CHROMIUM_BUILD.
BUG=NONE
TBR=darin@chromium.org, hclam@chromium.org, jochen@chromium.org, palmer@chromium.org, sergeyu@chromium.org, wez@chromium.org, ronghuawu@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/435823002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/glue/mock_task.cc')
| -rw-r--r-- | jingle/glue/mock_task.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jingle/glue/mock_task.cc b/jingle/glue/mock_task.cc index f9de76c..8894fbe 100644 --- a/jingle/glue/mock_task.cc +++ b/jingle/glue/mock_task.cc @@ -6,7 +6,7 @@ namespace jingle_glue { -MockTask::MockTask(TaskParent* parent) : rtc::Task(parent) {} +MockTask::MockTask(TaskParent* parent) : talk_base::Task(parent) {} MockTask::~MockTask() {} |