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

trunk/src/webkit/glue/webkitplatformsupport_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webkitplatformsupport_impl.h"
 
 #include <math.h>
 
 #include <vector>
 
@@ skipping 433 matching lines @@
   counter->Add(sample);
 }
 
 const unsigned char* WebKitPlatformSupportImpl::getTraceCategoryEnabledFlag(
     const char* category_group) {
   return TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(category_group);
 }
 
 long* WebKitPlatformSupportImpl::getTraceSamplingState(
     const unsigned thread_bucket) {
+  // Not supported in split-dll build. http://crbug.com/237249
+#if !defined(CHROME_SPLIT_DLL)
   switch (thread_bucket) {
     case 0:
       return reinterpret_cast<long*>(&TRACE_EVENT_API_THREAD_BUCKET(0));
     case 1:
       return reinterpret_cast<long*>(&TRACE_EVENT_API_THREAD_BUCKET(1));
     case 2:
       return reinterpret_cast<long*>(&TRACE_EVENT_API_THREAD_BUCKET(2));
     default:
       NOTREACHED() << "Unknown thread bucket type.";
   }
+#endif
   return NULL;
 }
 
 void WebKitPlatformSupportImpl::addTraceEvent(
     char phase,
     const unsigned char* category_group_enabled,
     const char* name,
     unsigned long long id,
     int num_args,
     const char** arg_names,
@@ skipping 440 matching lines @@
   if (--shared_timer_suspended_ == 0 &&
       (!shared_timer_.IsRunning() ||
        shared_timer_fire_time_was_set_while_suspended_)) {
     shared_timer_fire_time_was_set_while_suspended_ = false;
     setSharedTimerFireInterval(
         shared_timer_fire_time_ - monotonicallyIncreasingTime());
   }
 }
 
 }  // namespace webkit_glue