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

test/cctest/test-cpu-profiler.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 //
 // Tests of profiles generator and utilities.
 
 #ifdef ENABLE_CPP_PROFILES_PROCESSOR
 
 #include "v8.h"
 #include "cpu-profiler-inl.h"
 #include "cctest.h"
 
@@ skipping 29 matching lines @@
 
 static inline i::Address ToAddress(int n) {
   return reinterpret_cast<i::Address>(n);
 }
 
 static void EnqueueTickSampleEvent(ProfilerEventsProcessor* proc,
                                    i::Address frame1,
                                    i::Address frame2 = NULL,
                                    i::Address frame3 = NULL) {
   i::TickSample* sample = proc->TickSampleEvent();
-  sample->state = i::OTHER;
   sample->pc = frame1;
   sample->function = frame1;
   sample->frames_count = 0;
   if (frame2 != NULL) {
     sample->stack[0] = frame2;
     sample->frames_count = 1;
   }
   if (frame3 != NULL) {
     sample->stack[1] = frame3;
     sample->frames_count = 2;
   }
 }
 
+namespace {
+
+class TestSetup {
+ public:
+  TestSetup()
+      : old_flag_prof_browser_mode_(i::FLAG_prof_browser_mode) {
+    i::FLAG_prof_browser_mode = false;
+  }
+
+  ~TestSetup() {
+    i::FLAG_prof_browser_mode = old_flag_prof_browser_mode_;
+  }
+
+ private:
+  bool old_flag_prof_browser_mode_;
+};
+
+}  // namespace
+
 TEST(CodeEvents) {
   InitializeVM();
+  TestSetup test_setup;
   CpuProfilesCollection profiles;
   profiles.StartProfiling("", 1);
   ProfileGenerator generator(&profiles);
   ProfilerEventsProcessor processor(&generator);
   processor.Start();
   while (!processor.running()) {
     i::Thread::YieldCPU();
   }
 
   // Enqueue code creation events.
@@ skipping 46 matching lines @@
   CHECK_EQ(aaa_str, entry5->name());
 }
 
 
 template<typename T>
 static int CompareProfileNodes(const T* p1, const T* p2) {
   return strcmp((*p1)->entry()->name(), (*p2)->entry()->name());
 }
 
 TEST(TickEvents) {
+  TestSetup test_setup;
   CpuProfilesCollection profiles;
   profiles.StartProfiling("", 1);
   ProfileGenerator generator(&profiles);
   ProfilerEventsProcessor processor(&generator);
   processor.Start();
   while (!processor.running()) {
     i::Thread::YieldCPU();
   }
 
   processor.CodeCreateEvent(i::Logger::BUILTIN_TAG,
@@ skipping 54 matching lines @@
       bottom_up_root_children[2]->children();
   CHECK_EQ(1, bottom_up_ddd_children->length());
   CHECK_EQ("5", bottom_up_ddd_children->last()->entry()->name());
   const i::List<ProfileNode*>* bottom_up_ddd_stub_children =
       bottom_up_ddd_children->last()->children();
   CHECK_EQ(1, bottom_up_ddd_stub_children->length());
   CHECK_EQ("bbb", bottom_up_ddd_stub_children->last()->entry()->name());
 }
 
 #endif  // ENABLE_CPP_PROFILES_PROCESSOR