Remove easy to remove calls to Isolate::Current() from api.cc

test/cctest/test-profile-generator.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 33 matching lines @@
 using i::CpuProfiler;
 using i::CpuProfilesCollection;
 using i::ProfileNode;
 using i::ProfileTree;
 using i::ProfileGenerator;
 using i::TickSample;
 using i::Vector;
 
 
 TEST(ProfileNodeFindOrAddChild) {
-  ProfileTree tree;
+  CcTest::InitializeVM();
+  ProfileTree tree(CcTest::i_isolate());
   ProfileNode* node = tree.root();
   CodeEntry entry1(i::Logger::FUNCTION_TAG, "aaa");
   ProfileNode* childNode1 = node->FindOrAddChild(&entry1);
   CHECK(childNode1);
   CHECK_EQ(childNode1, node->FindOrAddChild(&entry1));
   CodeEntry entry2(i::Logger::FUNCTION_TAG, "bbb");
   ProfileNode* childNode2 = node->FindOrAddChild(&entry2);
   CHECK(childNode2);
   CHECK_NE(childNode1, childNode2);
   CHECK_EQ(childNode1, node->FindOrAddChild(&entry1));
   CHECK_EQ(childNode2, node->FindOrAddChild(&entry2));
   CodeEntry entry3(i::Logger::FUNCTION_TAG, "ccc");
   ProfileNode* childNode3 = node->FindOrAddChild(&entry3);
   CHECK(childNode3);
   CHECK_NE(childNode1, childNode3);
   CHECK_NE(childNode2, childNode3);
   CHECK_EQ(childNode1, node->FindOrAddChild(&entry1));
   CHECK_EQ(childNode2, node->FindOrAddChild(&entry2));
   CHECK_EQ(childNode3, node->FindOrAddChild(&entry3));
 }
 
 
 TEST(ProfileNodeFindOrAddChildForSameFunction) {
+  CcTest::InitializeVM();
   const char* aaa = "aaa";
-  ProfileTree tree;
+  ProfileTree tree(CcTest::i_isolate());
   ProfileNode* node = tree.root();
   CodeEntry entry1(i::Logger::FUNCTION_TAG, aaa);
   ProfileNode* childNode1 = node->FindOrAddChild(&entry1);
   CHECK(childNode1);
   CHECK_EQ(childNode1, node->FindOrAddChild(&entry1));
   // The same function again.
   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, aaa);
@@ skipping 25 matching lines @@
   }
 
  private:
   const ProfileTree* tree_;
 };
 
 }  // namespace
 
 
 TEST(ProfileTreeAddPathFromEnd) {
+  CcTest::InitializeVM();
   CodeEntry entry1(i::Logger::FUNCTION_TAG, "aaa");
   CodeEntry entry2(i::Logger::FUNCTION_TAG, "bbb");
   CodeEntry entry3(i::Logger::FUNCTION_TAG, "ccc");
-  ProfileTree tree;
+  ProfileTree tree(CcTest::i_isolate());
   ProfileTreeTestHelper helper(&tree);
   CHECK(!helper.Walk(&entry1));
   CHECK(!helper.Walk(&entry2));
   CHECK(!helper.Walk(&entry3));
 
   CodeEntry* path[] = {NULL, &entry3, NULL, &entry2, NULL, NULL, &entry1, NULL};
   Vector<CodeEntry*> path_vec(path, sizeof(path) / sizeof(path[0]));
   tree.AddPathFromEnd(path_vec);
   CHECK(!helper.Walk(&entry2));
   CHECK(!helper.Walk(&entry3));
@@ skipping 35 matching lines @@
   CHECK_EQ(node3, helper.Walk(&entry1, &entry2, &entry3));
   CHECK_EQ(2u, node3->self_ticks());
   ProfileNode* node4 = helper.Walk(&entry1, &entry2, &entry2);
   CHECK(node4);
   CHECK_NE(node3, node4);
   CHECK_EQ(1u, node4->self_ticks());
 }
 
 
 TEST(ProfileTreeCalculateTotalTicks) {
-  ProfileTree empty_tree;
+  CcTest::InitializeVM();
+  ProfileTree empty_tree(CcTest::i_isolate());
   CHECK_EQ(0u, empty_tree.root()->self_ticks());
   empty_tree.root()->IncrementSelfTicks();
   CHECK_EQ(1u, empty_tree.root()->self_ticks());
 
   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]));
 
