Add WebContents accessor in ContentViewCore interface.

content/public/browser/android/content_view_core.h

Index: content/public/browser/android/content_view_core.h
diff --git a/content/public/browser/android/content_view_core.h b/content/public/browser/android/content_view_core.h
index 2c82ab15ba634d0e9f9c57d51829008ca2fc9e7c..3a348139803ebbe82824e21f169b980513343ea5 100644
--- a/content/public/browser/android/content_view_core.h
+++ b/content/public/browser/android/content_view_core.h
@@ -8,22 +8,17 @@
 #include "base/android/scoped_java_ref.h"
 #include <jni.h>
 
-class GURL;
-
 namespace ui {
 class WindowAndroid;
 }
 
 namespace content {
-
 class WebContents;
 
 // Native side of the ContentViewCore.java, which is the primary way of
 // communicating with the native Chromium code on Android.  This is a
 // public interface used by native code outside of the content module.
 //
-// TODO(jrg): this is a shell.  Upstream the rest.
-//
 // TODO(jrg): downstream, this class derives from
 // base::SupportsWeakPtr<ContentViewCore>.  Issues raised in
 // http://codereview.chromium.org/10536066/ make us want to rethink
@@ -35,30 +30,18 @@ class WebContents;
 class ContentViewCore {
  public:
   virtual void Destroy(JNIEnv* env, jobject obj) = 0;
+  virtual content::WebContents* GetWebContents() const = 0;
+  virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() = 0;
+  virtual ui::WindowAndroid* GetWindowAndroid() = 0;
 
-  static ContentViewCore* Create(JNIEnv* env, jobject obj,
-                                 WebContents* web_contents);
+  static ContentViewCore* Create(
+      JNIEnv* env, jobject obj, WebContents* web_contents);
   static ContentViewCore* GetNativeContentViewCore(JNIEnv* env, jobject obj);
 
-  // --------------------------------------------------------------------------
-  // Methods called from Java via JNI
-  // --------------------------------------------------------------------------

[joth, 2012/09/24 23:16:27]

awesome, thanks for cleaning this up!

-
-  virtual int GetNativeImeAdapter(JNIEnv* env, jobject obj) = 0;
-  virtual void SelectBetweenCoordinates(JNIEnv* env, jobject obj,
-                                        jint x1, jint y1, jint x2, jint y2) = 0;
-
-  // --------------------------------------------------------------------------
-  // Methods called from native code
-  // --------------------------------------------------------------------------
-
-  virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() = 0;
-
-  virtual ui::WindowAndroid* GetWindowAndroid() = 0;
  protected:
   virtual ~ContentViewCore() {};
 };
 
 };  // namespace content
 
-#endif  // CONTENT_PUBLIC_BROWSER_CONTENT_VIEW_CORE_H_
+#endif  // CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_