Add support for interstitial pages on android.

content/browser/web_contents/web_contents_view_android.cc

Index: content/browser/web_contents/web_contents_view_android.cc
diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc
index b4d67fa7bc0cb1e03ab524fdbceb9d8e3d4591d6..228285d20a48c79e383d6f58e88985392a58d4b1 100644
--- a/content/browser/web_contents/web_contents_view_android.cc
+++ b/content/browser/web_contents/web_contents_view_android.cc
@@ -10,8 +10,8 @@
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/browser/web_contents/interstitial_page_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
-#include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/web_contents_delegate.h"
 
 namespace content {
@@ -43,8 +43,14 @@ void WebContentsViewAndroid::SetContentViewCore(
       web_contents_->GetRenderWidgetHostView());
   if (rwhv)
     rwhv->SetContentViewCore(content_view_core_);
+
   if (web_contents_->ShowingInterstitialPage()) {
-    NOTIMPLEMENTED() << "not upstreamed yet";
+    rwhv = static_cast<RenderWidgetHostViewAndroid*>(
+        static_cast<InterstitialPageImpl*>(
+            web_contents_->GetInterstitialPage())->
+                GetRenderViewHost()->GetView());
+    if (rwhv)
+      rwhv->SetContentViewCore(content_view_core_);

[Ted C, 2012/11/07 18:55:21]

I ended up needing to switch this back to the previous version as we want to set
the content view core on both renderwidgethostviews and not just one depending
on whether the interstitial was showing.

   }
 }