Merge up to 8597 to experimental/gc from the bleeding edge.

src/log.h

Index: src/log.h
===================================================================
--- src/log.h	(revision 8618)
+++ src/log.h	(working copy)
@@ -281,9 +281,9 @@
   // Pause/Resume collection of profiling data.
   // When data collection is paused, CPU Tick events are discarded until
   // data collection is Resumed.
-  void PauseProfiler(int flags, int tag);
-  void ResumeProfiler(int flags, int tag);
-  int GetActiveProfilerModules();
+  void PauseProfiler();
+  void ResumeProfiler();
+  bool IsProfilerPaused();
 
   // If logging is performed into a memory buffer, allows to
   // retrieve previously written messages. See v8.h.
@@ -402,7 +402,6 @@
 
   int logging_nesting_;
   int cpu_profiler_nesting_;
-  int heap_profiler_nesting_;
 
   Log* log_;