Revert of [Bindings] Create and use V8 context snapshots

content/app/content_main_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/app/content_main_runner.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ skipping 36 matching lines @@
 #include "content/public/app/content_main.h"
 #include "content/public/app/content_main_delegate.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_descriptor_keys.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/sandbox_init.h"
-#include "gin/v8_initializer.h"
 #include "media/base/media.h"
 #include "media/media_features.h"
 #include "ppapi/features/features.h"
 #include "services/service_manager/embedder/switches.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 
+#if defined(V8_USE_EXTERNAL_STARTUP_DATA) && \
+    !defined(CHROME_MULTIPLE_DLL_BROWSER)
+#include "gin/v8_initializer.h"
+#endif
+
 #if defined(OS_WIN)
 #include <malloc.h>
 #include <cstring>
 
 #include "base/trace_event/trace_event_etw_export_win.h"
 #include "sandbox/win/src/sandbox_types.h"
 #include "ui/display/win/dpi.h"
 #elif defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/power_monitor/power_monitor_device_source.h"
@@ skipping 92 matching lines @@
       command_line, switches::kFieldTrialHandle, -1);
 #endif
 
   std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
   base::FieldTrialList::CreateFeaturesFromCommandLine(
       command_line, switches::kEnableFeatures, switches::kDisableFeatures,
       feature_list.get());
   base::FeatureList::SetInstance(std::move(feature_list));
 }
 
-void LoadV8ContextSnapshotFile() {
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-  base::FileDescriptorStore& file_descriptor_store =
-      base::FileDescriptorStore::GetInstance();
-  base::MemoryMappedFile::Region region;
-  base::ScopedFD fd = file_descriptor_store.MaybeTakeFD(
-      kV8ContextSnapshotDataDescriptor, &region);
-  if (fd.is_valid()) {
-    gin::V8Initializer::LoadV8ContextSnapshotFromFD(fd.get(), region.offset,
-                                                    region.size);
-    return;
-  }
-#endif  // OS
-#if !defined(CHROME_MULTIPLE_DLL_BROWSER)
-  gin::V8Initializer::LoadV8ContextSnapshot();
-#endif  // !CHROME_MULTIPLE_DLL_BROWSER
-}
-
 void InitializeV8IfNeeded(
     const base::CommandLine& command_line,
     const std::string& process_type) {
   if (process_type == switches::kGpuProcess)
     return;
 
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   base::FileDescriptorStore& file_descriptor_store =
       base::FileDescriptorStore::GetInstance();
   base::MemoryMappedFile::Region region;
   base::ScopedFD v8_snapshot_fd =
       file_descriptor_store.MaybeTakeFD(kV8SnapshotDataDescriptor, &region);
   if (v8_snapshot_fd.is_valid()) {
     gin::V8Initializer::LoadV8SnapshotFromFD(v8_snapshot_fd.get(),
                                              region.offset, region.size);
-  } else {
-    gin::V8Initializer::LoadV8Snapshot();
-  }
-  base::ScopedFD v8_natives_fd =
-      file_descriptor_store.MaybeTakeFD(kV8NativesDataDescriptor, &region);
-  if (v8_natives_fd.is_valid()) {
-    gin::V8Initializer::LoadV8NativesFromFD(v8_natives_fd.get(), region.offset,
-                                            region.size);
-  } else {
-    gin::V8Initializer::LoadV8Natives();
-  }
+    } else {
+      gin::V8Initializer::LoadV8Snapshot();
+    }
+    base::ScopedFD v8_natives_fd =
+        file_descriptor_store.MaybeTakeFD(kV8NativesDataDescriptor, &region);
+    if (v8_natives_fd.is_valid()) {
+      gin::V8Initializer::LoadV8NativesFromFD(v8_natives_fd.get(),
+                                              region.offset, region.size);
+    } else {
+      gin::V8Initializer::LoadV8Natives();
+    }
 #else
 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
-  gin::V8Initializer::LoadV8Snapshot();
-  gin::V8Initializer::LoadV8Natives();
+    gin::V8Initializer::LoadV8Snapshot();
+    gin::V8Initializer::LoadV8Natives();
 #endif  // !CHROME_MULTIPLE_DLL_BROWSER
 #endif  // OS_POSIX && !OS_MACOSX
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
-
-  LoadV8ContextSnapshotFile();
 }
 
 }  // namespace
 
 #if !defined(CHROME_MULTIPLE_DLL_CHILD)
 base::LazyInstance<ContentBrowserClient>::DestructorAtExit
     g_empty_content_browser_client = LAZY_INSTANCE_INITIALIZER;
 #endif  //  !CHROME_MULTIPLE_DLL_CHILD
 
 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
@@ skipping 518 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content