diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 07:17:01 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 07:17:01 +0000 |
| commit | 99e1e1e28de1d78e145352558892f2a12413896d (patch) | |
| tree | 244a6a21b78f487531fead1c9a0e8d0e50069f84 /ui/keyboard | |
| parent | a38edc462009e1591e4629b1e17c45d65d324ac5 (diff) | |
| download | chromium_src-99e1e1e28de1d78e145352558892f2a12413896d.zip chromium_src-99e1e1e28de1d78e145352558892f2a12413896d.tar.gz chromium_src-99e1e1e28de1d78e145352558892f2a12413896d.tar.bz2 | |
Revert 202787 "Remove unnecessary ui::CompositorTestSupport"
Suspected to break Linux ChromeOS build
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Full/builds/19953/steps/compile/logs/stdio
obj/ui/snapshot/test/snapshot_unittests.run_all_unittests.o:run_all_unittests.cc:function
main:error: undefined reference to
'ui::test::CompositorTestSuite::CompositorTestSuite(int, char**)'
obj/ui/snapshot/test/snapshot_unittests.run_all_unittests.o:run_all_unittests.cc:function
main:error: undefined reference to
'ui::test::CompositorTestSuite::~CompositorTestSuite()'
> Remove unnecessary ui::CompositorTestSupport
>
> The ui::CompositorTestSupport class existed to initialize WebKit since
> ui::Compositor depends on cc which used to depend on WebKit being initialized
> to function properly. cc no longer has this requirement, so this class is
> unnecessary.
>
> R=piman, sky
>
> Review URL: https://chromiumcodereview.appspot.com/14744016
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/15838015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard')
| -rw-r--r-- | ui/keyboard/keyboard.gyp | 1 | ||||
| -rw-r--r-- | ui/keyboard/keyboard_test_suite.cc | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp index 0995fd85..1953692 100644 --- a/ui/keyboard/keyboard.gyp +++ b/ui/keyboard/keyboard.gyp @@ -83,6 +83,7 @@ '../aura/aura.gyp:aura', '../aura/aura.gyp:aura_test_support', '../compositor/compositor.gyp:compositor', + '../compositor/compositor.gyp:compositor_test_support', '../ui.gyp:run_ui_unittests', '../ui.gyp:ui', 'keyboard', diff --git a/ui/keyboard/keyboard_test_suite.cc b/ui/keyboard/keyboard_test_suite.cc index 5b4db504d..f756a13 100644 --- a/ui/keyboard/keyboard_test_suite.cc +++ b/ui/keyboard/keyboard_test_suite.cc @@ -5,6 +5,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/compositor/compositor_setup.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/test/test_suite.h" class KeyboardTestSuite : public ui::test::UITestSuite { @@ -24,10 +25,12 @@ class KeyboardTestSuite : public ui::test::UITestSuite { void KeyboardTestSuite::Initialize() { ui::test::UITestSuite::Initialize(); + ui::CompositorTestSupport::Initialize(); ui::SetupTestCompositor(); } void KeyboardTestSuite::Shutdown() { + ui::CompositorTestSupport::Terminate(); ui::test::UITestSuite::Shutdown(); } |