Revert 170658. r170654 had moved these tests to interactive_ui_tests, which is...

Revert 170658. r170654 had moved these tests to interactive_ui_tests, which is needed for notification tests on aura.

> Revert r170623 "Convert HTML5 notification pyauto tests to browser_tests."
> 
> TBR=chrisgao@chromium.org
> BUG=none
> TEST=none
> NOTRY=true
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/11434073

TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/11316295

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170659 0039d316-1c4b-4281-b951-d872f2087c98

chrome/test/data/notifications/notification_tester.html

@@ -26,23 +26,6 @@ function createNotification(iconUrl, title, text, replaceId) {
   createNotificationHelper(note, replaceId, true);
 }
 
-// Creates an HTML notification with a given content url.
-// Returns an id for the notification, which can be used to cancel it with
-// |cancelNotification|. If two notifications are created with the same
-// replaceId, the second one should replace the first. If the notification
-// cannot be created, this returns -1.
-// If |waitForDisplay| is true, a response will not be sent until the
-// notification is actually displayed.
-function createHTMLNotification(contentUrl, replaceId, waitForDisplay) {
-  try {
-    var note = webkitNotifications.createHTMLNotification(contentUrl);
-  } catch (exception)  {
-    sendResultToTest(-1);
-    return;
-  }
-  createNotificationHelper(note, replaceId, waitForDisplay);
-}
-
 // Cancels a notification with the given id. The notification must be showing,
 // as opposed to waiting to be shown in the display queue.
 // Returns '1' on success.

chrome/test/functional/PYAUTO_TESTS

@@ -48,7 +48,6 @@
       'media.media_basic_playback',
       'multiprofile',
       'nacl_sdk',
-      'notifications',
       'ntp',
       'omnibox',
       'passwords',
@@ -99,10 +98,6 @@
       # 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
@@ -154,8 +149,8 @@
       # -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
@@ -197,10 +192,6 @@
       # 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
@@ -222,8 +213,6 @@
       # ===========================
       # Permanently-disabled tests.
       # ===========================
-      # crbug.com/104206
-      '-notifications.NotificationsTest.testKillNotificationProcess',
       # System password manager obstructs password automation.
       '-passwords',
 
@@ -234,8 +223,6 @@
       '-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
@@ -318,8 +305,6 @@
       '-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',