Break apart the TabModelBase's JNI calls into its own class

chrome/browser/ui/android/tab_model/tab_model_base.h

Index: chrome/browser/ui/android/tab_model/tab_model_base.h
diff --git a/chrome/browser/ui/android/tab_model/tab_model_base.h b/chrome/browser/ui/android/tab_model/tab_model_base.h
index 60b4c1e935d6284288a8ab215c346569923b83fc..56da0b459a1d6f0365d47d9614ea120c9e35111c 100644
--- a/chrome/browser/ui/android/tab_model/tab_model_base.h
+++ b/chrome/browser/ui/android/tab_model/tab_model_base.h
@@ -12,7 +12,7 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "chrome/browser/ui/android/tab_model/tab_model.h"
+#include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h"
 
 class Profile;
 class TabAndroid;
@@ -24,41 +24,18 @@ class WebContents;
 // Native representation of TabModelBase which provides access to information
 // about a tabstrip to native code and could potentially be used in place of
 // Browser for some functionality in Clank.
-class TabModelBase : public TabModel {
+class TabModelBase : public TabModelJniBridge {

[David Trainor- moved to gerrit, 2014/10/09 20:43:42]

Can these last three methods go to the TabModelJniBridge?  They look like they
just facilitate communication between the native and java models.

[gone, 2014/10/10 22:39:19]

The way the DocumentTabList implements those three is different :/  Should be
fine if you're cool with overriding them in the DocumentTabList, though.

  public:
-  TabModelBase(JNIEnv* env, jobject obj, Profile* profile);
-  void Destroy(JNIEnv* env, jobject obj);
-
-  // Called by JNI
-  base::android::ScopedJavaLocalRef<jobject> GetProfileAndroid(JNIEnv* env,
-                                                               jobject obj);
-  void TabAddedToModel(JNIEnv* env, jobject obj, jobject jtab);
+  TabModelBase(JNIEnv* env, jobject obj, bool is_incognito);
+  virtual ~TabModelBase() { }
 
   // TabModel:
-  virtual int GetTabCount() const OVERRIDE;
-  virtual int GetActiveIndex() const OVERRIDE;
-  virtual content::WebContents* GetWebContentsAt(int index) const OVERRIDE;
   virtual TabAndroid* GetTabAt(int index) const OVERRIDE;
 
-  virtual void SetActiveIndex(int index) OVERRIDE;
   virtual void CloseTabAt(int index) OVERRIDE;
 
-  virtual void CreateTab(content::WebContents* web_contents,
-                         int parent_tab_id) OVERRIDE;
   virtual content::WebContents* CreateNewTabForDevTools(
       const GURL& url) OVERRIDE;
-
-  // Return true if we are currently restoring sessions asynchronously.
-  virtual bool IsSessionRestoreInProgress() const OVERRIDE;
-
-  // Instructs the TabModel to broadcast a notification that all tabs are now
-  // loaded from storage.
-  void BroadcastSessionRestoreComplete(JNIEnv* env, jobject obj);
-
- private:
-  virtual ~TabModelBase();
-
-  JavaObjectWeakGlobalRef java_object_;
 };
 
 // Register the Tab's native methods through jni.