Backed out changesets fb5765dffe01 and 0447429a5627 (Bug 1219058). r=me

I realize I wanted to shorten these paths in response to review
comments.  I'll reland shortly.

build/mobile/robocop/Makefile.in

@@ -2,7 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TESTPATH     := $(topsrcdir)/mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/tests
+mobile-tests := mobile/android/tests/browser/robocop
+TESTPATH     := $(topsrcdir)/$(mobile-tests)
 
 ANDROID_EXTRA_JARS += \
   $(srcdir)/robotium-solo-4.3.1.jar \
@@ -28,7 +29,7 @@ _JAVA_HARNESS := \
   StructuredLogger.java \
   $(NULL)
 
-java-harness := $(addprefix $(topsrcdir)/mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/,$(_JAVA_HARNESS))
+java-harness := $(addprefix $(srcdir)/,$(_JAVA_HARNESS))
 java-tests   := \
   $(wildcard $(TESTPATH)/*.java) \
   $(wildcard $(TESTPATH)/components/*.java) \

mobile/android/gradle/app/build.gradle

@@ -36,6 +36,7 @@ android {
         androidTest {
             manifest.srcFile "${topobjdir}/build/mobile/robocop/AndroidManifest.xml"
             java {
+                srcDir "src/robocop_harness"
                 srcDir "src/robocop"
                 srcDir "src/background"
                 srcDir "src/browser"

mobile/android/mach_commands.py

@@ -115,7 +115,8 @@ class MachCommands(MachCommandBase):
         srcdir('app/src/androidTest/res', 'build/mobile/robocop/res')
         srcdir('app/src/androidTest/assets', 'mobile/android/tests/browser/robocop/assets')
         # Test code.
-        srcdir('app/src/robocop', 'mobile/android/tests/browser/robocop/src/androidTest/java')
+        srcdir('app/src/robocop_harness/org/mozilla/gecko', 'build/mobile/robocop')
+        srcdir('app/src/robocop/org/mozilla/gecko/tests', 'mobile/android/tests/browser/robocop')
         srcdir('app/src/background', 'mobile/android/tests/background/junit3/src')
         srcdir('app/src/browser', 'mobile/android/tests/browser/junit3/src')
         srcdir('app/src/javaaddons', 'mobile/android/tests/javaaddons/src')

mobile/android/tests/browser/robocop/robocop.ini

@@ -1,179 +1,179 @@
 [DEFAULT]
 subsuite = robocop
 
-[src/androidTest/java/org/mozilla/gecko/tests/testGeckoProfile.java]
-# [src/androidTest/java/org/mozilla/gecko/tests/test_bug720538.java] # disabled on fig - bug 897072
-[src/androidTest/java/org/mozilla/gecko/tests/testAboutPage.java]
+[testGeckoProfile.java]
+# [test_bug720538.java] # disabled on fig - bug 897072
+[testAboutPage.java]
 # disabled on Android 2.3; bug 975187
 skip-if = android_version == "10"
-[src/androidTest/java/org/mozilla/gecko/tests/testAddonManager.java]
+[testAddonManager.java]
 # disabled on 2.3: bug 941624, bug 1063509, bug 1073374, bug 1087221, bug 1088023, bug 1088027, bug 1090206; on 4.3, bug 1144918
 skip-if = android_version == "10" || android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testAddSearchEngine.java]
+[testAddSearchEngine.java]
 # disabled on Android 2.3, bug 979552; on 4.3, bug 1120759
 skip-if = android_version == "10" || android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testAdobeFlash.java]
+[testAdobeFlash.java]
 # disabled on 4.3, bug 1146420
 skip-if = android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testANRReporter.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testAwesomebar.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testAxisLocking.java]
+[testANRReporter.java]
+[testAwesomebar.java]
+[testAxisLocking.java]
 # disabled on 4.3, bug 1144874
 skip-if = android_version == "18"
-# [src/androidTest/java/org/mozilla/gecko/tests/testBookmark.java] # see bug 915350
-[src/androidTest/java/org/mozilla/gecko/tests/testBookmarksPanel.java]
+# [testBookmark.java] # see bug 915350
+[testBookmarksPanel.java]
 # disabled on 2.3, bug 979615; on 4.3, bug 987930
 skip-if = android_version == "10" || android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testBookmarkFolders.java]
+[testBookmarkFolders.java]
 # disabled on Android 2.3, bug 979552; on 4.3, bug 1144921
 skip-if = android_version == "10" || android_version == "18"
-# [src/androidTest/java/org/mozilla/gecko/tests/testBookmarklets.java] # see bug 915350
-# [src/androidTest/java/org/mozilla/gecko/tests/testBookmarkKeyword.java] # see bug 915350
-[src/androidTest/java/org/mozilla/gecko/tests/testBrowserProvider.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testBrowserSearchVisibility.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testClearPrivateData.java]
+# [testBookmarklets.java] # see bug 915350
+# [testBookmarkKeyword.java] # see bug 915350
+[testBrowserProvider.java]
+[testBrowserSearchVisibility.java]
+[testClearPrivateData.java]
 # disabled on 2.3, bug 948591; on 4.3, bug 1000643
 skip-if = android_version == "10" || android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testDBUtils.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testDistribution.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testDoorHanger.java]
+[testDBUtils.java]
+[testDistribution.java]
+[testDoorHanger.java]
 # disabled on 2.3, bug 1085609; on 4.3, bug 1144924
 skip-if = android_version == "10" || android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testFilterOpenTab.java]
-# [src/androidTest/java/org/mozilla/gecko/tests/testFindInPage.java] # bug 1128287
-[src/androidTest/java/org/mozilla/gecko/tests/testFlingCorrectness.java]
+[testFilterOpenTab.java]
+# [testFindInPage.java] # bug 1128287
+[testFlingCorrectness.java]
 # disabled on 4.3, bug 1144874
 skip-if = android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testFormHistory.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testGetUserMedia.java]
+[testFormHistory.java]
+[testGetUserMedia.java]
 # failures across the board, bug 1092202 & bug 1144926
 skip-if = true
-# [src/androidTest/java/org/mozilla/gecko/tests/testHistory.java] # see bug 915350
-[src/androidTest/java/org/mozilla/gecko/tests/testHomeBanner.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testImportFromAndroid.java]
+# [testHistory.java] # see bug 915350
+[testHomeBanner.java]
+[testImportFromAndroid.java]
 # disabled on 2.3 and 4.3 bug 979552
 skip-if = android_version == "10" || android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testInputUrlBar.java]
+[testInputUrlBar.java]
 # disabled on 2.3 bug 1165511
 skip-if = android_version == "10"
-[src/androidTest/java/org/mozilla/gecko/tests/testJarReader.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testLinkContextMenu.java]
+[testJarReader.java]
+[testLinkContextMenu.java]
 # disabled on 4.3, bug 1083666
 skip-if = android_version == "18"
-# [src/androidTest/java/org/mozilla/gecko/tests/testHomeListsProvider.java] # see bug 952310
-[src/androidTest/java/org/mozilla/gecko/tests/testLoad.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testMailToContextMenu.java]
-# [src/androidTest/java/org/mozilla/gecko/tests/testMasterPassword.java] disabled for being finicky, see bug 1033013
+# [testHomeListsProvider.java] # see bug 952310
+[testLoad.java]
+[testMailToContextMenu.java]
+# [testMasterPassword.java] disabled for being finicky, see bug 1033013
 # disabled on 2.3; bug 979603
 # disabled on 4.0; bug 1006242
 # skip-if = android_version == "10" || android_version == "15"
-[src/androidTest/java/org/mozilla/gecko/tests/testNewTab.java]
+[testNewTab.java]
 # disabled on 4.3, bug 1145851
 skip-if = android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testPanCorrectness.java]
+[testPanCorrectness.java]
 # disabled on 4.3, bug 1144874
 skip-if = android_version == "18"
-# [src/androidTest/java/org/mozilla/gecko/tests/testPasswordEncrypt.java] # see bug 824067
-[src/androidTest/java/org/mozilla/gecko/tests/testPasswordProvider.java]
-# [src/androidTest/java/org/mozilla/gecko/tests/testPermissions.java] # see bug 757475
-[src/androidTest/java/org/mozilla/gecko/tests/testPictureLinkContextMenu.java]
+# [testPasswordEncrypt.java] # see bug 824067
+[testPasswordProvider.java]
+# [testPermissions.java] # see bug 757475
+[testPictureLinkContextMenu.java]
 # disabled on 4.3, bug 1031496
 skip-if = android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testPrefsObserver.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testPrivateBrowsing.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testPromptGridInput.java]
+[testPrefsObserver.java]
+[testPrivateBrowsing.java]
+[testPromptGridInput.java]
 # bug 1001657 for 2.3 and 4.3
 skip-if = android_version == "10" || android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testReadingListProvider.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testSearchHistoryProvider.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testSearchSuggestions.java]
+[testReadingListProvider.java]
+[testSearchHistoryProvider.java]
+[testSearchSuggestions.java]
 # disabled on 2.3, bug 907768; on 4.3, bug 1145867
 skip-if = android_version == "10" || android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testSessionOOMSave.java]
+[testSessionOOMSave.java]
 # disabled on 2.3, bug 945395; on 4.3, bug 1144888
 skip-if = android_version == "10" || android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testSessionOOMRestore.java]
+[testSessionOOMRestore.java]
 # disabled on Android 2.3, bug 979600; on 4.3, bug 1145879
 skip-if = android_version == "10" || android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testSettingsMenuItems.java]
+[testSettingsMenuItems.java]
 # disabled on Android 2.3, bug 979552; on 4.3, bug 1144898
 skip-if = android_version == "10" || android_version == "18"
-# [src/androidTest/java/org/mozilla/gecko/tests/testShareLink.java] # see bug 915897
-[src/androidTest/java/org/mozilla/gecko/tests/testSystemPages.java]
+# [testShareLink.java] # see bug 915897
+[testSystemPages.java]
 # disabled on 2.3, bug 979603; on 4.3, bug 1142811
 skip-if = android_version == "10" || android_version == "18"
-# [src/androidTest/java/org/mozilla/gecko/tests/testThumbnails.java] # see bug 813107
-[src/androidTest/java/org/mozilla/gecko/tests/testTitleBar.java]
+# [testThumbnails.java] # see bug 813107
+[testTitleBar.java]
 # disabled on Android 2.3, bug 979552; on 4.3, bug 1145881
 skip-if = android_version == "10" || android_version == "18"
-# [src/androidTest/java/org/mozilla/gecko/tests/testVkbOverlap.java] # see bug 907274
+# [testVkbOverlap.java] # see bug 907274
 
 # Using JavascriptTest
 # (If your test can be written entirely in Javascript, consider writing
 # it as a chrome test instead. See mobile/android/tests/browser/chrome.)
-[src/androidTest/java/org/mozilla/gecko/tests/testBrowserDiscovery.java]
+[testBrowserDiscovery.java]
 # disabled on 4.3, bug 1158384
 skip-if = android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testFilePicker.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testHistoryService.java]
+[testFilePicker.java]
+[testHistoryService.java]
 # disabled on 4.3, bug 1116036
 skip-if = android_version == "18"
-# [src/androidTest/java/org/mozilla/gecko/tests/testMozPay.java] # see bug 945675
-[src/androidTest/java/org/mozilla/gecko/tests/testOrderedBroadcast.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testOSLocale.java]
+# [testMozPay.java] # see bug 945675
+[testOrderedBroadcast.java]
+[testOSLocale.java]
 # disabled on 2.3 and 4.3: Bug 1124494
 skip-if = android_version == "10" || android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testReadingListCache.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testRestrictions.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testSnackbarAPI.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testTrackingProtection.java]
+[testReadingListCache.java]
+[testRestrictions.java]
+[testSnackbarAPI.java]
+[testTrackingProtection.java]
 # disabled on 4.3, bug 1158363
 skip-if = android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testUITelemetry.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testVideoControls.java]
+[testUITelemetry.java]
+[testVideoControls.java]
 # disabled on Android 2.3 due to video playback issues, bug 1088038; on 4.3, bug 1098532
 skip-if = android_version == "10" || android_version == "18"
 
 # Used for Talos, please don't use in mochitest
-#[src/androidTest/java/org/mozilla/gecko/tests/testCheck2.java]
-#[src/androidTest/java/org/mozilla/gecko/tests/testCheck3.java] # and the autophone version
+#[testCheck2.java]
+#[testCheck3.java] # and the autophone version
 
 # Using UITest
-#[src/androidTest/java/org/mozilla/gecko/tests/testAboutHomePageNavigation.java] # see bug 947550, bug 979038 and bug 977952
-[src/androidTest/java/org/mozilla/gecko/tests/testAboutHomeVisibility.java]
+#[testAboutHomePageNavigation.java] # see bug 947550, bug 979038 and bug 977952
+[testAboutHomeVisibility.java]
 # disabled on Android 2.3; bug 946656
 skip-if = android_version == "10"
-[src/androidTest/java/org/mozilla/gecko/tests/testAppMenuPathways.java]
+[testAppMenuPathways.java]
 # disabled on 4.3, bug 1158005
 skip-if = android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testBackButtonInEditMode.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testEventDispatcher.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testGeckoRequest.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testInputConnection.java]
+[testBackButtonInEditMode.java]
+[testEventDispatcher.java]
+[testGeckoRequest.java]
+[testInputConnection.java]
 # disabled on Android 2.3, 4.3; bug 1025968
 skip-if = android_version == "10" || android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testJavascriptBridge.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testNativeCrypto.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testReaderModeTitle.java]
-[src/androidTest/java/org/mozilla/gecko/tests/testSessionHistory.java]
+[testJavascriptBridge.java]
+[testNativeCrypto.java]
+[testReaderModeTitle.java]
+[testSessionHistory.java]
 # disabled on Android 4.3, bug 1144879
 skip-if = android_version == "18"
-[src/androidTest/java/org/mozilla/gecko/tests/testStateWhileLoading.java]
+[testStateWhileLoading.java]
 
-[src/androidTest/java/org/mozilla/gecko/tests/testSelectionCarets.java]
+[testSelectionCarets.java]
 # testSelectionHandler disabled on Android 2.3 by trailing skip-if, due to bug 980074
 # also disabled on Android 4.3, bug 1144882
-[src/androidTest/java/org/mozilla/gecko/tests/testSelectionHandler.java]
+[testSelectionHandler.java]
 skip-if = android_version == "10" || android_version == "18"
 
 # testInputSelections disabled on Android 2.3 by trailing skip-if, due to bug 980074
-[src/androidTest/java/org/mozilla/gecko/tests/testInputSelections.java]
+[testInputSelections.java]
 skip-if = android_version == "10"
 
 # testTextareaSelections disabled on Android 2.3 by trailing skip-if, due to bug 980074
-[src/androidTest/java/org/mozilla/gecko/tests/testTextareaSelections.java]
+[testTextareaSelections.java]
 skip-if = android_version == "10"
 
 # testStumblerSetting disabled on Android 4.3, bug 1145846
-[src/androidTest/java/org/mozilla/gecko/tests/testStumblerSetting.java]
+[testStumblerSetting.java]
 skip-if = android_version == "10" || android_version == "18"