[Android] Move the java content/ package to content_public/ to start the split.

content/content.gyp

Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index 97a158f2e5ec34f006d3cbd04667a232306f8aa5..98823562d2cbf54b131b1eee52c6072847a252dd 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -362,11 +362,11 @@
           'target_name': 'common_aidl',
           'type': 'none',
           'variables': {
-            'aidl_interface_file': 'public/android/java/src/org/chromium/content/common/common.aidl',
+            'aidl_interface_file': 'public/android/java/src/org/chromium/content_public/common/common.aidl',
           },
           'sources': [
-            'public/android/java/src/org/chromium/content/common/IChildProcessCallback.aidl',
-            'public/android/java/src/org/chromium/content/common/IChildProcessService.aidl',
+            'public/android/java/src/org/chromium/content_public/common/IChildProcessCallback.aidl',
+            'public/android/java/src/org/chromium/content_public/common/IChildProcessService.aidl',
           ],
           'includes': [ '../build/java_aidl.gypi' ],
         },
@@ -377,7 +377,7 @@
             'public/android/java/templates/NativeLibraries.template',
           ],
           'variables': {
-            'package_name': 'org/chromium/content/app',
+            'package_name': 'org/chromium/content_public/app',
             'include_path': 'public/android/java/templates',
             'template_deps': [
               'public/android/java/templates/native_libraries_array.h'
@@ -406,8 +406,8 @@
             'java_in_dir': '../content/public/android/java',
             'jar_excluded_classes': [ '*/NativeLibraries.class' ],
             'has_java_resources': 1,
-            'R_package': 'org.chromium.content',
-            'R_package_relpath': 'org/chromium/content',
+            'R_package': 'org.chromium.content_public',
+            'R_package_relpath': 'org/chromium/content_public',
             'java_strings_grd': 'android_content_strings.grd',
           },
           'conditions': [
@@ -424,10 +424,10 @@
           'target_name': 'page_transition_types_java',
           'type': 'none',
           'sources': [
-            'public/android/java/src/org/chromium/content/browser/PageTransitionTypes.template',
+            'public/android/java/src/org/chromium/content_public/browser/PageTransitionTypes.template',
           ],
           'variables': {
-            'package_name': 'org/chromium/content/browser',
+            'package_name': 'org/chromium/content_public/browser',
             'template_deps': ['public/common/page_transition_types_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
@@ -436,10 +436,10 @@
           'target_name': 'popup_item_type_java',
           'type': 'none',
           'sources': [
-            'public/android/java/src/org/chromium/content/browser/input/PopupItemType.template',
+            'public/android/java/src/org/chromium/content_public/browser/input/PopupItemType.template',
           ],
           'variables': {
-            'package_name': 'org/chromium/content/browser/input',
+            'package_name': 'org/chromium/content_public/browser/input',
             'template_deps': ['browser/android/popup_item_type_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
@@ -448,10 +448,10 @@
           'target_name': 'result_codes_java',
           'type': 'none',
           'sources': [
-            'public/android/java/src/org/chromium/content/common/ResultCodes.template',
+            'public/android/java/src/org/chromium/content_public/common/ResultCodes.template',
           ],
           'variables': {
-            'package_name': 'org/chromium/content/common',
+            'package_name': 'org/chromium/content_public/common',
             'template_deps': ['public/common/result_codes_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
@@ -460,10 +460,10 @@
           'target_name': 'speech_recognition_error_java',
           'type': 'none',
           'sources': [
-            'public/android/java/src/org/chromium/content/browser/SpeechRecognitionError.template',
+            'public/android/java/src/org/chromium/content_public/browser/SpeechRecognitionError.template',
           ],
           'variables': {
-            'package_name': 'org/chromium/content/browser',
+            'package_name': 'org/chromium/content_public/browser',
             'template_deps': ['public/common/speech_recognition_error_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
@@ -472,10 +472,10 @@
           'target_name': 'top_controls_state_java',
           'type': 'none',
           'sources': [
-            'public/android/java/src/org/chromium/content/common/TopControlsState.template',
+            'public/android/java/src/org/chromium/content_public/common/TopControlsState.template',
           ],
           'variables': {
-            'package_name': 'org/chromium/content/common',
+            'package_name': 'org/chromium/content_public/common',
             'template_deps': ['public/common/top_controls_state_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],