Revert 212230 "Create top-level separate targets for browser and..."

trunk/src/base/debug/trace_event_impl.cc

Index: trunk/src/base/debug/trace_event_impl.cc
===================================================================
--- trunk/src/base/debug/trace_event_impl.cc	(revision 212238)
+++ trunk/src/base/debug/trace_event_impl.cc	(working copy)
@@ -42,8 +42,11 @@
   }
 };
 
+// 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 {
@@ -978,6 +981,8 @@
     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(
@@ -997,6 +1002,7 @@
         DCHECK(false) << "failed to create thread";
       }
     }
+  #endif
 
     dispatching_to_observer_list_ = true;
     observer_list = enabled_state_observer_list_;