Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sessions / session_service_test_helper.cc

diff --git a/src/chrome/browser/sessions/session_service_test_helper.cc b/src/chrome/browser/sessions/session_service_test_helper.cc
index 2c2fc40..7528a20 100644 (file)
--- a/src/chrome/browser/sessions/session_service_test_helper.cc
+++ b/src/chrome/browser/sessions/session_service_test_helper.cc
@@ -60,9 +60,10 @@ void SessionServiceTestHelper::ReadWindows(
     SessionID::id_type* active_window_id) {
   Time last_time;
   ScopedVector<SessionCommand> read_commands;
-  backend()->ReadLastSessionCommandsImpl(&(read_commands.get()));
-  service()->RestoreSessionFromCommands(
-      read_commands.get(), windows, active_window_id);
+  service()->GetBaseSessionServiceForTest()->ReadLastSessionCommandsForTest(
+      &read_commands);
+  RestoreSessionFromCommands(read_commands, windows, active_window_id);
+  service()->RemoveUnusedRestoreWindows(windows);
 }
 
 void SessionServiceTestHelper::AssertTabEquals(const SessionID& window_id,
@@ -103,10 +104,6 @@ void SessionServiceTestHelper::AssertSingleWindowWithSingleTab(
   EXPECT_EQ(nav_count, windows[0]->tabs[0]->navigations.size());
 }
 
-SessionBackend* SessionServiceTestHelper::backend() {
-  return service_->backend();
-}
-
 void SessionServiceTestHelper::SetService(SessionService* service) {
   service_.reset(service);
   // Execute IO tasks posted by the SessionService.
@@ -116,5 +113,6 @@ void SessionServiceTestHelper::SetService(SessionService* service) {
 void SessionServiceTestHelper::RunTaskOnBackendThread(
     const tracked_objects::Location& from_here,
     const base::Closure& task) {
-  service_->RunTaskOnBackendThread(from_here, task);
+  service_->GetBaseSessionServiceForTest()->RunTaskOnBackendThread(from_here,
+                                                                   task);
 }