Revert 170658. r170654 had moved these tests to interactive_ui_tests, which is needed for notificat…

chrome/test/functional/PYAUTO_TESTS

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # This file lists the pyauto tests that run as a part of the functional test
 # suite.
 #
 # Tests can be enabled on a per-platform basis. Tests not listed here will
 # not be run.
 #
@@ skipping 30 matching lines @@
       'execute_javascript',
       'extensions',
       'fullscreen_mouselock',
       'gtalk.test_basic',
       'imports',
       'infobars',
       'instant',
       'media.media_basic_playback',
       'multiprofile',
       'nacl_sdk',
-      'notifications',
       'ntp',
       'omnibox',
       'passwords',
       'prefs',
       'prefs_ui',
       'pyauto_webdriver',
       'search_engines',
       'special_tabs',
       'sync.SyncTest',
       'test_pyauto',
@@ skipping 30 matching lines @@
       '-infobars.OneClickInfobarTest.testNoOneClickInfobarAfterCancel',
       # crbug.com/133315
       '-infobars.OneClickInfobarTest.testDisplayOneClickInfobarAfterDismiss',
       # crbug.com/131874
       '-infobars.OneClickInfobarTest.testNoOneClickInfobarAfterCancel',
       # crbug.com/124913
       '-infobars.OneClickInfobarTest.testNoSameIDSigninForTwoProfiles',
       # Mysteriously broken?
       # crbug.com/138857
       '-multiprofile.MultiprofileTest.testMakeSearchEngineDefaultInMultiprofile',
-      # crbug.com/105560
-      '-notifications',
-      # crbug.com/99506
-      '-notifications.NotificationsTest.testSpecialURLNotification',
       # crbug.com/143308
       '-omnibox.OmniboxLiveTest.testGoogleSearch',
       # crbug.com/71715
       '-omnibox.OmniboxTest.testHistoryResult',
       # crbug.com/123019
       '-omnibox.OmniboxTest.testAutoCompleteForNonAsciiSearch',
       # crbug.com/137041
       '-omnibox.OmniboxTest.testDifferentTypesOfResults',
       # crbug.com/85600
       '-prefs.PrefsTest.testNavigationStateOnSessionRestore',
@@ skipping 31 matching lines @@
       # crbug.com/113090
       '-extensions.ExtensionsTest.testAllowIncognitoExtension',
       # crbug.com/94682
       '-gpu.GpuTest.test2dCanvas',
       # Disabled on vista in the actual test. crbug.com/89767
       # -imports.ImportsTest.testImportFirefoxDataTwice
       # Disabled on vista in the actual test. crbug.com/89767
       # -imports.ImportsTest.testFirefoxImportFromPrefs
       # Disabled on vista in the actual test. crbug.com/89767
       # -imports.ImportsTest.testImportFirefoxPasswordsFromPrefs
-      # crbug.com/95031
-      '-notifications.NotificationsTest.testOriginPrefsNotSavedInIncognito',
+      # crbug.com/125424
+      '-media.media_basic_playback.MediaBasicPlaybackTest.testBasicPlaybackMatrix',
       # crbug.com/117569
       '-passwords.PasswordTest.testSavedPasswordInTabsAndWindows',
       # crbug.com/98526
       '-pyauto_webdriver.PyAutoWebDriverTest.testCanConnectToRestartedBrowser',
       '-pyauto_webdriver.PyAutoWebDriverTest.testTypeIntoTextBox',
       # Disable sync.SyncIntegrationTest on the QA bots in FULL,
       # until sync protobufs are copied over.
       # Also, see crbug.com/104227
       '-sync.SyncIntegrationTest',
       # crbug.com/88679
@@ skipping 21 matching lines @@
       # crbug.com/125989
       '-fullscreen_mouselock.FullscreenMouselockTest.testMouseLockExitWhenAlertDialogShow',
       # Fails on chrome-mac-10_7-qa only: crbug.com/124886
       '-fullscreen_mouselock.FullscreenMouselockTest.testPrefsForFullscreenExit',
       '-fullscreen_mouselock.FullscreenMouselockTest.testNoMouseLockWhenCancelFS',
       # crbug.com/114244
       '-imports.ImportsTest.testImportSafariDataTwice',
       # crbug.com/121484
       '-multiprofile.MultiprofileTest.test20NewProfiles',
       '-ntp.NTPTest.testLaunchAppNewWindow',  # crbug.com/79812
