Commit 502b59e2 authored by gab@chromium.org's avatar gab@chromium.org

Remove ActiveDesktopMonitor from DesktopNotificationsUnittests

An ActiveDesktopMonitor is actually not necessary here I believe (a window is never activated so the monitor simply returns the default host desktop type (which is the same as the type returned when there is no monitor).

BUG=179830

Review URL: https://chromiumcodereview.appspot.com/17074007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208051 0039d316-1c4b-4281-b951-d872f2087c98
parent 757036d7
......@@ -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.
......
......@@ -117,8 +117,6 @@ class DesktopNotificationsTest : public testing::Test {
#if defined(USE_ASH)
content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
webkit_platform_support_;
scoped_ptr<ActiveDesktopMonitor> active_desktop_monitor_;
#endif
// Contains the cumulative output of the unit test.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment