diff options
author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 19:23:16 +0000 |
---|---|---|
committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 19:23:16 +0000 |
commit | 317c6415bea2bc5d184326188349746911fe5c28 (patch) | |
tree | ff8020c855f7e01eabcabff7ec0d555e9dd278eb /webkit | |
parent | 020d047e85ccb8e634bc4f6d3356c8d64a2d7f97 (diff) | |
download | chromium_src-317c6415bea2bc5d184326188349746911fe5c28.zip chromium_src-317c6415bea2bc5d184326188349746911fe5c28.tar.gz chromium_src-317c6415bea2bc5d184326188349746911fe5c28.tar.bz2 |
Setup TestShellPlatformDelegate before MessageLoop.
MessagePumpMac wants NSApp to be initialized before the UI MessageLoop
is created.
BUG=102224
Review URL: http://codereview.chromium.org/8844001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/tools/test_shell/run_all_tests.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc index 176f8b9..1a11b6e 100644 --- a/webkit/tools/test_shell/run_all_tests.cc +++ b/webkit/tools/test_shell/run_all_tests.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -44,8 +44,8 @@ class TestShellTestSuite : public base::TestSuite { public: TestShellTestSuite(int argc, char** argv) : base::TestSuite(argc, argv), - test_shell_webkit_init_(true), - platform_delegate_(*CommandLine::ForCurrentProcess()) { + platform_delegate_(*CommandLine::ForCurrentProcess()), + test_shell_webkit_init_(true) { } virtual void Initialize() { @@ -93,6 +93,8 @@ class TestShellTestSuite : public base::TestSuite { } private: + TestShellPlatformDelegate platform_delegate_; + // Allocate a message loop for this thread. Although it is not used // directly, its constructor sets up some necessary state. MessageLoopForUI main_message_loop_; @@ -100,8 +102,6 @@ class TestShellTestSuite : public base::TestSuite { // Initialize WebKit for this scope. TestShellWebKitInit test_shell_webkit_init_; - TestShellPlatformDelegate platform_delegate_; - DISALLOW_COPY_AND_ASSIGN(TestShellTestSuite); }; |