-      # Causes browser crash.  crbug.com/93548
-      '-notifications.NotificationsTest.testIncognitoNotification',
-      '-notifications.NotificationsTest.testOriginPrefsNotSavedInIncognito',
-      '-notifications.NotificationsTest.testNotificationOrderAfterClosingOne',
       # crbug.com/70437
       '-omnibox.OmniboxTest.testHistoryResult',
       # crbug.com/91617
       '-omnibox.OmniboxTest.testContentHistory',
       # Keychain popups make autofill/password tests difficult: crbug.com/49378
       '-passwords',
       # crbug.com/69619
       '-search_engines.SearchEnginesTest.testDiscoverSearchEngine',
       # Keychain popups make sync tests difficult on Mac.  crbug.com/49378
       '-sync',
       # crbug.com/98526
       '-pyauto_webdriver.PyAutoWebDriverTest.testCanConnectToRestartedBrowser',
       '-pyauto_webdriver.PyAutoWebDriverTest.testTypeIntoTextBox',
     ],
 
     'linux': [
       'test_clean_exit',
 
       # ===========================
       # Permanently-disabled tests.
       # ===========================
-      # crbug.com/104206
-      '-notifications.NotificationsTest.testKillNotificationProcess',
       # System password manager obstructs password automation.
       '-passwords',
 
       # ==================================================
       # Disabled tests that need to be investigated/fixed.
       # ==================================================
       # crbug.com/100365
       '-autofill.AutofillTest.testDisplayLineItemForEntriesWithNoCCNum',
       # crbug.com/111289
       '-extensions.ExtensionsTest.testAllowAccessFileURLs',
-      # crbug.com/66072
-      '-notifications.NotificationsTest.testNotificationOrderAfterClosingOne',
       # crbug.com/91033
       '-omnibox.OmniboxTest.testOmniboxSearchHistory',
       # Gnome / kwallet popups on linux break sync tests.  crbug.com/80329
       '-sync',
     ],
 
     'chromeos': [
       'chromeos_basic',
       'chromeos_browser',
       'chromeos_crosh',
@@ skipping 62 matching lines @@
       '-prefs.PrefsTest.testSessionRestore',
       # sync tests were running into a secondary passphrase. crosbug.com/15016.
       '-sync',
       # Deal with i18n chars.  crosbug.com/12639
       '-downloads.DownloadsTest.testCrazyFilenames',
       '-omnibox.OmniboxTest.testCrazyFilenames',
       # crosbug.com/16977
       '-chromeos_wifi_sanity.ChromeosWifiSanity.testConnectToHiddenWiFiNonExistent',
       # crosbug.com/20025
       '-chromeos_browser.ChromeosBrowserTest.testFullScreen',
-      # crbug.com/102549
-      '-notifications.NotificationsTest.testOriginPrefsNotSavedInIncognito',
       # Chrome driver does not work in Chrome OS.
       # crosbug.com/19556
       '-prefs_ui',
       '-prefs.PrefsTest.testGeolocationBlockedWhenTrackingDenied',
       '-prefs.PrefsTest.testGeolocationPref',
       '-pyauto_webdriver',
     ],
   },
 
   # Performance tests.
@@ skipping 256 matching lines @@
       '-search_engines.SearchEnginesTest.testDiscoverSearchEngine',
       '-ntp.NTPTest.testUninstallApp',
       '-ntp.NTPTest.testLaunchAppWithDefaultSettings',
       '-ntp.NTPTest.testLaunchAppRegularTab',
       '-ntp.NTPTest.testLaunchAppPinnedTab',
       '-ntp.NTPTest.testGetAppsWhenInstallApp',
       '-ntp.NTPTest.testLaunchAppNewWindow',
     ],
   },
 }