-  ProfileTree single_child_tree;
+  ProfileTree single_child_tree(CcTest::i_isolate());
   single_child_tree.AddPathFromEnd(e1_path_vec);
   single_child_tree.root()->IncrementSelfTicks();
   CHECK_EQ(1u, single_child_tree.root()->self_ticks());
   ProfileTreeTestHelper single_child_helper(&single_child_tree);
   ProfileNode* node1 = single_child_helper.Walk(&entry1);
   CHECK(node1);
   CHECK_EQ(1u, single_child_tree.root()->self_ticks());
   CHECK_EQ(1u, node1->self_ticks());
 
   CodeEntry entry2(i::Logger::FUNCTION_TAG, "bbb");
   CodeEntry* e2_e1_path[] = {&entry2, &entry1};
   Vector<CodeEntry*> e2_e1_path_vec(e2_e1_path,
                                     sizeof(e2_e1_path) / sizeof(e2_e1_path[0]));
 
-  ProfileTree flat_tree;
+  ProfileTree flat_tree(CcTest::i_isolate());
   ProfileTreeTestHelper flat_helper(&flat_tree);
   flat_tree.AddPathFromEnd(e1_path_vec);
   flat_tree.AddPathFromEnd(e1_path_vec);
   flat_tree.AddPathFromEnd(e2_e1_path_vec);
   flat_tree.AddPathFromEnd(e2_e1_path_vec);
   flat_tree.AddPathFromEnd(e2_e1_path_vec);
   // Results in {root,0,0} -> {entry1,0,2} -> {entry2,0,3}
   CHECK_EQ(0u, flat_tree.root()->self_ticks());
   node1 = flat_helper.Walk(&entry1);
   CHECK(node1);
   CHECK_EQ(2u, node1->self_ticks());
   ProfileNode* node2 = flat_helper.Walk(&entry1, &entry2);
   CHECK(node2);
   CHECK_EQ(3u, node2->self_ticks());
   // Must calculate {root,5,0} -> {entry1,5,2} -> {entry2,3,3}
   CHECK_EQ(0u, flat_tree.root()->self_ticks());
   CHECK_EQ(2u, node1->self_ticks());
 
   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* e3_path[] = {&entry3};
   Vector<CodeEntry*> e3_path_vec(
       e3_path, sizeof(e3_path) / sizeof(e3_path[0]));
 
-  ProfileTree wide_tree;
+  ProfileTree wide_tree(CcTest::i_isolate());
   ProfileTreeTestHelper wide_helper(&wide_tree);
   wide_tree.AddPathFromEnd(e1_path_vec);
   wide_tree.AddPathFromEnd(e1_path_vec);
   wide_tree.AddPathFromEnd(e2_e1_path_vec);
   wide_tree.AddPathFromEnd(e2_path_vec);
   wide_tree.AddPathFromEnd(e2_path_vec);
   wide_tree.AddPathFromEnd(e2_path_vec);
   wide_tree.AddPathFromEnd(e3_path_vec);
   wide_tree.AddPathFromEnd(e3_path_vec);
   wide_tree.AddPathFromEnd(e3_path_vec);
@@ skipping 470 matching lines @@
   CHECK(const_cast<v8::CpuProfileNode*>(current));
 
   current = PickChild(current, "TryFinally");
   CHECK(const_cast<v8::CpuProfileNode*>(current));
   CHECK(!strcmp("TryFinallyStatement", current->GetBailoutReason()));
 
   current = PickChild(current, "Debugger");
   CHECK(const_cast<v8::CpuProfileNode*>(current));
   CHECK(!strcmp("DebuggerStatement", current->GetBailoutReason()));
 }