Upstream JavaBridge tests.

content/browser/android/content_view_core_impl.h

Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index 9ddc2421f250372ff379f4b4566990b3104a0c99..d26ce9ecf2e4e89ba744f2b22f4a87796877e780 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -43,9 +43,33 @@ class ContentViewCoreImpl : public ContentViewCore,
                       WebContents* web_contents,
                       ui::WindowAndroid* window_android);
 
+  // Called from UI thread
+  void Invalidate();
+  void DetachWebContents(WebContents* web_contents);
+
+  // Called from non-UI thread
+  void PostInvalidate();
+
+
   // ContentViewCore overrides
   virtual void Destroy(JNIEnv* env, jobject obj) OVERRIDE;
 
+  virtual content::WebContents* AcquireWebContents() OVERRIDE;
+  virtual void ReplaceWebContents(
+      content::WebContents* old_web_contents,
+      content::WebContents* new_web_contents) OVERRIDE;
+
+  // Called when page loading begins.

[Yaron, 2012/09/20 04:13:53]

Most of this is being refactored by Yusuf:
https://gerrit-int.chromium.org/#/c/25017/

+  virtual void DidStartLoading() OVERRIDE;
+
+  virtual void OnPageStarted(const GURL& validated_url) OVERRIDE;
+  virtual void OnPageFinished(const GURL& validated_url) OVERRIDE;
+  virtual void OnPageFailed(int error_code, const string16& description,
+                            const GURL& failingUrl) OVERRIDE;
+  virtual void OnDidCommitMainFrame(const GURL& url,
+                                    const GURL& base_url) OVERRIDE;
+  void StartContentIntent(const GURL& content_url);
+
   // --------------------------------------------------------------------------
   // Methods called from Java via JNI
   // --------------------------------------------------------------------------
@@ -164,10 +188,6 @@ class ContentViewCoreImpl : public ContentViewCore,
                                 int endy,
                                 base::i18n::TextDirection end_dir);
 
-  // Called when page loading begins.
-  void DidStartLoading();
-  void StartContentIntent(const GURL& content_url);
-
   // --------------------------------------------------------------------------
   // Methods called from native code
   // --------------------------------------------------------------------------
@@ -213,6 +233,9 @@ class ContentViewCoreImpl : public ContentViewCore,
 
   NotificationRegistrar notification_registrar_;
 
+  class ContentViewWebContentsObserver;
+  scoped_ptr<ContentViewWebContentsObserver> web_contents_observer_;
+
   // Reference to the current WebContents used to determine how and what to
   // display in the ContentViewCore.
   WebContentsImpl* web_contents_;