TabBase: Add ContentView/NativePage ownership

chrome/android/testshell/testshell_tab.cc

 // Copyright (c) 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 "chrome/android/testshell/testshell_tab.h"
 
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
 #include "chrome/browser/ui/android/window_android_helper.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/common/net/url_fixer_upper.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/TestShellTab_jni.h"
 #include "ui/android/window_android.h"
 #include "url/gurl.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 using chrome::android::ChromeWebContentsDelegateAndroid;
 using content::WebContents;
 using ui::WindowAndroid;
 
 TestShellTab::TestShellTab(JNIEnv* env,
-                           jobject obj,
-                           WebContents* web_contents,
-                           WindowAndroid* window_android)
-    : TabAndroid(env, obj),
-      web_contents_(web_contents) {
-  InitTabHelpers(web_contents);
-  WindowAndroidHelper::FromWebContents(web_contents)->
-      SetWindowAndroid(window_android);
+                           jobject obj)
+    : TabAndroid(env, obj) {
 }
 
 TestShellTab::~TestShellTab() {
 }
 
 void TestShellTab::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
-WebContents* TestShellTab::GetWebContents() {
-  return web_contents_.get();
-}
-
 browser_sync::SyncedTabDelegate* TestShellTab::GetSyncedTabDelegate() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void TestShellTab::OnReceivedHttpAuthRequest(jobject auth_handler,
                                              const string16& host,
                                              const string16& realm) {
   NOTIMPLEMENTED();
 }
@@ skipping 41 matching lines @@
 }
 
 void TestShellTab::HandlePopupNavigation(chrome::NavigateParams* params) {
   NOTIMPLEMENTED();
 }
 
 bool TestShellTab::RegisterTestShellTab(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-void TestShellTab::InitWebContentsDelegate(
-    JNIEnv* env,
-    jobject obj,
-    jobject web_contents_delegate) {
-  web_contents_delegate_.reset(
-      new ChromeWebContentsDelegateAndroid(env, web_contents_delegate));
-  web_contents_->SetDelegate(web_contents_delegate_.get());
-}
-
 ScopedJavaLocalRef<jstring> TestShellTab::FixupUrl(JNIEnv* env,
                                                    jobject obj,
                                                    jstring url) {
   GURL fixed_url(URLFixerUpper::FixupURL(ConvertJavaStringToUTF8(env, url),
                                          std::string()));
 
   std::string fixed_spec;
   if (fixed_url.is_valid())
     fixed_spec = fixed_url.spec();
 
   return ConvertUTF8ToJavaString(env, fixed_spec);
 }
 
-static jint Init(JNIEnv* env,
-                 jobject obj,
-                 jint web_contents_ptr,
-                 jint window_android_ptr) {
-  TestShellTab* tab = new TestShellTab(
-      env,
-      obj,
-      reinterpret_cast<WebContents*>(web_contents_ptr),
-      reinterpret_cast<WindowAndroid*>(window_android_ptr));
-  return reinterpret_cast<jint>(tab);
+static jint Init(JNIEnv* env, jobject obj) {
+  return reinterpret_cast<jint>(new TestShellTab(env, obj));
 }
 
 int TestShellTab::GetSyncId() const {
   NOTIMPLEMENTED();
   return 0;
 }
 
 void TestShellTab::SetSyncId(int sync_id) { NOTIMPLEMENTED(); }