NOT FOR REVIEW: Aura on Android

components/web_contents_delegate_android/web_contents_delegate_android.cc

Index: components/web_contents_delegate_android/web_contents_delegate_android.cc
diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.cc b/components/web_contents_delegate_android/web_contents_delegate_android.cc
index 7606051f6abafb2c4e0fbd85e96625904f1c5bd6..ec8ba2bfacef6f8370d749ae51b33f8e1a601258 100644
--- a/components/web_contents_delegate_android/web_contents_delegate_android.cc
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.cc
@@ -248,6 +248,7 @@ void WebContentsDelegateAndroid::WebContentsCreated(
     WebContents* source_contents, int opener_render_frame_id,
     const std::string& frame_name, const GURL& target_url,
     WebContents* new_contents) {
+#if !defined(USE_AURA)
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
@@ -268,6 +269,7 @@ void WebContentsDelegateAndroid::WebContentsCreated(
       base::android::ConvertUTF8ToJavaString(env, frame_name).Release(),
       base::android::ConvertUTF8ToJavaString(env, target_url.spec()).Release(),
       jnew_contents.obj());
+#endif
 }
 
 void WebContentsDelegateAndroid::CloseContents(WebContents* source) {
@@ -346,7 +348,7 @@ void WebContentsDelegateAndroid::UpdateTargetURL(WebContents* source,
 void WebContentsDelegateAndroid::HandleKeyboardEvent(
     WebContents* source,
     const content::NativeWebKeyboardEvent& event) {
-  jobject key_event = event.os_event;
+  jobject key_event = (jobject)event.os_event;
   if (key_event) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);