content/test/content_test_launcher.cc - Issue 594603003: Infrastructure for reading V8's initial snapshot from external files

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/test/content_test_launcher.cc

Issue 594603003: Infrastructure for reading V8's initial snapshot from external files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix android tests Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java ('K') | « content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java ('k') | content/test/test_blink_web_unit_test_support.cc » ('j') | gin/converter_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/test/content_test_launcher.cc

diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc

index 92234425ee3fed98aeec145307e44f0e9a108182..e07636912678f58d17d9bd77e5653d82177c44d6 100644

--- a/content/test/content_test_launcher.cc

+++ b/content/test/content_test_launcher.cc

@@ -21,6 +21,10 @@

#include "media/base/media_switches.h"

#include "testing/gtest/include/gtest/gtest.h"

+#ifdef V8_USE_EXTERNAL_STARTUP_DATA

+#include "gin/public/isolate_holder.h"

+#endif

#if defined(OS_ANDROID)

#include "base/message_loop/message_loop.h"

#include "content/app/mojo/mojo_init.h"

@@ -55,6 +59,10 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase {

base::i18n::AllowMultipleInitializeCallsForTesting();

base::i18n::InitializeICU();

+#ifdef V8_USE_EXTERNAL_STARTUP_DATA

+ gin::IsolateHolder::LoadV8Snapshot();

+#endif

// This needs to be done before base::TestSuite::Initialize() is called,

// as it also tries to set MessagePumpForUIFactory.

if (!base::MessageLoop::InitMessagePumpForUIFactory(