Add RecentTabsPageTest

chrome/browser/android/recently_closed_tabs_bridge.cc

 // Copyright 2013 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/browser/android/recently_closed_tabs_bridge.h"
 
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #include "components/sessions/core/live_tab.h"
 #include "components/sessions/core/tab_restore_service.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/RecentlyClosedBridge_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
-using base::android::ScopedJavaLocalRef;
+using base::android::ScopedJavaGlobalRef;
 
 namespace {
 
 void AddTabToList(JNIEnv* env,
                   const sessions::TabRestoreService::Tab& tab,
                   jobject jtabs_list) {
   const sessions::SerializedNavigationEntry& current_navigation =
       tab.navigations.at(tab.current_navigation_index);
   Java_RecentlyClosedBridge_pushTab(
       env, jtabs_list, tab.id,
@@ skipping 12 matching lines @@
       auto& tab = static_cast<const sessions::TabRestoreService::Tab&>(*entry);
       AddTabToList(env, tab, jtabs_list);
       if (++added_count == max_tab_count)
         break;
     }
   }
 }
 
 }  // namespace
 
-RecentlyClosedTabsBridge::RecentlyClosedTabsBridge(Profile* profile)
-    : profile_(profile),
-      tab_restore_service_(NULL) {
-}
+RecentlyClosedTabsBridge::RecentlyClosedTabsBridge(
+    ScopedJavaGlobalRef<jobject> jbridge,
+    Profile* profile)
+    : bridge_(jbridge), profile_(profile), tab_restore_service_(NULL) {}

[Bernhard Bauer, 2017/01/05 17:47:38]

Nit: I think here you want to std::move() the |jbridge|.

(And then while you're here, could you change the NULL to nullptr? Thanks! :) )

[Michael van Ouwerkerk, 2017/01/06 11:11:11]

Done.

 
 RecentlyClosedTabsBridge::~RecentlyClosedTabsBridge() {
   if (tab_restore_service_)
     tab_restore_service_->RemoveObserver(this);
 }
 
 void RecentlyClosedTabsBridge::Destroy(JNIEnv* env,
                                        const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
-void RecentlyClosedTabsBridge::SetRecentlyClosedCallback(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
-    const JavaParamRef<jobject>& jcallback) {
-  callback_.Reset(env, jcallback);
-}
-
 jboolean RecentlyClosedTabsBridge::GetRecentlyClosedTabs(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& jtabs_list,
     jint max_tab_count) {
   EnsureTabRestoreService();
   if (!tab_restore_service_)
     return false;
 
   AddTabsToList(env, tab_restore_service_->entries(), jtabs_list,
@@ skipping 57 matching lines @@
 void RecentlyClosedTabsBridge::ClearRecentlyClosedTabs(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   EnsureTabRestoreService();
   if (tab_restore_service_)
     tab_restore_service_->ClearEntries();
 }
 
 void RecentlyClosedTabsBridge::TabRestoreServiceChanged(
     sessions::TabRestoreService* service) {
-  if (callback_.is_null())
-    return;
-  JNIEnv* env = AttachCurrentThread();
-  Java_RecentlyClosedCallback_onUpdated(env, callback_);
+  Java_RecentlyClosedBridge_onUpdated(AttachCurrentThread(), bridge_);
 }
 
 void RecentlyClosedTabsBridge::TabRestoreServiceDestroyed(
     sessions::TabRestoreService* service) {
   tab_restore_service_ = NULL;
 }
 
 void RecentlyClosedTabsBridge::EnsureTabRestoreService() {
   if (tab_restore_service_)
     return;
 
   tab_restore_service_ = TabRestoreServiceFactory::GetForProfile(profile_);
 
   // TabRestoreServiceFactory::GetForProfile() can return NULL (e.g. in
   // incognito mode).
   if (tab_restore_service_) {
     // This does nothing if the tabs have already been loaded or they
     // shouldn't be loaded.
     tab_restore_service_->LoadTabsFromLastSession();
     tab_restore_service_->AddObserver(this);
   }
 }
 
 static jlong Init(JNIEnv* env,
-                  const JavaParamRef<jobject>& obj,
+                  const JavaParamRef<jobject>& jbridge,
                   const JavaParamRef<jobject>& jprofile) {
   RecentlyClosedTabsBridge* bridge = new RecentlyClosedTabsBridge(
+      ScopedJavaGlobalRef<jobject>(env, jbridge.obj()),
       ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(bridge);
 }
 
 // static
 bool RecentlyClosedTabsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }