[Android] Add proxy for Java-based WebContentsObservers

content/browser/android/web_contents_observer_android.cc

Index: content/browser/android/web_contents_observer_android.cc
diff --git a/content/browser/android/web_contents_observer_android.cc b/content/browser/android/web_contents_observer_android.cc
index e056f3125106b50c009b366a48cf52293710bd7f..69b758898f333d72179d03949f7ce4334519ad51 100644
--- a/content/browser/android/web_contents_observer_android.cc
+++ b/content/browser/android/web_contents_observer_android.cc
@@ -15,7 +15,7 @@
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
-#include "jni/WebContentsObserver_jni.h"
+#include "jni/WebContentsObserverProxy_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ScopedJavaLocalRef;
@@ -59,7 +59,7 @@ void WebContentsObserverAndroid::WebContentsDestroyed() {
     delete this;
   } else {
     // The java side will destroy |this|
-    Java_WebContentsObserver_detachFromWebContents(env, obj.obj());
+    Java_WebContentsObserverProxy_detachFromWebContents(env, obj.obj());
   }
 }
 
@@ -68,7 +68,7 @@ void WebContentsObserverAndroid::RenderViewReady() {
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
     return;
-  Java_WebContentsObserver_renderViewReady(env, obj.obj());
+  Java_WebContentsObserverProxy_renderViewReady(env, obj.obj());
 }
 
 void WebContentsObserverAndroid::RenderProcessGone(
@@ -79,7 +79,7 @@ void WebContentsObserverAndroid::RenderProcessGone(
     return;
   jboolean was_oom_protected =
       termination_status == base::TERMINATION_STATUS_OOM_PROTECTED;
-  Java_WebContentsObserver_renderProcessGone(
+  Java_WebContentsObserverProxy_renderProcessGone(
       env, obj.obj(), was_oom_protected);
 }
 
@@ -91,7 +91,7 @@ void WebContentsObserverAndroid::DidStartLoading(
     return;
   ScopedJavaLocalRef<jstring> jstring_url(ConvertUTF8ToJavaString(
       env, web_contents()->GetVisibleURL().spec()));
-  Java_WebContentsObserver_didStartLoading(
+  Java_WebContentsObserverProxy_didStartLoading(
       env, obj.obj(), jstring_url.obj());
 }
 
@@ -103,7 +103,7 @@ void WebContentsObserverAndroid::DidStopLoading(
     return;
   ScopedJavaLocalRef<jstring> jstring_url(ConvertUTF8ToJavaString(
       env, web_contents()->GetLastCommittedURL().spec()));
-  Java_WebContentsObserver_didStopLoading(
+  Java_WebContentsObserverProxy_didStopLoading(
       env, obj.obj(), jstring_url.obj());
 }
 
@@ -156,7 +156,7 @@ void WebContentsObserverAndroid::DidNavigateMainFrame(
   // that would also be valid for a fragment navigation.
   bool is_fragment_navigation = urls_same_ignoring_fragment &&
       (details.type == NAVIGATION_TYPE_IN_PAGE || details.is_in_page);
-  Java_WebContentsObserver_didNavigateMainFrame(
+  Java_WebContentsObserverProxy_didNavigateMainFrame(
       env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(),
       details.is_navigation_to_different_page(), is_fragment_navigation,
       details.http_status_code);
@@ -177,7 +177,7 @@ void WebContentsObserverAndroid::DidNavigateAnyFrame(
   jboolean jboolean_is_reload = ui::PageTransitionCoreTypeIs(
       params.transition, ui::PAGE_TRANSITION_RELOAD);
 
-  Java_WebContentsObserver_didNavigateAnyFrame(
+  Java_WebContentsObserverProxy_didNavigateAnyFrame(
       env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(),
       jboolean_is_reload);
 }
@@ -187,7 +187,7 @@ void WebContentsObserverAndroid::DocumentAvailableInMainFrame() {
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
     return;
-  Java_WebContentsObserver_documentAvailableInMainFrame(env, obj.obj());
+  Java_WebContentsObserverProxy_documentAvailableInMainFrame(env, obj.obj());
 }
 
 void WebContentsObserverAndroid::DidStartProvisionalLoadForFrame(
@@ -203,7 +203,7 @@ void WebContentsObserverAndroid::DidStartProvisionalLoadForFrame(
       ConvertUTF8ToJavaString(env, validated_url.spec()));
   // TODO(dcheng): Does Java really need the parent frame ID? It doesn't appear
   // to be used at all, and it just adds complexity here.
-  Java_WebContentsObserver_didStartProvisionalLoadForFrame(
+  Java_WebContentsObserverProxy_didStartProvisionalLoadForFrame(
       env,
       obj.obj(),
       render_frame_host->GetRoutingID(),
@@ -226,7 +226,7 @@ void WebContentsObserverAndroid::DidCommitProvisionalLoadForFrame(
     return;
   ScopedJavaLocalRef<jstring> jstring_url(
       ConvertUTF8ToJavaString(env, url.spec()));
-  Java_WebContentsObserver_didCommitProvisionalLoadForFrame(
+  Java_WebContentsObserverProxy_didCommitProvisionalLoadForFrame(
       env,
       obj.obj(),
       render_frame_host->GetRoutingID(),
@@ -252,7 +252,7 @@ void WebContentsObserverAndroid::DidFinishLoad(
 
   ScopedJavaLocalRef<jstring> jstring_url(
       ConvertUTF8ToJavaString(env, url_string));
-  Java_WebContentsObserver_didFinishLoad(
+  Java_WebContentsObserverProxy_didFinishLoad(
       env,
       obj.obj(),
       render_frame_host->GetRoutingID(),
@@ -266,7 +266,7 @@ void WebContentsObserverAndroid::DocumentLoadedInFrame(
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
     return;
-  Java_WebContentsObserver_documentLoadedInFrame(
+  Java_WebContentsObserverProxy_documentLoadedInFrame(
       env, obj.obj(), render_frame_host->GetRoutingID());
 }
 
@@ -276,7 +276,7 @@ void WebContentsObserverAndroid::NavigationEntryCommitted(
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
     return;
-  Java_WebContentsObserver_navigationEntryCommitted(env, obj.obj());
+  Java_WebContentsObserverProxy_navigationEntryCommitted(env, obj.obj());
 }
 
 void WebContentsObserverAndroid::DidAttachInterstitialPage() {
@@ -284,7 +284,7 @@ void WebContentsObserverAndroid::DidAttachInterstitialPage() {
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
     return;
-  Java_WebContentsObserver_didAttachInterstitialPage(env, obj.obj());
+  Java_WebContentsObserverProxy_didAttachInterstitialPage(env, obj.obj());
 }
 
 void WebContentsObserverAndroid::DidDetachInterstitialPage() {
@@ -292,7 +292,7 @@ void WebContentsObserverAndroid::DidDetachInterstitialPage() {
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
     return;
-  Java_WebContentsObserver_didDetachInterstitialPage(env, obj.obj());
+  Java_WebContentsObserverProxy_didDetachInterstitialPage(env, obj.obj());
 }
 
 void WebContentsObserverAndroid::DidChangeThemeColor(SkColor color) {
@@ -300,7 +300,7 @@ void WebContentsObserverAndroid::DidChangeThemeColor(SkColor color) {
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
     return;
-  Java_WebContentsObserver_didChangeThemeColor(env, obj.obj(), color);
+  Java_WebContentsObserverProxy_didChangeThemeColor(env, obj.obj(), color);
 }
 
 void WebContentsObserverAndroid::DidFailLoadInternal(
@@ -318,7 +318,7 @@ void WebContentsObserverAndroid::DidFailLoadInternal(
   ScopedJavaLocalRef<jstring> jstring_url(
       ConvertUTF8ToJavaString(env, url.spec()));
 
-  Java_WebContentsObserver_didFailLoad(
+  Java_WebContentsObserverProxy_didFailLoad(
       env, obj.obj(),
       is_provisional_load,
       is_main_frame,
@@ -331,7 +331,7 @@ void WebContentsObserverAndroid::DidFirstVisuallyNonEmptyPaint() {
   ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
   if (obj.is_null())
     return;
-  Java_WebContentsObserver_didFirstVisuallyNonEmptyPaint(
+  Java_WebContentsObserverProxy_didFirstVisuallyNonEmptyPaint(
       env, obj.obj());
 }
 
@@ -345,8 +345,8 @@ void WebContentsObserverAndroid::DidStartNavigationToPendingEntry(
   ScopedJavaLocalRef<jstring> jstring_url(
       ConvertUTF8ToJavaString(env, url.spec()));
 
-  Java_WebContentsObserver_didStartNavigationToPendingEntry(env, obj.obj(),
-                                                            jstring_url.obj());
+  Java_WebContentsObserverProxy_didStartNavigationToPendingEntry(
+      env, obj.obj(), jstring_url.obj());
 }
 
 bool RegisterWebContentsObserverAndroid(JNIEnv* env) {