Fix testNaClSDK

functional/PYAUTO_TESTS

Index: functional/PYAUTO_TESTS
===================================================================
--- functional/PYAUTO_TESTS	(revision 136049)
+++ functional/PYAUTO_TESTS	(working copy)
@@ -40,7 +40,6 @@
       'bookmarks',
       'browser',
       'browsing_data',
-      'chromoting_basic',

[Nirnimesh, 2012/05/09 19:48:36]

Please re-sync. These should not be in your CL

[Pooja Nihalani, 2012/05/09 23:31:41]

Done.

       'codesign',
       'content',
       'cookies',
@@ -85,10 +84,6 @@
       'themes',
       'youtube',
 
-      # One-click infobars disabled on M20 by r135749.
-      # Re-enable for M21 after branch point.
-      '-infobars.OneClickInfobarTest',
-
       # ==================================================
       # Disabled tests that need to be investigated/fixed.
       # ==================================================
@@ -100,18 +95,36 @@
       '-autofill.AutofillTest.testNoDuplicatePhoneNumsInPrefs',
       # crbug.com/123396
       '-fullscreen_mouselock.FullscreenMouselockTest.testPatternsForFSAndML',
-      # crbug.com/100593
-      '-nacl_sdk.NaClSDKTest.testVerifyNaClPlugin',
+      # crbug.com/126388
+      '-indexeddb.IndexedDBTest.testIndexedDBNullKeyPathPersistence',
+      # crbug.com/126311
+      '-infobars.OneClickInfobarTest.testDisplayOneClickInfobarPerProfile',
+      # crbug.com/126261
+      '-instant.InstantSettingsTest.testEnableDisableInstant',
+      '-instant.InstantTest.testExtnPageCanDismissInstant',
+      '-instant.InstantTest.testFindInCanDismissInstant',
+      '-instant.InstantTest.testInstantDisabledForJavaScript',
+      '-instant.InstantTest.testInstantDisabledForURLs',
+      '-instant.InstantTest.testInstantDisabledInIncognito',
+      '-instant.InstantTest.testInstantLoadsFor100CharsLongQuery',
+      '-instant.InstantTest.testInstantNavigation',
+      '-instant.InstantTest.testInstantWithSearchEngineOtherThanGoogle',
+      '-instant.InstantTest.testNTPCanDismissInstant',
+      '-instant.InstantTest.testNewWindowCanDismissInstant',
+      '-instant.InstantTest.testPreFetchInstantURLNotInHistory',
+      # crbug.com/126311
+      '-multiprofile.MultiprofileTest.test20NewProfiles',
+      '-multiprofile.MultiprofileTest.testBasic',
       # crbug.com/105560
       '-notifications',
       # crbug.com/99506
       '-notifications.NotificationsTest.testSpecialURLNotification',
+      # crbug.com/126311
+      '-ntp.NTPTest.testDifferentProfileNotAppearInMostVisited',
       # crbug.com/71715
       '-omnibox.OmniboxTest.testHistoryResult',
       # crbug.com/123019
       '-omnibox.OmniboxTest.testAutoCompleteForNonAsciiSearch',
-      # crbug.com/117720
-      '-passwords.PasswordTest.testPasswordAutofilledInIncognito',
       # crbug.com/86524
       '-plugins.PluginsTest.testAllowPluginException',
       # crbug.com/97140
@@ -308,8 +321,6 @@
       # ===========================
       # You cannot resize the browser window on ChromeOS.
       '-browser.BrowserTest.testWindowResize',
-      # ChromeOS doesn't yet support the chromoting host.
-      '-chromoting_basic',
       # No codesign verification on ChromeOS.
       '-codesign',
       # Import tests are invalid on ChromeOS since Chrome is the only browser.
@@ -485,20 +496,10 @@
       'nacl_sdk',
       'translate',
 
-      # ===========================
-      # Permanently-disabled tests.
-      # ===========================
-      # The chromoting webapp isn't currently available when FULL is run.
-      '-chromoting_basic',
-
       # ==================================================
       # Disabled tests that need to be investigated/fixed.
       # ==================================================
       # The source is behind.  Waiting for dev to automate the update.
-      '-nacl_sdk.NaClSDKTest.testVerifyNaClSDKChecksum',
-      # crbug.com/98681
-      '-nacl_sdk.NaClSDKTest.testNaClSDK',
-      '-nacl_sdk.NaClSDKTest.testVerifyPrereleaseGallery',
       # crbug.com/109160
       '-execute_javascript.ExecuteJavascriptTest.testExecuteJavascriptInExtension',
     ],
@@ -581,7 +582,6 @@
       # ===========================
       # No NaCl support on ChromeOS.
       '-nacl_sdk',
-
       # ==================================================
       # Disabled tests that need to be investigated/fixed.
       # ==================================================
@@ -592,42 +592,6 @@
     ],
   },
 
-  # Performance tests.
-  # TODO(dennisjeffrey): Modify desktopui_PyAutoPerfTests autotest to use this
-  # suite instead of CHROMEOS_PERF.
-  'PERFORMANCE': {
-    'all': [
-      'perf',
-    ],
-    'win': [
-      '-perf.GPUPerfTest',  # Fails. Discuss with prachij@.
-      '-perf.LiveGamePerfTest',  # Requires linux /proc/stat.
-      '-perf.MemoryTest',  # Designed only for ChromeOS.
-      '-perf.NetflixPerfTest',  # Netflix plugin not available.
-      '-perf.PageCyclerTest',  # Requires page cycler data files on QA bots.
-      '-perf.YoutubePerfTest',  # AttributeError: AssertPlayingState.
-    ],
-    'mac': [
-      '-perf.GPUPerfTest',  # Fails. Discuss with prachij@.
-      '-perf.LiveGamePerfTest',  # Requires linux /proc/stat.
-      '-perf.MemoryTest',  # Designed only for ChromeOS.
-      '-perf.NetflixPerfTest',  # Netflix plugin not available.
-      '-perf.PageCyclerTest',  # Requires page cycler data files on QA bots.
-      '-perf.YoutubePerfTest',  # AttributeError: AssertPlayingState.
-    ],
-    'linux': [
-      '-perf.GPUPerfTest',  # Fails. Discuss with prachij@.
-      '-perf.MemoryTest',  # Designed only for ChromeOS.
-      '-perf.NetflixPerfTest',  # Netflix plugin not available.
-      '-perf.PageCyclerTest',  # Requires page cycler data files on QA bots.
-      '-perf.WebGLTest',  # May not render WebGL; need to verify on QA bot.
-      '-perf.YoutubePerfTest',  # AttributeError: AssertPlayingState.
-    ],
-    'chromeos': [
-      '-perf.GPUPerfTest',  # Not designed for ChromeOS.
-    ],
-  },
-
   'PERFORMANCE_LAB': {
     'all': [
       'perf.BenchmarkPerfTest.testV8BenchmarkSuite',
@@ -683,8 +647,6 @@
       'chromeos_onc',
       'policy',
       'policy_prefs_ui',
-      # TODO(craigdh): Determine why this test is crashing PyAuto.
-      '-chromeos_onc.ChromeosONC.testAddBacktoBackONC',
       # crbug.com/115427
       '-policy.PolicyTest.testAlwaysAuthorizePlugins',
       # crbug.com/118054
@@ -754,6 +716,8 @@
   'WEBRTC': {
     'all': [
       'media_stream_infobar',
+    ],
+    'linux': [
       'webrtc_call',
     ],
   },