Rework startup-data-util.

tools/parser-shell.cc

 // Copyright 2014 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 25 matching lines @@
 #include "include/libplatform/libplatform.h"
 #include "src/api.h"
 #include "src/compiler.h"
 #include "src/scanner-character-streams.h"
 #include "tools/shell-utils.h"
 #include "src/parser.h"
 #include "src/preparse-data-format.h"
 #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 {
  public:
   virtual void* Allocate(size_t length) {
     void* data = AllocateUninitialized(length);
     return data == NULL ? data : memset(data, 0, length);
   }
   virtual void* AllocateUninitialized(size_t length) { return malloc(length); }
   virtual void Free(void* data, size_t) { free(data); }
@@ skipping 83 matching lines @@
   return std::make_pair(parse_time1, parse_time2);
 }
 
 
 int main(int argc, char* argv[]) {
   v8::V8::SetFlagsFromCommandLine(&argc, argv, true);
   v8::V8::InitializeICU();
   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;
   int repeat = 1;
   for (int i = 0; i < argc; ++i) {
     if (strcmp(argv[i], "--latin1") == 0) {
       encoding = LATIN1;
     } else if (strcmp(argv[i], "--utf8") == 0) {
       encoding = UTF8;
     } else if (strcmp(argv[i], "--utf16") == 0) {
@@ skipping 33 matching lines @@
              first_parse_total);
       printf("%s(SecondParseRunTime): %.f ms\n", benchmark.c_str(),
              second_parse_total);
     }
   }
   v8::V8::Dispose();
   v8::V8::ShutdownPlatform();
   delete platform;
   return 0;
 }