Allow new CPU profiling subsystem to coexist nicely with the old one.

src/log.cc

Index: src/log.cc
diff --git a/src/log.cc b/src/log.cc
index 34c9633ef4b700a1bdcb24e894e1df43c5bb1a43..e1ebc87c65f6c2526373bda52edb5b3004c20304 100644
--- a/src/log.cc
+++ b/src/log.cc
@@ -181,8 +181,6 @@ void StackTracer::Trace(TickSample* sample) {
 // Ticker used to provide ticks to the profiler and the sliding state
 // window.
 //
-#ifndef ENABLE_CPP_PROFILES_PROCESSOR
-
 class Ticker: public Sampler {
  public:
   explicit Ticker(int interval):
@@ -224,8 +222,6 @@ class Ticker: public Sampler {
   Profiler* profiler_;
 };
 
-#endif  // ENABLE_CPP_PROFILES_PROCESSOR
-
 
 //
 // SlidingStateWindow implementation.
@@ -1508,11 +1504,6 @@ bool Logger::Setup() {
     }
   }
 
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
-  // Disable old logging, as we are using the same '--prof' flag.
-  logging_nesting_ = 0;
-#endif
-
   LogMessageBuilder::set_write_failure_handler(StopLoggingAndProfiling);
 
   return true;