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

trunk/src/base/debug/trace_event_unittest.cc

Index: trunk/src/base/debug/trace_event_unittest.cc
===================================================================
--- trunk/src/base/debug/trace_event_unittest.cc	(revision 212238)
+++ trunk/src/base/debug/trace_event_unittest.cc	(working copy)
@@ -1677,6 +1677,8 @@
                 "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 @@
 
   EndTraceAndFlush();
 }
+#endif  // !CHROME_SPLIT_DLL
 
 class MyData : public base::debug::ConvertableToTraceFormat {
  public:
Property changes on: trunk/src/base/debug/trace_event_unittest.cc
___________________________________________________________________
Deleted: svn:mergeinfo