Extract trace from TaskAnnotator::RunTask to its call sites

components/scheduler/child/task_queue_manager.cc

 // Copyright 2014 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/task_queue_manager.h"
 
 #include <queue>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 673 matching lines @@
   } else {
     // Suppress "will" task observer notifications for the first and "did"
     // notifications for the last task in the batch to avoid duplicate
     // notifications.
     if (has_previous_task) {
       FOR_EACH_OBSERVER(base::MessageLoop::TaskObserver, task_observers_,
                         DidProcessTask(*previous_task));
       FOR_EACH_OBSERVER(base::MessageLoop::TaskObserver, task_observers_,
                         WillProcessTask(pending_task));
     }
-    task_annotator_.RunTask("TaskQueueManager::PostTask",
-                            "TaskQueueManager::RunTask", pending_task);
+    TRACE_EVENT_WITH_MEMORY_TAG2(

[danakj, 2015/07/15 18:03:23]

Why don't you include WillProcessTask here?

+        "toplevel",

[danakj, 2015/07/16 01:01:42]

Then does it make sense to add these other "toplevel" traces if they are nested
within the messageloop one? Maybe we should just not add them?

Otherwise, LGTM % skyostil

+        "TaskQueueManager::ProcessTaskFromWorkQueue",
+        pending_task.posted_from.function_name(),  // Name for memory tracking.
+        "src_file",
+        pending_task.posted_from.file_name(),
+        "src_func",
+        pending_task.posted_from.function_name());
+
+    task_annotator_.RunTask("TaskQueueManager::PostTask", pending_task);
 
     // Detect if the TaskQueueManager just got deleted.  If this happens we must
     // not access any member variables after this point.
     if (protect->HasOneRef())
       return true;
 
     pending_task.task.Reset();
     *previous_task = pending_task;
   }
   return false;
@@ skipping 104 matching lines @@
       return nullptr;
   }
 }
 
 void TaskQueueManager::OnTaskQueueEnabled() {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   MaybePostDoWorkOnMainRunner();
 }
 
 }  // namespace scheduler