Move ui and content resources into one location.

base/android/jni_generator/testJarJarRemapping.golden

Index: base/android/jni_generator/testJarJarRemapping.golden
diff --git a/base/android/jni_generator/testJarJarRemapping.golden b/base/android/jni_generator/testJarJarRemapping.golden
index a4911d004816d00e2a25540db5091d4c854b79bb..9b2c0b3fc67e31d6b12ddaca9d8052f948ade8b3 100644
--- a/base/android/jni_generator/testJarJarRemapping.golden
+++ b/base/android/jni_generator/testJarJarRemapping.golden
@@ -27,6 +27,15 @@ jclass g_Example_clazz = NULL;
 static void Test(JNIEnv* env, jclass jcaller,
     jobject t);
 
+static void Test2(JNIEnv* env, jclass jcaller,
+    jobject t);
+
+static void Test3(JNIEnv* env, jclass jcaller,
+    jobject t);
+
+static void Test4(JNIEnv* env, jclass jcaller,
+    jobject t);
+
 // Step 2: method stubs.
 
 // Step 3: RegisterNatives.
@@ -34,9 +43,24 @@ static void Test(JNIEnv* env, jclass jcaller,
 static const JNINativeMethod kMethodsExample[] = {
     { "nativeTest",
 "("
-"Lorg/test2/org/chromium/example2/Test;"
+"Lorg/test2/Test;"
 ")"
 "V", reinterpret_cast<void*>(Test) },
+    { "nativeTest2",
+"("
+"Lorg/chromium/example3/PrefixFoo;"
+")"
+"V", reinterpret_cast<void*>(Test2) },
+    { "nativeTest3",
+"("
+"Lorg/test3/Test;"
+")"
+"V", reinterpret_cast<void*>(Test3) },
+    { "nativeTest4",
+"("
+"Lorg/test3/TestBar$Inner;"
+")"
+"V", reinterpret_cast<void*>(Test4) },
 };
 
 static bool RegisterNativesImpl(JNIEnv* env) {