| Index: test/cctest/test-profile-generator.cc | 
| diff --git a/test/cctest/test-profile-generator.cc b/test/cctest/test-profile-generator.cc | 
| index 17c9dd9f015e76d4e2b9418a2f0a14e992ede21f..e9197896734da11548615e2424bafff2608e494f 100644 | 
| --- a/test/cctest/test-profile-generator.cc | 
| +++ b/test/cctest/test-profile-generator.cc | 
| @@ -87,17 +87,17 @@ TEST(TokenEnumerator) { | 
| TEST(ProfileNodeFindOrAddChild) { | 
| ProfileTree tree; | 
| ProfileNode node(&tree, NULL); | 
| -  CodeEntry entry1(i::Logger::FUNCTION_TAG, "", "aaa"); | 
| +  CodeEntry entry1(i::Logger::FUNCTION_TAG, "aaa"); | 
| ProfileNode* childNode1 = node.FindOrAddChild(&entry1); | 
| CHECK_NE(NULL, childNode1); | 
| CHECK_EQ(childNode1, node.FindOrAddChild(&entry1)); | 
| -  CodeEntry entry2(i::Logger::FUNCTION_TAG, "", "bbb"); | 
| +  CodeEntry entry2(i::Logger::FUNCTION_TAG, "bbb"); | 
| ProfileNode* childNode2 = node.FindOrAddChild(&entry2); | 
| CHECK_NE(NULL, childNode2); | 
| CHECK_NE(childNode1, childNode2); | 
| CHECK_EQ(childNode1, node.FindOrAddChild(&entry1)); | 
| CHECK_EQ(childNode2, node.FindOrAddChild(&entry2)); | 
| -  CodeEntry entry3(i::Logger::FUNCTION_TAG, "", "ccc"); | 
| +  CodeEntry entry3(i::Logger::FUNCTION_TAG, "ccc"); | 
| ProfileNode* childNode3 = node.FindOrAddChild(&entry3); | 
| CHECK_NE(NULL, childNode3); | 
| CHECK_NE(childNode1, childNode3); | 
| @@ -109,19 +109,18 @@ TEST(ProfileNodeFindOrAddChild) { | 
|  | 
|  | 
| TEST(ProfileNodeFindOrAddChildForSameFunction) { | 
| -  const char* empty = ""; | 
| const char* aaa = "aaa"; | 
| ProfileTree tree; | 
| ProfileNode node(&tree, NULL); | 
| -  CodeEntry entry1(i::Logger::FUNCTION_TAG, empty, aaa); | 
| +  CodeEntry entry1(i::Logger::FUNCTION_TAG, aaa); | 
| ProfileNode* childNode1 = node.FindOrAddChild(&entry1); | 
| CHECK_NE(NULL, childNode1); | 
| CHECK_EQ(childNode1, node.FindOrAddChild(&entry1)); | 
| // The same function again. | 
| -  CodeEntry entry2(i::Logger::FUNCTION_TAG, empty, aaa); | 
| +  CodeEntry entry2(i::Logger::FUNCTION_TAG, aaa); | 
| CHECK_EQ(childNode1, node.FindOrAddChild(&entry2)); | 
| // Now with a different security token. | 
| -  CodeEntry entry3(i::Logger::FUNCTION_TAG, empty, aaa, | 
| +  CodeEntry entry3(i::Logger::FUNCTION_TAG, aaa, | 
| TokenEnumerator::kNoSecurityToken + 1); | 
| CHECK_EQ(childNode1, node.FindOrAddChild(&entry3)); | 
| } | 
| @@ -157,9 +156,9 @@ class ProfileTreeTestHelper { | 
| }  // namespace | 
|  | 
| TEST(ProfileTreeAddPathFromStart) { | 
| -  CodeEntry entry1(i::Logger::FUNCTION_TAG, "", "aaa"); | 
| -  CodeEntry entry2(i::Logger::FUNCTION_TAG, "", "bbb"); | 
| -  CodeEntry entry3(i::Logger::FUNCTION_TAG, "", "ccc"); | 
| +  CodeEntry entry1(i::Logger::FUNCTION_TAG, "aaa"); | 
| +  CodeEntry entry2(i::Logger::FUNCTION_TAG, "bbb"); | 
| +  CodeEntry entry3(i::Logger::FUNCTION_TAG, "ccc"); | 
| ProfileTree tree; | 
| ProfileTreeTestHelper helper(&tree); | 
| CHECK_EQ(NULL, helper.Walk(&entry1)); | 
| @@ -224,9 +223,9 @@ TEST(ProfileTreeAddPathFromStart) { | 
|  | 
|  | 
| TEST(ProfileTreeAddPathFromEnd) { | 
| -  CodeEntry entry1(i::Logger::FUNCTION_TAG, "", "aaa"); | 
| -  CodeEntry entry2(i::Logger::FUNCTION_TAG, "", "bbb"); | 
| -  CodeEntry entry3(i::Logger::FUNCTION_TAG, "", "ccc"); | 
| +  CodeEntry entry1(i::Logger::FUNCTION_TAG, "aaa"); | 
| +  CodeEntry entry2(i::Logger::FUNCTION_TAG, "bbb"); | 
| +  CodeEntry entry3(i::Logger::FUNCTION_TAG, "ccc"); | 
| ProfileTree tree; | 
| ProfileTreeTestHelper helper(&tree); | 
| CHECK_EQ(NULL, helper.Walk(&entry1)); | 
| @@ -304,7 +303,7 @@ TEST(ProfileTreeCalculateTotalTicks) { | 
| CHECK_EQ(1, empty_tree.root()->total_ticks()); | 
| CHECK_EQ(1, empty_tree.root()->self_ticks()); | 
|  | 
| -  CodeEntry entry1(i::Logger::FUNCTION_TAG, "", "aaa"); | 
| +  CodeEntry entry1(i::Logger::FUNCTION_TAG, "aaa"); | 
| CodeEntry* e1_path[] = {&entry1}; | 
| Vector<CodeEntry*> e1_path_vec( | 
| e1_path, sizeof(e1_path) / sizeof(e1_path[0])); | 
| @@ -325,7 +324,7 @@ TEST(ProfileTreeCalculateTotalTicks) { | 
| CHECK_EQ(1, node1->total_ticks()); | 
| CHECK_EQ(1, node1->self_ticks()); | 
|  | 
| -  CodeEntry entry2(i::Logger::FUNCTION_TAG, "", "bbb"); | 
| +  CodeEntry entry2(i::Logger::FUNCTION_TAG, "bbb"); | 
| CodeEntry* e1_e2_path[] = {&entry1, &entry2}; | 
| Vector<CodeEntry*> e1_e2_path_vec( | 
| e1_e2_path, sizeof(e1_e2_path) / sizeof(e1_e2_path[0])); | 
| @@ -360,7 +359,7 @@ TEST(ProfileTreeCalculateTotalTicks) { | 
| CodeEntry* e2_path[] = {&entry2}; | 
| Vector<CodeEntry*> e2_path_vec( | 
| e2_path, sizeof(e2_path) / sizeof(e2_path[0])); | 
| -  CodeEntry entry3(i::Logger::FUNCTION_TAG, "", "ccc"); | 
| +  CodeEntry entry3(i::Logger::FUNCTION_TAG, "ccc"); | 
| CodeEntry* e3_path[] = {&entry3}; | 
| Vector<CodeEntry*> e3_path_vec( | 
| e3_path, sizeof(e3_path) / sizeof(e3_path[0])); | 
| @@ -418,10 +417,10 @@ TEST(ProfileTreeCalculateTotalTicks) { | 
| TEST(ProfileTreeFilteredClone) { | 
| ProfileTree source_tree; | 
| const int token0 = 0, token1 = 1, token2 = 2; | 
| -  CodeEntry entry1(i::Logger::FUNCTION_TAG, "", "aaa", token0); | 
| -  CodeEntry entry2(i::Logger::FUNCTION_TAG, "", "bbb", token1); | 
| -  CodeEntry entry3(i::Logger::FUNCTION_TAG, "", "ccc", token0); | 
| -  CodeEntry entry4(i::Logger::FUNCTION_TAG, "", "ddd", | 
| +  CodeEntry entry1(i::Logger::FUNCTION_TAG, "aaa", token0); | 
| +  CodeEntry entry2(i::Logger::FUNCTION_TAG, "bbb", token1); | 
| +  CodeEntry entry3(i::Logger::FUNCTION_TAG, "ccc", token0); | 
| +  CodeEntry entry4(i::Logger::FUNCTION_TAG, "ddd", | 
| TokenEnumerator::kInheritsSecurityToken); | 
|  | 
| { | 
| @@ -519,10 +518,10 @@ static inline i::Address ToAddress(int n) { | 
|  | 
| TEST(CodeMapAddCode) { | 
| CodeMap code_map; | 
| -  CodeEntry entry1(i::Logger::FUNCTION_TAG, "", "aaa"); | 
| -  CodeEntry entry2(i::Logger::FUNCTION_TAG, "", "bbb"); | 
| -  CodeEntry entry3(i::Logger::FUNCTION_TAG, "", "ccc"); | 
| -  CodeEntry entry4(i::Logger::FUNCTION_TAG, "", "ddd"); | 
| +  CodeEntry entry1(i::Logger::FUNCTION_TAG, "aaa"); | 
| +  CodeEntry entry2(i::Logger::FUNCTION_TAG, "bbb"); | 
| +  CodeEntry entry3(i::Logger::FUNCTION_TAG, "ccc"); | 
| +  CodeEntry entry4(i::Logger::FUNCTION_TAG, "ddd"); | 
| code_map.AddCode(ToAddress(0x1500), &entry1, 0x200); | 
| code_map.AddCode(ToAddress(0x1700), &entry2, 0x100); | 
| code_map.AddCode(ToAddress(0x1900), &entry3, 0x50); | 
| @@ -549,8 +548,8 @@ TEST(CodeMapAddCode) { | 
|  | 
| TEST(CodeMapMoveAndDeleteCode) { | 
| CodeMap code_map; | 
| -  CodeEntry entry1(i::Logger::FUNCTION_TAG, "", "aaa"); | 
| -  CodeEntry entry2(i::Logger::FUNCTION_TAG, "", "bbb"); | 
| +  CodeEntry entry1(i::Logger::FUNCTION_TAG, "aaa"); | 
| +  CodeEntry entry2(i::Logger::FUNCTION_TAG, "bbb"); | 
| code_map.AddCode(ToAddress(0x1500), &entry1, 0x200); | 
| code_map.AddCode(ToAddress(0x1700), &entry2, 0x100); | 
| CHECK_EQ(&entry1, code_map.FindEntry(ToAddress(0x1500))); | 
| @@ -558,7 +557,7 @@ TEST(CodeMapMoveAndDeleteCode) { | 
| code_map.MoveCode(ToAddress(0x1500), ToAddress(0x1700));  // Deprecate bbb. | 
| CHECK_EQ(NULL, code_map.FindEntry(ToAddress(0x1500))); | 
| CHECK_EQ(&entry1, code_map.FindEntry(ToAddress(0x1700))); | 
| -  CodeEntry entry3(i::Logger::FUNCTION_TAG, "", "ccc"); | 
| +  CodeEntry entry3(i::Logger::FUNCTION_TAG, "ccc"); | 
| code_map.AddCode(ToAddress(0x1750), &entry3, 0x100); | 
| CHECK_EQ(NULL, code_map.FindEntry(ToAddress(0x1700))); | 
| CHECK_EQ(&entry3, code_map.FindEntry(ToAddress(0x1750))); | 
|  |