summaryrefslogtreecommitdiffstats
path: root/components/web_view
diff options
context:
space:
mode:
authorsadrul <sadrul@chromium.org>2015-10-06 10:14:57 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-06 17:15:41 +0000
commit1f7fa9f02b98730b0150dc56c23034208f5fb591 (patch)
tree539ea68a03a1c0410f98e454f6244f7d5acfeae4 /components/web_view
parentcdc9eea44ef061befed1243115e4beb00b620d09 (diff)
downloadchromium_src-1f7fa9f02b98730b0150dc56c23034208f5fb591.zip
chromium_src-1f7fa9f02b98730b0150dc56c23034208f5fb591.tar.gz
chromium_src-1f7fa9f02b98730b0150dc56c23034208f5fb591.tar.bz2
layout-tests: Move some test-setup related code into test_runner component.
Move BlinkTestPlatformInitialize() and CheckLayoutSystemDeps() functions into the test_runner component out of content, and use that from web_view test-runner for mandoline. BUG=531585 Review URL: https://codereview.chromium.org/1383803002 Cr-Commit-Position: refs/heads/master@{#352625}
Diffstat (limited to 'components/web_view')
-rw-r--r--components/web_view/test_runner/test_runner_application_delegate.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/components/web_view/test_runner/test_runner_application_delegate.cc b/components/web_view/test_runner/test_runner_application_delegate.cc
index 556ccde..24d2c51 100644
--- a/components/web_view/test_runner/test_runner_application_delegate.cc
+++ b/components/web_view/test_runner/test_runner_application_delegate.cc
@@ -19,6 +19,7 @@
#include "components/mus/public/cpp/view.h"
#include "components/mus/public/cpp/view_tree_connection.h"
#include "components/mus/public/cpp/view_tree_host_factory.h"
+#include "components/test_runner/blink_test_platform_support.h"
#include "mojo/application/public/cpp/application_connection.h"
#include "mojo/application/public/cpp/application_impl.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
@@ -61,6 +62,9 @@ void TestRunnerApplicationDelegate::Terminate() {
// mojo::ApplicationDelegate implementation:
void TestRunnerApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
+ if (!test_runner::BlinkTestPlatformInitialize()) {
+ NOTREACHED() << "Test environment could not be properly set up for blink.";
+ }
app_ = app;
mus::CreateSingleViewTreeHost(app_, this, &host_);
}