From 0ddbdc76e91d29d6aa6b21b9787a649e6e431fed Mon Sep 17 00:00:00 2001
From: "nileshagrawal@chromium.org"
 <nileshagrawal@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>
Date: Sat, 23 Feb 2013 01:49:55 +0000
Subject: [PATCH] Android: Add disabled file for content_browsertests

BUG=138275


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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@184253 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
---
 .../filter/content_browsertests_disabled      | 46 +++++++++++++++++++
 android/pylib/gtest/test_package.py           |  5 ++
 2 files changed, 51 insertions(+)
 create mode 100644 android/pylib/gtest/filter/content_browsertests_disabled

diff --git a/android/pylib/gtest/filter/content_browsertests_disabled b/android/pylib/gtest/filter/content_browsertests_disabled
new file mode 100644
index 000000000..b4c3aba07
--- /dev/null
+++ b/android/pylib/gtest/filter/content_browsertests_disabled
@@ -0,0 +1,46 @@
+# List of suppressions
+# Timeouts
+Http/MediaTest.*
+File/MediaTest.*
+ExternalClearKey/EncryptedMediaTest.*
+ClearKey/EncryptedMediaTest.*
+WorkerTest.*
+MediaTest.*
+AudioLayoutTest.*
+WebGLConformanceTest.*
+MessagePortTest.Tests
+EncryptedMediaTest.InvalidKeySystem
+IndexedDBBrowserTest.NullKeyPathPersistence
+IndexedDBBrowserTest.VersionChangeCrashResilience
+CrossPlatformAccessibilityBrowserTest.*
+GpuCrashTest.MANUAL_WebkitLoseContext
+DatabaseTest.*
+BrowserPluginHostTest.*
+
+# Failures
+WebrtcBrowserTest.*
+WorkerLayoutTest.*
+MediaLayoutTest.*
+IndexedDBLayoutTest.*
+ContentBrowserTest.MANUAL_ShouldntRun
+RenderViewHostTest.BaseURLParam
+OffTheRecordClipboardTest.ClearContentData
+FileSystemLayoutTest.*
+GpuPixelTestCanvas2DSD.MANUAL_Canvas2DRedBoxSD
+GpuPixelBrowserTest.*
+BlobLayoutTest.XhrResponseBlob
+FileSystemBrowserTestWithLowQuota.QuotaTest
+BlobLayoutTest.*
+ChildProcessSecurityPolicyInProcessBrowserTest.NoLeak
+
+# Crashes
+RenderViewImplTest.*
+BrowserPluginTest.*
+PluginTest.*
+WorkerXHRHttpLayoutTest.Tests
+SecurityExploitBrowserTest.SetWebUIProperty
+RendererAccessibilityTest.EditableTextModeFocusNotifications
+RenderWidgetTest.OnMsgPaintAtSize
+GpuCrashTest.MANUAL_Kill
+DownloadContentTest.ResumeInterruptedDownload
+RenderViewHostManagerTest.*
diff --git a/android/pylib/gtest/test_package.py b/android/pylib/gtest/test_package.py
index be153a0dd..cde3b3944 100644
--- a/android/pylib/gtest/test_package.py
+++ b/android/pylib/gtest/test_package.py
@@ -111,6 +111,11 @@ class TestPackage(object):
       self.adb.PushIfNeeded(
           self.test_suite_dirname + '/linux_dumper_unittest_helper',
           constants.TEST_EXECUTABLE_DIR + '/linux_dumper_unittest_helper')
+    if self.test_suite_basename == 'content_browsertests':
+      self.adb.PushIfNeeded(
+          self.test_suite_dirname +
+          '/../content_shell/assets/content_shell.pak',
+          external_storage + '/paks/content_shell.pak')
 
   def _WatchTestOutput(self, p):
     """Watches the test output.