| Index: webrtc/base/taskparent.cc
 | 
| diff --git a/webrtc/base/taskparent.cc b/webrtc/base/taskparent.cc
 | 
| deleted file mode 100644
 | 
| index f923c5a2eb4641f4e0695a26dd364faaad28564e..0000000000000000000000000000000000000000
 | 
| --- a/webrtc/base/taskparent.cc
 | 
| +++ /dev/null
 | 
| @@ -1,98 +0,0 @@
 | 
| -/*
 | 
| - *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
 | 
| - *
 | 
| - *  Use of this source code is governed by a BSD-style license
 | 
| - *  that can be found in the LICENSE file in the root of the source
 | 
| - *  tree. An additional intellectual property rights grant can be found
 | 
| - *  in the file PATENTS.  All contributing project authors may
 | 
| - *  be found in the AUTHORS file in the root of the source tree.
 | 
| - */
 | 
| -
 | 
| -#include <algorithm>
 | 
| -
 | 
| -#include "webrtc/base/taskparent.h"
 | 
| -
 | 
| -#include "webrtc/base/checks.h"
 | 
| -#include "webrtc/base/task.h"
 | 
| -#include "webrtc/base/taskrunner.h"
 | 
| -
 | 
| -namespace rtc {
 | 
| -
 | 
| -TaskParent::TaskParent(Task* derived_instance, TaskParent *parent)
 | 
| -    : parent_(parent) {
 | 
| -  RTC_DCHECK(derived_instance != NULL);
 | 
| -  RTC_DCHECK(parent != NULL);
 | 
| -  runner_ = parent->GetRunner();
 | 
| -  parent_->AddChild(derived_instance);
 | 
| -  Initialize();
 | 
| -}
 | 
| -
 | 
| -TaskParent::TaskParent(TaskRunner *derived_instance)
 | 
| -    : parent_(NULL),
 | 
| -      runner_(derived_instance) {
 | 
| -  RTC_DCHECK(derived_instance != NULL);
 | 
| -  Initialize();
 | 
| -}
 | 
| -
 | 
| -TaskParent::~TaskParent() = default;
 | 
| -
 | 
| -// Does common initialization of member variables
 | 
| -void TaskParent::Initialize() {
 | 
| -  children_.reset(new ChildSet());
 | 
| -  child_error_ = false;
 | 
| -}
 | 
| -
 | 
| -void TaskParent::AddChild(Task *child) {
 | 
| -  children_->insert(child);
 | 
| -}
 | 
| -
 | 
| -#if RTC_DCHECK_IS_ON
 | 
| -bool TaskParent::IsChildTask(Task *task) {
 | 
| -  RTC_DCHECK(task != NULL);
 | 
| -  return task->parent_ == this && children_->find(task) != children_->end();
 | 
| -}
 | 
| -#endif
 | 
| -
 | 
| -bool TaskParent::AllChildrenDone() {
 | 
| -  for (ChildSet::iterator it = children_->begin();
 | 
| -       it != children_->end();
 | 
| -       ++it) {
 | 
| -    if (!(*it)->IsDone())
 | 
| -      return false;
 | 
| -  }
 | 
| -  return true;
 | 
| -}
 | 
| -
 | 
| -bool TaskParent::AnyChildError() {
 | 
| -  return child_error_;
 | 
| -}
 | 
| -
 | 
| -void TaskParent::AbortAllChildren() {
 | 
| -  if (children_->size() > 0) {
 | 
| -#if RTC_DCHECK_IS_ON
 | 
| -    runner_->IncrementAbortCount();
 | 
| -#endif
 | 
| -
 | 
| -    ChildSet copy = *children_;
 | 
| -    for (ChildSet::iterator it = copy.begin(); it != copy.end(); ++it) {
 | 
| -      (*it)->Abort(true);  // Note we do not wake
 | 
| -    }
 | 
| -
 | 
| -#if RTC_DCHECK_IS_ON
 | 
| -    runner_->DecrementAbortCount();
 | 
| -#endif
 | 
| -  }
 | 
| -}
 | 
| -
 | 
| -void TaskParent::OnStopped(Task *task) {
 | 
| -  AbortAllChildren();
 | 
| -  parent_->OnChildStopped(task);
 | 
| -}
 | 
| -
 | 
| -void TaskParent::OnChildStopped(Task *child) {
 | 
| -  if (child->HasError())
 | 
| -    child_error_ = true;
 | 
| -  children_->erase(child);
 | 
| -}
 | 
| -
 | 
| -} // namespace rtc
 | 
| 
 |