| Index: base/threading/thread.cc
|
| diff --git a/base/threading/thread.cc b/base/threading/thread.cc
|
| index ad1360be3e472fa926f4b057c2e51906c58fd88e..ea5b1747e3836a8092517b19e8197d1cf3debb62 100644
|
| --- a/base/threading/thread.cc
|
| +++ b/base/threading/thread.cc
|
| @@ -6,11 +6,12 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/lazy_instance.h"
|
| +#include "base/profiler/scoped_tracker.h"
|
| +#include "base/synchronization/waitable_event.h"
|
| #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
|
| #include "base/threading/thread_id_name_manager.h"
|
| #include "base/threading/thread_local.h"
|
| #include "base/threading/thread_restrictions.h"
|
| -#include "base/synchronization/waitable_event.h"
|
|
|
| #if defined(OS_WIN)
|
| #include "base/win/scoped_com_initializer.h"
|
| @@ -94,6 +95,11 @@ bool Thread::Start() {
|
| }
|
|
|
| bool Thread::StartWithOptions(const Options& options) {
|
| + // TODO(eroman): Remove once crbug.com/465458 is solved.
|
| + tracked_objects::ScopedTracker tracking_profile(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| + "465458 base::Thread::StartWithOptions"));
|
| +
|
| DCHECK(!message_loop_);
|
| #if defined(OS_WIN)
|
| DCHECK((com_status_ != STA) ||
|
| @@ -111,6 +117,11 @@ bool Thread::StartWithOptions(const Options& options) {
|
| return false;
|
| }
|
|
|
| + // TODO(eroman): Remove once crbug.com/465458 is solved.
|
| + tracked_objects::ScopedTracker tracking_profile_wait(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| + "465458 base::Thread::StartWithOptions (Wait)"));
|
| +
|
| // Wait for the thread to start and initialize message_loop_
|
| base::ThreadRestrictions::ScopedAllowWait allow_wait;
|
| startup_data.event.Wait();
|
|
|