diff options
| author | bashi <bashi@chromium.org> | 2015-08-19 04:13:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-19 11:14:18 +0000 |
| commit | b4ccba1ab3d1614495b445e16aba48260c76fbd5 (patch) | |
| tree | ddc7e730c40dc453c9a747e9eff48aeed5ffc5bd /content/public/test | |
| parent | 65c5354524fb6ecb696b0fd4e423b1fd19a0a385 (diff) | |
| download | chromium_src-b4ccba1ab3d1614495b445e16aba48260c76fbd5.zip chromium_src-b4ccba1ab3d1614495b445e16aba48260c76fbd5.tar.gz chromium_src-b4ccba1ab3d1614495b445e16aba48260c76fbd5.tar.bz2 | |
Call blink::initialize() at the beginning of RenderViewTest::SetUp()
Because CreateContentRendererClient() calls
WebScriptController::registerExtension(), which requires PartitionAlloc
to be initialized. blink::initialize() does the job.
BUG=501171
Review URL: https://codereview.chromium.org/1302723002
Cr-Commit-Position: refs/heads/master@{#344198}
Diffstat (limited to 'content/public/test')
| -rw-r--r-- | content/public/test/render_view_test.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc index f602804..acec861 100644 --- a/content/public/test/render_view_test.cc +++ b/content/public/test/render_view_test.cc @@ -190,6 +190,10 @@ void RenderViewTest::GoForward(const PageState& state) { } void RenderViewTest::SetUp() { + // Blink needs to be initialized before calling CreateContentRendererClient() + // because it uses blink internally. + blink::initialize(blink_platform_impl_.Get()); + content_client_.reset(CreateContentClient()); content_browser_client_.reset(CreateContentBrowserClient()); content_renderer_client_.reset(CreateContentRendererClient()); @@ -218,7 +222,6 @@ void RenderViewTest::SetUp() { // hacky, but this is the world we live in... std::string flags("--expose-gc"); v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size())); - blink::initialize(blink_platform_impl_.Get()); // Ensure that we register any necessary schemes when initializing WebKit, // since we are using a MockRenderThread. |