Revert "CpuProfiler: eliminate 2 layers of 4 for CodeCreateEvent calls."

src/profile-generator.cc

Index: src/profile-generator.cc
diff --git a/src/profile-generator.cc b/src/profile-generator.cc
index a7f7a440b4b9313e67fce8aa608273c10bd422e5..8505b5b40d63fa4dec91195a724de24d13aa4d94 100644
--- a/src/profile-generator.cc
+++ b/src/profile-generator.cc
@@ -298,7 +298,7 @@ class DeleteNodesCallback {
 
 
 ProfileTree::ProfileTree()
-    : root_entry_(Logger::FUNCTION_TAG, "(root)"),
+    : root_entry_(Logger::FUNCTION_TAG, "", "(root)"),
       next_node_id_(1),
       root_(new ProfileNode(this, &root_entry_)) {
 }
@@ -787,6 +787,54 @@ List<CpuProfile*>* CpuProfilesCollection::Profiles(int security_token_id) {
 }
 
 
+CodeEntry* CpuProfilesCollection::NewCodeEntry(Logger::LogEventsAndTags tag,
+                                               Name* name,
+                                               String* resource_name,
+                                               int line_number) {
+  CodeEntry* entry = new CodeEntry(tag,
+                                   CodeEntry::kEmptyNamePrefix,
+                                   GetFunctionName(name),
+                                   TokenEnumerator::kNoSecurityToken,
+                                   GetName(resource_name),
+                                   line_number);
+  code_entries_.Add(entry);
+  return entry;
+}
+
+
+CodeEntry* CpuProfilesCollection::NewCodeEntry(Logger::LogEventsAndTags tag,
+                                               const char* name) {
+  CodeEntry* entry = new CodeEntry(tag,
+                                   CodeEntry::kEmptyNamePrefix,
+                                   GetFunctionName(name));
+  code_entries_.Add(entry);
+  return entry;
+}
+
+
+CodeEntry* CpuProfilesCollection::NewCodeEntry(Logger::LogEventsAndTags tag,
+                                               const char* name_prefix,
+                                               Name* name) {
+  CodeEntry* entry = new CodeEntry(tag,
+                                   name_prefix,
+                                   GetName(name),
+                                   TokenEnumerator::kInheritsSecurityToken);
+  code_entries_.Add(entry);
+  return entry;
+}
+
+
+CodeEntry* CpuProfilesCollection::NewCodeEntry(Logger::LogEventsAndTags tag,
+                                               int args_count) {
+  CodeEntry* entry = new CodeEntry(tag,
+                                   "args_count: ",
+                                   GetName(args_count),
+                                   TokenEnumerator::kInheritsSecurityToken);
+  code_entries_.Add(entry);
+  return entry;
+}
+
+
 void CpuProfilesCollection::AddPathToCurrentProfiles(
     const Vector<CodeEntry*>& path) {
   // As starting / stopping profiles is rare relatively to this
@@ -800,24 +848,6 @@ void CpuProfilesCollection::AddPathToCurrentProfiles(
 }
 
 
-CodeEntry* CpuProfilesCollection::NewCodeEntry(
-      Logger::LogEventsAndTags tag,
-      const char* name,
-      int security_token_id,
-      const char* name_prefix,
-      const char* resource_name,
-      int line_number) {
-  CodeEntry* code_entry = new CodeEntry(tag,
-                                        name,
-                                        security_token_id,
-                                        name_prefix,
-                                        resource_name,
-                                        line_number);
-  code_entries_.Add(code_entry);
-  return code_entry;
-}
-
-
 void SampleRateCalculator::Tick() {
   if (--wall_time_query_countdown_ == 0)
     UpdateMeasurements(OS::TimeCurrentMillis());