Merge 212415 "reland of http://crrev.com/212230 Create top-level..."

base/debug/trace_event_impl.cc

Index: base/debug/trace_event_impl.cc
===================================================================
--- base/debug/trace_event_impl.cc	(revision 212608)
+++ base/debug/trace_event_impl.cc	(working copy)
@@ -42,11 +42,8 @@
   }
 };
 
-// Not supported in split-dll build. http://crbug.com/237249
-#if !defined(CHROME_SPLIT_DLL)
 // The thread buckets for the sampling profiler.
 BASE_EXPORT TRACE_EVENT_API_ATOMIC_WORD g_trace_state[3];
-#endif
 
 namespace base {
 namespace debug {
@@ -981,8 +978,6 @@
     category_filter_ = CategoryFilter(category_filter);
     EnableIncludedCategoryGroups();
 
-    // Not supported in split-dll build. http://crbug.com/237249
-  #if !defined(CHROME_SPLIT_DLL)
     if (options & ENABLE_SAMPLING) {
       sampling_thread_.reset(new TraceSamplingThread);
       sampling_thread_->RegisterSampleBucket(
@@ -1002,7 +997,6 @@
         DCHECK(false) << "failed to create thread";
       }
     }
-  #endif
 
     dispatching_to_observer_list_ = true;
     observer_list = enabled_state_observer_list_;