android content shell bringup.

Starting classes for content view, content view client.  Includes some
relevant deps needed to build or pass a sanity check.

BUG=
TEST=


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

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

4 files changed, 22 insertions, 6 deletions

diff --git a/base/android/java/org/chromium/base/AccessedByNative.java b/base/android/java/org/chromium/base/AccessedByNative.java
new file mode 100644
index 0000000..92f46c4
--- /dev/null
+++ b/base/android/java/org/chromium/base/AccessedByNative.java
@@ -0,0 +1,16 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.base;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AccessedByNative {
+    public String value() default "";
+}
diff --git a/base/android/jni_array.cc b/base/android/jni_array.cc
index b287b46..d70151f 100644
--- a/base/android/jni_array.cc
+++ b/base/android/jni_array.cc
@@ -67,15 +67,15 @@ ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfStrings(
 }
 
 void AppendJavaStringArrayToStringVector(JNIEnv* env,
-                                         const JavaRef<jobjectArray>& array,
+                                         jobjectArray array,
                                          std::vector<string16>* out) {
   DCHECK(out);
-  if (array.is_null())
+  if (!array)
     return;
-  jsize len = env->GetArrayLength(array.obj());
+  jsize len = env->GetArrayLength(array);
   for (jsize i = 0; i < len; ++i) {
     ScopedJavaLocalRef<jstring> str(env,
-        static_cast<jstring>(env->GetObjectArrayElement(array.obj(), i)));
+        static_cast<jstring>(env->GetObjectArrayElement(array, i)));
     out->push_back(ConvertJavaStringToUTF16(str));
   }
 }
diff --git a/base/android/jni_array.h b/base/android/jni_array.h
index 087eb37..a4a52ce 100644
--- a/base/android/jni_array.h
+++ b/base/android/jni_array.h
@@ -32,7 +32,7 @@ ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfStrings(
 
 // Converts a Java string array to a native array.
 void AppendJavaStringArrayToStringVector(JNIEnv* env,
-                                         const JavaRef<jobjectArray>& array,
+                                         jobjectArray array,
                                          std::vector<string16>* out);
 
 // Appends the Java bytes in |bytes_array| onto the end of |out|.
diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py
index 51a5376..9704d93 100755
--- a/base/android/jni_generator/jni_generator.py
+++ b/base/android/jni_generator/jni_generator.py
@@ -169,7 +169,7 @@ def JavaParamToJni(param):
       'Lorg/chromium/content/browser/ContentView',
       ('Lorg/chromium/content/browser/ContentView$'
        'FindResultReceivedListener$FindNotificationDetails'),
-      'Lorg/chromium/content/browser/ChromeViewClient',
+      'Lorg/chromium/content/browser/ContentViewClient',
       'Lorg/chromium/content/browser/ContentHttpAuthHandler',
       'Lorg/chromium/content/browser/DeviceInfo',
       'Lorg/chromium/content/browser/DeviceOrientation',