Android: Enable a bunch of InProcessBrowserLayoutTests.

    
Also allow multi level nested loops. number of passing tests: 108-->200

BUG=138275


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

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

3 files changed, 47 insertions, 10 deletions

diff --git a/build/android/pylib/gtest/filter/content_browsertests_disabled b/build/android/pylib/gtest/filter/content_browsertests_disabled
index c51040b..8b16f8a 100644
--- a/build/android/pylib/gtest/filter/content_browsertests_disabled
+++ b/build/android/pylib/gtest/filter/content_browsertests_disabled
@@ -6,7 +6,6 @@ ExternalClearKey/EncryptedMediaTest.*
 ClearKey/EncryptedMediaTest.*
 WorkerTest.*
 MediaTest.*
-AudioLayoutTest.*
 WebGLConformanceTest.*
 MessagePortTest.Tests
 EncryptedMediaTest.InvalidKeySystem
@@ -17,21 +16,30 @@ IndexedDBBrowserTest.ValueSizeTest
 IndexedDBBrowserTest.ConnectionsClosedOnTabClose
 CrossPlatformAccessibilityBrowserTest.*
 DatabaseTest.*
+IndexedDBLayoutTest.BasicTests
 
 # Failures
-WorkerLayoutTest.*
-MediaLayoutTest.*
-IndexedDBLayoutTest.*
 RenderViewHostTest.BaseURLParam
 OffTheRecordClipboardTest.ClearContentData
-FileSystemLayoutTest.*
 GpuPixelBrowserTest.*
-BlobLayoutTest.XhrResponseBlob
 FileSystemBrowserTestWithLowQuota.QuotaTest
-BlobLayoutTest.*
 ChildProcessSecurityPolicyInProcessBrowserTest.NoLeak
-
-# Crashes
+AudioLayoutTest.AudioDataUrl
+FileSystemLayoutTest.WorkersFileWriterEventsSharedWorker
+MediaLayoutTest.VideoAutoplayTest
+MediaLayoutTest.VideoLoopTest
+WorkerLayoutTest.SharedWorkerFastContextGC
+WorkerLayoutTest.SharedWorkerFastException
+WorkerLayoutTest.SharedWorkerFastGC
+WorkerLayoutTest.SharedWorkerFastInIframe
+WorkerLayoutTest.SharedWorkerFastLocation
+WorkerLayoutTest.SharedWorkerFastName
+WorkerLayoutTest.SharedWorkerFastNavigator
+WorkerLayoutTest.SharedWorkerFastReplaceGlobalConstructor
+WorkerLayoutTest.SharedWorkerFastReplaceSelf
+WorkerLayoutTest.SharedWorkerFastScriptError
+WorkerLayoutTest.SharedWorkerFastShared
+WorkerLayoutTest.SharedWorkerFastSimple
 WorkerXHRHttpLayoutTest.Tests
 
 # Needs to start the test server before
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
index 1be28a2..f36ca46 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -131,6 +131,29 @@ def _GetDataFilesForTestSuite(test_suite_basename):
     ]
   return []
 
+def _GetOptionalDataFilesForTestSuite(test_suite_basename):
+  """Returns a list of data files/dirs that are pushed if present.
+
+  Args:
+    test_suite_basename: The test suite basename for which to return file paths.
+
+  Returns:
+    A list of test file and directory paths.
+  """
+  if test_suite_basename == 'content_browsertests':
+    # See http://crbug.com/105104 for why these are needed.
+    return [
+      'third_party/WebKit/LayoutTests/fast/events',
+      'third_party/WebKit/LayoutTests/fast/files',
+      'third_party/WebKit/LayoutTests/fast/filesystem',
+      'third_party/WebKit/LayoutTests/fast/js/resources',
+      'third_party/WebKit/LayoutTests/fast/workers',
+      'third_party/WebKit/LayoutTests/http/tests',
+      'third_party/WebKit/LayoutTests/media',
+      'third_party/WebKit/LayoutTests/storage/indexeddb',
+    ]
+  return []
+
 
 def _TestSuiteRequiresMockTestServer(test_suite_basename):
   """Returns True if the test suite requires mock test server."""
@@ -206,6 +229,13 @@ class TestRunner(base_test_runner.BaseTestRunner):
       self.adb.WaitForSdCardReady(20)
       for data in test_data:
         self.CopyTestData([data], self.adb.GetExternalStorage())
+    optional_test_data = _GetOptionalDataFilesForTestSuite(
+        self.test_package.test_suite_basename)
+    if optional_test_data:
+      self.adb.WaitForSdCardReady(20)
+      for data in optional_test_data:
+        if os.path.exists(data):
+          self.CopyTestData([data], self.adb.GetExternalStorage())
     if self.test_package.test_suite_basename == 'webkit_unit_tests':
       self.PushWebKitUnitTestsData()
 
diff --git a/content/test/browser_test_message_pump_android.cc b/content/test/browser_test_message_pump_android.cc
index b20b491..f992110 100644
--- a/content/test/browser_test_message_pump_android.cc
+++ b/content/test/browser_test_message_pump_android.cc
@@ -56,7 +56,6 @@ void BrowserTestMessagePumpAndroid::Run(Delegate* delegate) {
   RunState state(delegate, state_ ? state_->run_depth + 1 : 1);
   RunState* previous_state = state_;
   state_ = &state;
-  DCHECK(state_->run_depth <= 1) << "Only one level nested loops supported";
 
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);