From e154db37450561942285e2cdb00adce0171e15aa Mon Sep 17 00:00:00 2001 From: "stevenjb@google.com" Date: Mon, 18 Jun 2012 16:20:46 +0000 Subject: Change kAshNotify to kAshNotifyDisabled (default ash notifications to enabled) BUG=124914 TEST=Ash notifications should be enabled by default, can be disabled with --ash-notify-disabled TBR=sadrul@chormium.org Review URL: https://chromiumcodereview.appspot.com/10540168 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142730 0039d316-1c4b-4281-b951-d872f2087c98 --- .../browser/task_manager/task_manager_notification_browsertest.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'chrome/browser/task_manager') diff --git a/chrome/browser/task_manager/task_manager_notification_browsertest.cc b/chrome/browser/task_manager/task_manager_notification_browsertest.cc index f428ed3..233335f 100644 --- a/chrome/browser/task_manager/task_manager_notification_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_notification_browsertest.cc @@ -19,6 +19,10 @@ #include "content/public/common/content_switches.h" #include "testing/gtest/include/gtest/gtest.h" +#if !defined(USE_ASH) +// These tests do not apply on Ash where notifications do not instantiate +// a new renderer. + class TaskManagerNotificationBrowserTest : public ExtensionBrowserTest { public: TaskManagerModel* model() const { @@ -68,3 +72,5 @@ IN_PROC_BROWSER_TEST_F(TaskManagerNotificationBrowserTest, notifications->CancelById(n2.notification_id()); TaskManagerBrowserTestUtil::WaitForResourceChange(2); } + +#endif // !USE_ASH -- cgit v1.1