Rollback of r12868, r12849 in trunk branch.

src/profile-generator.cc

Index: src/profile-generator.cc
diff --git a/src/profile-generator.cc b/src/profile-generator.cc
index 25ce2ba2bdfefbdbc338e5ff367193045f37c9c8..9839edf7e24fb56b713e02d8c85f3889a7a920b2 100644
--- a/src/profile-generator.cc
+++ b/src/profile-generator.cc
@@ -1988,7 +1988,7 @@ void V8HeapExplorer::ExtractContextReferences(int entry, Context* context) {
               "(context func. result caches)");
     TagObject(context->normalized_map_cache(), "(context norm. map cache)");
     TagObject(context->runtime_context(), "(runtime context)");
-    TagObject(context->embedder_data(), "(context data)");
+    TagObject(context->data(), "(context data)");
     NATIVE_CONTEXT_FIELDS(EXTRACT_CONTEXT_FIELD);
 #undef EXTRACT_CONTEXT_FIELD
     for (int i = Context::FIRST_WEAK_SLOT;