Rework startup-data-util.

tools/parser-shell.cc

Index: tools/parser-shell.cc
diff --git a/tools/parser-shell.cc b/tools/parser-shell.cc
index 17e32ad7132e1fb953aaf48cbc3a98f6b003d42c..da874595de4bb1c4cfa8be18bb5b7b747b3a015a 100644
--- a/tools/parser-shell.cc
+++ b/tools/parser-shell.cc
@@ -43,10 +43,6 @@
 #include "src/preparse-data.h"
 #include "src/preparser.h"
 
-#ifdef V8_USE_EXTERNAL_STARTUP_DATA
-#include "src/startup-data-util.h"
-#endif  // V8_USE_EXTERNAL_STARTUP_DATA
-
 using namespace v8::internal;
 
 class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
@@ -150,9 +146,8 @@ int main(int argc, char* argv[]) {
   v8::Platform* platform = v8::platform::CreateDefaultPlatform();
   v8::V8::InitializePlatform(platform);
   v8::V8::Initialize();
-#ifdef V8_USE_EXTERNAL_STARTUP_DATA
-  v8::StartupDataHandler startup_data(argv[0], NULL, NULL);
-#endif  // V8_USE_EXTERNAL_STARTUP_DATA
+  v8::V8::InitializeExternalStartupData(argv[0]);
+
   Encoding encoding = LATIN1;
   std::vector<std::string> fnames;
   std::string benchmark;