| Index: chrome/browser/notifications/desktop_notifications_unittest.cc
|
| diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc
|
| index ee54d05a1f3d3dee6f4f88a40428a78952951f20..46dcddaff4497a6f2b0b1562311dfbaf7e49cf14 100644
|
| --- a/chrome/browser/notifications/desktop_notifications_unittest.cc
|
| +++ b/chrome/browser/notifications/desktop_notifications_unittest.cc
|
| @@ -12,9 +12,7 @@
|
| #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
|
|
|
| @@ -92,9 +90,7 @@ 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();
|
| @@ -115,10 +111,8 @@ void DesktopNotificationsTest::TearDown() {
|
| profile_.reset(NULL);
|
| #if defined(USE_AURA)
|
| aura::RootWindow::DeleteInstance();
|
| -#if defined(USE_WEBKIT_COMPOSITOR)
|
| WebKit::shutdown();
|
| #endif
|
| -#endif
|
| }
|
|
|
| content::ShowDesktopNotificationHostMsgParams
|
|
|