Remove android_webview/browser layer's dependency on native

android_webview/native/aw_contents.cc

Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index c3c311096bd021e7166ad44ef521c46255ae6536..2aba16b21ee31f6efb4687325d31df4b36bdbc48 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -170,8 +170,9 @@ AwContents::AwContents(scoped_ptr<WebContents> web_contents)
   base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, 1);
   icon_helper_.reset(new IconHelper(web_contents_.get()));
   icon_helper_->SetListener(this);
-  web_contents_->SetUserData(kAwContentsUserDataKey,
+  web_contents_->SetUserData(android_webview::kAwContentsUserDataKey,
                              new AwContentsUserData(this));
+  browser_view_renderer_.RegisterWithWebContents(web_contents_.get());
   render_view_host_ext_.reset(
       new AwRenderViewHostExt(this, web_contents_.get()));
 
@@ -983,10 +984,6 @@ void AwContents::DidOverscroll(gfx::Vector2d overscroll_delta) {
       env, obj.obj(), overscroll_delta.x(), overscroll_delta.y());
 }
 
-const BrowserViewRenderer* AwContents::GetBrowserViewRenderer() const {
-  return &browser_view_renderer_;
-}
-
 void AwContents::SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   browser_view_renderer_.SetDipScale(dip_scale);