Bug 1219058 - Part 2: Normalize Robocop test harness source layout. r=gbrown

Pretty straight-forward.  The win here is that the directory is now
sensible, so we don't need the robocop_harness symlink for the Gradle
build configuration.

--HG--
rename : build/mobile/robocop/Actions.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/Actions.java
rename : build/mobile/robocop/Assert.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/Assert.java
rename : build/mobile/robocop/Driver.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/Driver.java
rename : build/mobile/robocop/Element.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/Element.java
rename : build/mobile/robocop/FennecInstrumentationTestRunner.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecInstrumentationTestRunner.java
rename : build/mobile/robocop/FennecMochitestAssert.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecMochitestAssert.java
rename : build/mobile/robocop/FennecNativeActions.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecNativeActions.java
rename : build/mobile/robocop/FennecNativeDriver.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecNativeDriver.java
rename : build/mobile/robocop/FennecNativeElement.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecNativeElement.java
rename : build/mobile/robocop/FennecTalosAssert.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/FennecTalosAssert.java
rename : build/mobile/robocop/LaunchFennecWithConfigurationActivity.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/LaunchFennecWithConfigurationActivity.java
rename : build/mobile/robocop/PaintedSurface.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/PaintedSurface.java
rename : build/mobile/robocop/RoboCopException.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/RoboCopException.java
rename : build/mobile/robocop/RobocopShare1.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/RobocopShare1.java
rename : build/mobile/robocop/RobocopShare2.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/RobocopShare2.java
rename : build/mobile/robocop/RobocopUtils.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/RobocopUtils.java
rename : build/mobile/robocop/StructuredLogger.java => mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/StructuredLogger.java
extra : commitid : HPsDE5jkOoC
extra : rebase_source : b6fff75ca2648d83501aec75f4a066c1e2e4c989
extra : histedit_source : b0f6ab840e957cb3d1e5d7450bf41e5ae5ef39e9

build/mobile/robocop/Makefile.in

@@ -28,7 +28,7 @@ _JAVA_HARNESS := \
   StructuredLogger.java \
   $(NULL)
 
-java-harness := $(addprefix $(srcdir)/,$(_JAVA_HARNESS))
+java-harness := $(addprefix $(topsrcdir)/mobile/android/tests/browser/robocop/src/androidTest/java/org/mozilla/gecko/,$(_JAVA_HARNESS))
 java-tests   := \
   $(wildcard $(TESTPATH)/*.java) \
   $(wildcard $(TESTPATH)/components/*.java) \

mobile/android/gradle/app/build.gradle

@@ -36,7 +36,6 @@ 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,6 @@ 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_harness/org/mozilla/gecko', 'build/mobile/robocop')
         srcdir('app/src/robocop', 'mobile/android/tests/browser/robocop/src/androidTest/java')
         srcdir('app/src/background', 'mobile/android/tests/background/junit3/src')
         srcdir('app/src/browser', 'mobile/android/tests/browser/junit3/src')