Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1309)

Unified Diff: chrome/browser/notifications/desktop_notifications_unittest.cc

Issue 17074007: Remove ActiveDesktopMonitor from DesktopNotificationsUnittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/notifications/desktop_notifications_unittest.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a539e7b1c26f24b7d0291fe2b903306454f25c63..7b969f324fe77e74411a55687f9391e4e17211e9 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.cc
+++ b/chrome/browser/notifications/desktop_notifications_unittest.cc
@@ -21,7 +21,6 @@
#if defined(USE_ASH)
#include "ash/shell.h"
#include "ash/test/test_shell_delegate.h"
-#include "chrome/browser/ui/aura/active_desktop_monitor.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "ui/aura/env.h"
#include "ui/aura/root_window.h"
@@ -113,7 +112,6 @@ void DesktopNotificationsTest::SetUp() {
// MockBalloonCollection retrieves information about the screen on creation.
// So it is necessary to make sure the desktop gets created first.
ash::Shell::CreateInstance(new ash::test::TestShellDelegate);
- active_desktop_monitor_.reset(new ActiveDesktopMonitor);
#endif
chrome::RegisterLocalState(local_state_.registry());
@@ -130,7 +128,6 @@ void DesktopNotificationsTest::TearDown() {
ui_manager_.reset(NULL);
profile_.reset(NULL);
#if defined(USE_ASH)
- active_desktop_monitor_.reset();
ash::Shell::DeleteInstance();
// The message center is notmally shutdown on |g_browser_process| which
// is not created for these tests.
« no previous file with comments | « chrome/browser/notifications/desktop_notifications_unittest.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698