Upstream session_backend_android.

chrome/browser/sessions/tab_restore_service.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/browser/sessions/tab_restore_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 
@@ skipping 431 matching lines @@
     return;
 
 #if !defined(ENABLE_SESSION_SERVICE)
   // If sessions are not stored in the SessionService, default to
   // |LOADED_LAST_SESSION| state.
   load_state_ = LOADING | LOADED_LAST_SESSION;
 #else
   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) {
     // The previous session crashed and wasn't restored. Load the tabs/windows
     // that were open at the point of crash from the session service.
     session_service->GetLastSession(
         &crash_consumer_,
         base::Bind(&TabRestoreService::OnGotPreviousSession,
                    base::Unretained(this)));
   } else {
@@ skipping 66 matching lines @@
     NavigationEntry* entry = (i == pending_index) ?
         controller->GetPendingEntry() : controller->GetEntryAtIndex(i);
     tab->navigations[i].SetFromNavigationEntry(*entry);
   }
   tab->timestamp = TimeNow();
   tab->current_navigation_index = controller->GetCurrentEntryIndex();
   if (tab->current_navigation_index == -1 && entry_count > 0)
     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.
   if (tab_contents) {
     const extensions::Extension* extension =
         tab_contents->extension_tab_helper()->extension_app();
     if (extension)
       tab->extension_app_id = extension->id();
   }
+#endif
 
   tab->session_storage_namespace = controller->GetSessionStorageNamespace();
 
   // Delegate may be NULL during unit tests.
   if (delegate) {
     tab->browser_id = delegate->GetSessionID().id();
     tab->pinned = delegate->IsTabPinned(tab->tabstrip_index);
   }
 }
 
@@ skipping 686 matching lines @@
   // the front, not the end and we just added the entries to the end).
   entries_to_write_ = staging_entries_.size();
 
   PruneEntries();
   NotifyTabsChanged();
 }
 
 Time TabRestoreService::TimeNow() const {
   return time_factory_ ? time_factory_->TimeNow() : Time::Now();
 }