Split TabRestoreService into InMemoryTRS and PersistentTRS

chrome/browser/sessions/tab_restore_service_factory.cc

Index: chrome/browser/sessions/tab_restore_service_factory.cc
diff --git a/chrome/browser/sessions/tab_restore_service_factory.cc b/chrome/browser/sessions/tab_restore_service_factory.cc
index e575cfe4528589f4d8a5973f6ea828efe77183f9..b0bb94b6ee7519a0b14c85ea47ad6577129954f6 100644
--- a/chrome/browser/sessions/tab_restore_service_factory.cc
+++ b/chrome/browser/sessions/tab_restore_service_factory.cc
@@ -5,6 +5,8 @@
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 
 #include "chrome/browser/profiles/profile_dependency_manager.h"
+#include "chrome/browser/sessions/in_memory_tab_restore_service.h"
+#include "chrome/browser/sessions/persistent_tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 
 // static
@@ -42,7 +44,12 @@ TabRestoreServiceFactory::~TabRestoreServiceFactory() {
 ProfileKeyedService* TabRestoreServiceFactory::BuildServiceInstanceFor(
     Profile* profile) const {
   TabRestoreService* service = NULL;
-  service = new TabRestoreService(profile);
+#ifdef OS_ANDROID
+  // On Android tabs persistence is handled on the Java side.
+  service = new InMemoryTabRestoreService(profile);
+#else
+  service = new PersistentTabRestoreService(profile);
+#endif  // OS_ANDROID
   return service;
 }