diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 05:20:50 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 05:20:50 +0000 |
| commit | dd3f77785261dbfc32fbc1dd03855701e81ee50c (patch) | |
| tree | 4def2daa8a4df9cc782d9e8a32287b4c0255a16e /chrome/browser/notifications/desktop_notifications_unittest.cc | |
| parent | 2ad927066c063c1a9ddaf6d7d3ebc279159678ec (diff) | |
| download | chromium_src-dd3f77785261dbfc32fbc1dd03855701e81ee50c.zip chromium_src-dd3f77785261dbfc32fbc1dd03855701e81ee50c.tar.gz chromium_src-dd3f77785261dbfc32fbc1dd03855701e81ee50c.tar.bz2 | |
aura/cc: Fix DesktopNotificationsTest
BUG=None
TEST=browser_tests --gtest_filter="DesktopNotificationsTest.*" with use_aura=1 and use_webkit_compositor=1 (in debug), verify no assert.
Review URL: http://codereview.chromium.org/8771057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113353 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/desktop_notifications_unittest.cc')
| -rw-r--r-- | chrome/browser/notifications/desktop_notifications_unittest.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc index d2b5b2f..ee54d05 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.cc +++ b/chrome/browser/notifications/desktop_notifications_unittest.cc @@ -12,6 +12,9 @@ #include "content/public/common/show_desktop_notification_params.h" #if defined(USE_AURA) +#if defined(USE_WEBKIT_COMPOSITOR) +#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" +#endif #include "ui/aura/root_window.h" #endif @@ -89,6 +92,9 @@ DesktopNotificationsTest::~DesktopNotificationsTest() { void DesktopNotificationsTest::SetUp() { #if defined(USE_AURA) +#if defined(USE_WEBKIT_COMPOSITOR) + WebKit::initialize(&webkit_platform_support_); +#endif // MockBalloonCollection retrieves information about the screen on creation. // So it is necessary to make sure the desktop gets created first. aura::RootWindow::GetInstance(); @@ -107,6 +113,12 @@ void DesktopNotificationsTest::TearDown() { service_.reset(NULL); ui_manager_.reset(NULL); profile_.reset(NULL); +#if defined(USE_AURA) + aura::RootWindow::DeleteInstance(); +#if defined(USE_WEBKIT_COMPOSITOR) + WebKit::shutdown(); +#endif +#endif } content::ShowDesktopNotificationHostMsgParams |