Remove android_webview/browser layer's dependency on native

android_webview/native/aw_contents.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/aw_contents.h"
 
 #include <limits>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
@@ skipping 152 matching lines @@
 
 AwContents::AwContents(scoped_ptr<WebContents> web_contents)
     : web_contents_(web_contents.Pass()),
       browser_view_renderer_(
           this,
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)),
       renderer_manager_key_(GLViewRendererManager::GetInstance()->NullKey()) {
   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()));
 
   permission_request_handler_.reset(
       new PermissionRequestHandler(this, web_contents_.get()));
 
   AwAutofillClient* autofill_manager_delegate =
       AwAutofillClient::FromWebContents(web_contents_.get());
   InitDataReductionProxyIfNecessary();
   if (autofill_manager_delegate)
@@ skipping 791 matching lines @@
 void AwContents::DidOverscroll(gfx::Vector2d overscroll_delta) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_AwContents_didOverscroll(
       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);
 }
 
 void AwContents::ScrollTo(JNIEnv* env, jobject obj, jint x, jint y) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   browser_view_renderer_.ScrollTo(gfx::Vector2d(x, y));
 }
 
@@ skipping 136 matching lines @@
 
   AwMessagePortServiceImpl::GetInstance()->CreateMessageChannel(env, ports,
       GetMessagePortMessageFilter());
 }
 
 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) {
   g_should_download_favicons = true;
 }
 
 }  // namespace android_webview