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

Caused Linux x64 sizes to fail for reasons unclear.

> Create top-level separate targets for browser and child dlls
> 
> The general idea is that there's top level targets chrome and chrome_child,
> and corresponding content_app and content_app_child that depend on only
> the subtargets that should be included in the appropriate dll.
> 
> Pull bluetooth_utils from bluetooth_device into separate common target
> as it's referenced from chrome/common/extensions.
> 
> Currently (probably) Windows-only and requires setting chrome_multiple_dll=1
> for gyp.
> 
> Links, but Blink is still included in browser.
> 
> Single-process mode is currently disabled when chrome_multiple_dll is set.
> 
> Current graph is at: http://commondatastorage.googleapis.com/chromelinkgraph/deps.html
> generated by "python tools\win\split_link\graph_dependencies.py deps.html"
> 
> Remove the previous hacky-er attempt at this that was named "split dll".
> 
> TBR=jam@chromium.org
> 
> BUG=237249,256965
> 
> Review URL: https://codereview.chromium.org/17619005

TBR=scottmg@chromium.org

Review URL: https://codereview.chromium.org/19572012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212239 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 21 insertions, 0 deletions

diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h
index c17c008..619b0ab 100644
--- a/base/debug/trace_event.h
+++ b/base/debug/trace_event.h
@@ -788,6 +788,8 @@
 // Defines visibility for classes in trace_event.h
 #define TRACE_EVENT_API_CLASS_EXPORT BASE_EXPORT
 
+// Not supported in split-dll build. http://crbug.com/256965
+#if !defined(CHROME_SPLIT_DLL)
 // The thread buckets for the sampling profiler.
 TRACE_EVENT_API_CLASS_EXPORT extern \
     TRACE_EVENT_API_ATOMIC_WORD g_trace_state[3];
@@ -795,6 +797,8 @@ TRACE_EVENT_API_CLASS_EXPORT extern \
 #define TRACE_EVENT_API_THREAD_BUCKET(thread_bucket)                           \
     g_trace_state[thread_bucket]
 
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 
 // Implementation detail: trace event macros create temporary variables
@@ -1485,15 +1489,23 @@ class TraceEventSamplingStateScope {
   }
 
   static inline const char* Current() {
+// Not supported in split-dll build. http://crbug.com/256965
+#if !defined(CHROME_SPLIT_DLL)
     return reinterpret_cast<const char*>(TRACE_EVENT_API_ATOMIC_LOAD(
       g_trace_state[BucketNumber]));
+#else
+    return NULL;
+#endif
   }
 
   static inline void Set(const char* category_and_name) {
+// Not supported in split-dll build. http://crbug.com/256965
+#if !defined(CHROME_SPLIT_DLL)
     TRACE_EVENT_API_ATOMIC_STORE(
       g_trace_state[BucketNumber],
       reinterpret_cast<TRACE_EVENT_API_ATOMIC_WORD>(
         const_cast<char*>(category_and_name)));
+#endif
   }
 
  private:
diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc
index e061ea1..4d637cd 100644
--- a/base/debug/trace_event_impl.cc
+++ b/base/debug/trace_event_impl.cc
@@ -42,8 +42,11 @@ class DeleteTraceLogForTesting {
   }
 };
 
+// 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 @@ void TraceLog::SetEnabled(const CategoryFilter& category_filter,
     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 @@ void TraceLog::SetEnabled(const CategoryFilter& category_filter,
         DCHECK(false) << "failed to create thread";
       }
     }
+  #endif
 
     dispatching_to_observer_list_ = true;
     observer_list = enabled_state_observer_list_;
diff --git a/base/debug/trace_event_unittest.cc b/base/debug/trace_event_unittest.cc
index 348c1d0..ff0ab63 100644
--- a/base/debug/trace_event_unittest.cc
+++ b/base/debug/trace_event_unittest.cc
@@ -1677,6 +1677,8 @@ TEST_F(TraceEventTestFixture, TraceOptionsParsing) {
                 "record-continuously,enable-sampling"));
 }
 
+// Not supported in split dll build. http://crbug.com/256965
+#if !defined(CHROME_SPLIT_DLL)
 TEST_F(TraceEventTestFixture, TraceSampling) {
   event_watch_notification_ = 0;
   TraceLog::GetInstance()->SetEnabled(
@@ -1736,6 +1738,7 @@ TEST_F(TraceEventTestFixture, TraceSamplingScope) {
 
   EndTraceAndFlush();
 }
+#endif  // !CHROME_SPLIT_DLL
 
 class MyData : public base::debug::ConvertableToTraceFormat {
  public: