Move token-related constants from CodeEntry to TokenEnumerator.

test/cctest/test-cpu-profiler.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 //
 // Tests of profiles generator and utilities.
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
 
 #include "v8.h"
 #include "cpu-profiler-inl.h"
 #include "cctest.h"
 
 namespace i = v8::internal;
 
 using i::CodeEntry;
 using i::CpuProfile;
 using i::CpuProfilesCollection;
 using i::ProfileGenerator;
 using i::ProfileNode;
 using i::ProfilerEventsProcessor;
+using i::TokenEnumerator;
 
 
 TEST(StartStop) {
   CpuProfilesCollection profiles;
   ProfileGenerator generator(&profiles);
   ProfilerEventsProcessor processor(&generator);
   processor.Start();
   while (!processor.running()) {
     i::Thread::YieldCPU();
   }
@@ skipping 79 matching lines @@
                             0x80);
   processor.CodeCreateEvent(i::Logger::STUB_TAG, 5, ToAddress(0x1300), 0x10);
   processor.CodeCreateEvent(i::Logger::BUILTIN_TAG,
                             "ddd",
                             ToAddress(0x1400),
                             0x80);
   processor.CodeMoveEvent(ToAddress(0x1400), ToAddress(0x1500));
   processor.CodeCreateEvent(i::Logger::STUB_TAG, 3, ToAddress(0x1600), 0x10);
   processor.CodeDeleteEvent(ToAddress(0x1600));
   processor.FunctionCreateEvent(ToAddress(0x1700), ToAddress(0x1000),
-                                CodeEntry::kNoSecurityToken);
+                                TokenEnumerator::kNoSecurityToken);
   // Enqueue a tick event to enable code events processing.
   EnqueueTickSampleEvent(&processor, ToAddress(0x1000));
 
   processor.Stop();
   processor.Join();
 
   // Check the state of profile generator.
   CodeEntry* entry1 = generator.code_map()->FindEntry(ToAddress(0x1000));
   CHECK_NE(NULL, entry1);
   CHECK_EQ(aaa_str, entry1->name());
@@ skipping 42 matching lines @@
   EnqueueTickSampleEvent(&processor, ToAddress(0x1210));
   EnqueueTickSampleEvent(&processor, ToAddress(0x1305), ToAddress(0x1220));
   EnqueueTickSampleEvent(&processor,
                          ToAddress(0x1404),
                          ToAddress(0x1305),
                          ToAddress(0x1230));
 
   processor.Stop();
   processor.Join();
   CpuProfile* profile =
-      profiles.StopProfiling(CodeEntry::kNoSecurityToken, "", 1);
+      profiles.StopProfiling(TokenEnumerator::kNoSecurityToken, "", 1);
   CHECK_NE(NULL, profile);
 
   // Check call trees.
   const i::List<ProfileNode*>* top_down_root_children =
       profile->top_down()->root()->children();
   CHECK_EQ(1, top_down_root_children->length());
   CHECK_EQ("bbb", top_down_root_children->last()->entry()->name());
   const i::List<ProfileNode*>* top_down_bbb_children =
       top_down_root_children->last()->children();
   CHECK_EQ(1, top_down_bbb_children->length());
@@ skipping 26 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_LOGGING_AND_PROFILING