Upstream session_backend_android.

chrome/browser/sessions/tab_restore_service.cc

Index: chrome/browser/sessions/tab_restore_service.cc
diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc
index 76d97bd538aec6eecf91a7a5e067520c6f52dbbe..a0e7f134235dd7e1fd8f7470673a366748c068be 100644
--- a/chrome/browser/sessions/tab_restore_service.cc
+++ b/chrome/browser/sessions/tab_restore_service.cc
@@ -449,7 +449,12 @@ void TabRestoreService::LoadTabsFromLastSession() {
   load_state_ = LOADING;
 
   SessionService* session_service =
+#if defined(OS_ANDROID)
+      // For Android we do not store sessions in the SessionService.
+      NULL;
+#else
       SessionServiceFactory::GetForProfile(profile());

[sky, 2012/07/31 15:26:09]

CAn you instead make GetForPRofile return NULL always on android?

[felipeg, 2012/08/01 16:00:58]

Done.

+#endif
   if (!profile()->restored_last_session() &&
       !profile()->DidLastSessionExitCleanly() &&
       session_service) {
@@ -536,6 +541,7 @@ void TabRestoreService::PopulateTab(Tab* tab,
     tab->current_navigation_index = 0;
   tab->tabstrip_index = index;
 
+#if !defined(OS_ANDROID)

[sky, 2012/07/31 15:26:09]

Isn't there a more specific ifdef for extensions?

[felipeg, 2012/08/01 16:00:58]

Yaron is taking care of extensions (adding him to the CL too).
He said :
"""
we're not removing extensions wholesale
so there's no guard for it
"""

   TabContents* tab_contents =
       TabContents::FromWebContents(controller->GetWebContents());
   // tab_contents is NULL in some browser tests.
@@ -545,6 +551,7 @@ void TabRestoreService::PopulateTab(Tab* tab,
     if (extension)
       tab->extension_app_id = extension->id();
   }
+#endif
 
   tab->session_storage_namespace = controller->GetSessionStorageNamespace();