aura/cc: Fix DesktopNotificationsTest

chrome/browser/notifications/desktop_notifications_unittest.cc

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 d2b5b2f3e96507975e2f0378c7aa9405627b8fed..ee54d05a1f3d3dee6f4f88a40428a78952951f20 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