Split experimental profiler flags

src/runtime-profiler.cc

Index: src/runtime-profiler.cc
diff --git a/src/runtime-profiler.cc b/src/runtime-profiler.cc
index 3d29c17ab06c4885d31a58f7358550c42c86b836..3e719cd3e1062588cafd9718f35d1d1cf288dbe6 100644
--- a/src/runtime-profiler.cc
+++ b/src/runtime-profiler.cc
@@ -204,7 +204,7 @@ void RuntimeProfiler::OptimizeNow() {
     JavaScriptFrame* frame = it.frame();
     JSFunction* function = JSFunction::cast(frame->function());
 
-    if (!FLAG_counting_profiler) {
+    if (!FLAG_watch_ic_patching) {
       // Adjust threshold each time we have processed
       // a certain number of ticks.
       if (sampler_ticks_until_threshold_adjustment_ > 0) {
@@ -232,7 +232,7 @@ void RuntimeProfiler::OptimizeNow() {
     // Do not record non-optimizable functions.
     if (!function->IsOptimizable()) continue;
 
-    if (FLAG_counting_profiler) {
+    if (FLAG_watch_ic_patching) {
       int ticks = function->shared()->profiler_ticks();
 
       if (ticks >= kProfilerTicksBeforeOptimization) {
@@ -270,7 +270,7 @@ void RuntimeProfiler::OptimizeNow() {
       }
     }
   }
-  if (FLAG_counting_profiler) {
+  if (FLAG_watch_ic_patching) {
     any_ic_changed_ = false;
     code_generated_ = false;
   } else {  // !FLAG_counting_profiler
@@ -291,7 +291,7 @@ void RuntimeProfiler::NotifyTick() {
 
 void RuntimeProfiler::SetUp() {
   ASSERT(has_been_globally_set_up_);
-  if (!FLAG_counting_profiler) {
+  if (!FLAG_watch_ic_patching) {
     ClearSampleBuffer();
   }
   // If the ticker hasn't already started, make sure to do so to get
@@ -301,7 +301,7 @@ void RuntimeProfiler::SetUp() {
 
 
 void RuntimeProfiler::Reset() {
-  if (FLAG_counting_profiler) {
+  if (FLAG_watch_ic_patching) {
     total_code_generated_ = 0;
   } else {  // !FLAG_counting_profiler
     sampler_threshold_ = kSamplerThresholdInit;