summaryrefslogtreecommitdiffstats
path: root/chrome/test/render_view_test.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 01:46:20 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 01:46:20 +0000
commit09ac4c430545ffd7b8d35bc857b9c27cfaf75cee (patch)
tree05ce41d678c5f096c4e1eaae564bbe71306bb6c3 /chrome/test/render_view_test.cc
parentadc4ed4a6e4dbc0a599a2b2981caeeebe3565b08 (diff)
downloadchromium_src-09ac4c430545ffd7b8d35bc857b9c27cfaf75cee.zip
chromium_src-09ac4c430545ffd7b8d35bc857b9c27cfaf75cee.tar.gz
chromium_src-09ac4c430545ffd7b8d35bc857b9c27cfaf75cee.tar.bz2
Initialize WebKit for unit_tests process. Before it was getting initialized by one of the tests, but it is needed by more than one of them.
Review URL: http://codereview.chromium.org/2853007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50807 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/render_view_test.cc')
-rw-r--r--chrome/test/render_view_test.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc
index 7503230..92d675c 100644
--- a/chrome/test/render_view_test.cc
+++ b/chrome/test/render_view_test.cc
@@ -81,7 +81,6 @@ void RenderViewTest::SetUp() {
// Setting flags and really doing anything with WebKit is fairly fragile and
// hacky, but this is the world we live in...
webkit_glue::SetJavaScriptFlags(L" --expose-gc");
- WebKit::initialize(&webkitclient_);
WebScriptController::registerExtension(BaseJsV8Extension::Get());
WebScriptController::registerExtension(JsonSchemaJsV8Extension::Get());
WebScriptController::registerExtension(EventBindings::Get());
@@ -140,8 +139,6 @@ void RenderViewTest::TearDown() {
// (http://crbug.com/21508).
msg_loop_.RunAllPending();
- WebKit::shutdown();
-
mock_keyboard_.reset();
platform_->PlatformUninitialize();