Revert of Make WebTraceLocation be an alias of tracked_objects::Location

components/scheduler/child/web_scheduler_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/scheduler/child/web_scheduler_impl.h"
 
 #include "base/bind.h"
-#include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "components/scheduler/child/web_task_runner_impl.h"
 #include "components/scheduler/child/worker_scheduler.h"
 #include "third_party/WebKit/public/platform/WebTraceLocation.h"
 #include "third_party/WebKit/public/platform/WebViewScheduler.h"
 
 namespace scheduler {
 
 WebSchedulerImpl::WebSchedulerImpl(
     ChildScheduler* child_scheduler,
@@ skipping 20 matching lines @@
 bool WebSchedulerImpl::canExceedIdleDeadlineIfRequired() {
   return child_scheduler_->CanExceedIdleDeadlineIfRequired();
 }
 
 void WebSchedulerImpl::runIdleTask(
     std::unique_ptr<blink::WebThread::IdleTask> task,
     base::TimeTicks deadline) {
   task->run((deadline - base::TimeTicks()).InSecondsF());
 }
 
-void WebSchedulerImpl::postIdleTask(const blink::WebTraceLocation& location,
+void WebSchedulerImpl::postIdleTask(const blink::WebTraceLocation& web_location,
                                     blink::WebThread::IdleTask* task) {
   DCHECK(idle_task_runner_);
+  std::unique_ptr<blink::WebThread::IdleTask> scoped_task(task);
+  tracked_objects::Location location(web_location.functionName(),
+                                     web_location.fileName(), -1, nullptr);
   idle_task_runner_->PostIdleTask(
       location,
-      base::Bind(&WebSchedulerImpl::runIdleTask,
-                 base::Passed(base::WrapUnique(task))));
+      base::Bind(&WebSchedulerImpl::runIdleTask, base::Passed(&scoped_task)));
 }
 
 void WebSchedulerImpl::postNonNestableIdleTask(
-    const blink::WebTraceLocation& location,
+    const blink::WebTraceLocation& web_location,
     blink::WebThread::IdleTask* task) {
   DCHECK(idle_task_runner_);
+  std::unique_ptr<blink::WebThread::IdleTask> scoped_task(task);
+  tracked_objects::Location location(web_location.functionName(),
+                                     web_location.fileName(), -1, nullptr);
   idle_task_runner_->PostNonNestableIdleTask(
       location,
-      base::Bind(&WebSchedulerImpl::runIdleTask,
-                 base::Passed(base::WrapUnique(task))));
+      base::Bind(&WebSchedulerImpl::runIdleTask, base::Passed(&scoped_task)));
 }
 
 void WebSchedulerImpl::postIdleTaskAfterWakeup(
-    const blink::WebTraceLocation& location,
+    const blink::WebTraceLocation& web_location,
     blink::WebThread::IdleTask* task) {
   DCHECK(idle_task_runner_);
+  std::unique_ptr<blink::WebThread::IdleTask> scoped_task(task);
+  tracked_objects::Location location(web_location.functionName(),
+                                     web_location.fileName(), -1, nullptr);
   idle_task_runner_->PostIdleTaskAfterWakeup(
       location,
-      base::Bind(&WebSchedulerImpl::runIdleTask,
-                 base::Passed(base::WrapUnique(task))));
+      base::Bind(&WebSchedulerImpl::runIdleTask, base::Passed(&scoped_task)));
 }
 
 blink::WebTaskRunner* WebSchedulerImpl::loadingTaskRunner() {
   return loading_web_task_runner_.get();
 }
 
 blink::WebTaskRunner* WebSchedulerImpl::timerTaskRunner() {
   return timer_web_task_runner_.get();
 }
 
 std::unique_ptr<blink::WebViewScheduler>
 WebSchedulerImpl::createWebViewScheduler(blink::WebView*) {
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace scheduler