Remove the effects of --disable-restore-session-state.

chrome/browser/sessions/session_service_unittest.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
@@ skipping 751 matching lines @@
   service()->SetWindowBounds(window_id,
                              window_bounds,
                              ui::SHOW_STATE_DEFAULT);
 
   ScopedVector<SessionWindow> windows;
   ReadWindows(&(windows.get()));
   ASSERT_EQ(1U, windows.size());
   EXPECT_EQ(ui::SHOW_STATE_NORMAL, windows[0]->show_state);
 }
 
-TEST_F(SessionServiceTest, RemovePostData) {
-  helper_.service()->save_post_data_ = false;
-
+TEST_F(SessionServiceTest, KeepPostDataWithoutPasswords) {
   SessionID tab_id;
   ASSERT_NE(window_id.id(), tab_id.id());
 
-  std::string content_state("dummy_content_state");
-  // Create a TabNavigation containing content_state and representing a POST
-  // request.
-  TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
-                     ASCIIToUTF16("title"), content_state,
-                     content::PAGE_TRANSITION_QUALIFIER_MASK);
-  nav1.set_type_mask(TabNavigation::HAS_POST_DATA);
-
-  // Create a TabNavigation containing content_state and representing a normal
-  // request.
-  TabNavigation nav2(0, GURL("http://google.com/nopost"), content::Referrer(),
-                     ASCIIToUTF16("title"), content_state,
-                     content::PAGE_TRANSITION_QUALIFIER_MASK);
-
-  helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
-  UpdateNavigation(window_id, tab_id, nav1, 0, true);
-  UpdateNavigation(window_id, tab_id, nav2, 1, true);
-
-  ScopedVector<SessionWindow> windows;
-  ReadWindows(&(windows.get()));
-
-  helper_.AssertSingleWindowWithSingleTab(windows.get(), 2);
-
-  // Expected: the HTTP body was removed from the content state of the POST
-  // navigation but the content state of the normal navigation is intact.
-  EXPECT_NE(content_state, windows[0]->tabs[0]->navigations[0].state());
-  helper_.AssertNavigationEquals(nav2, windows[0]->tabs[0]->navigations[1]);
-}
-
-TEST_F(SessionServiceTest, KeepPostDataWithoutPasswords) {
-  helper_.service()->save_post_data_ = true;
-
-  SessionID tab_id;
-  ASSERT_NE(window_id.id(), tab_id.id());
-
   // Create a content state representing a HTTP body without posted passwords.
   WebKit::WebHTTPBody http_body;
   http_body.initialize();
   const char char_data[] = "data";
   http_body.appendData(WebKit::WebData(char_data, sizeof(char_data)-1));
   WebKit::WebHistoryItem history_item;
   history_item.initialize();
   history_item.setHTTPBody(http_body);
   std::string content_state = webkit_glue::HistoryItemToString(history_item);
 
@@ skipping 18 matching lines @@
   ReadWindows(&(windows.get()));
 
   helper_.AssertSingleWindowWithSingleTab(windows.get(), 2);
 
   // Expected: the content state of both navigations was saved and restored.
   helper_.AssertNavigationEquals(nav1, windows[0]->tabs[0]->navigations[0]);
   helper_.AssertNavigationEquals(nav2, windows[0]->tabs[0]->navigations[1]);
 }
 
 TEST_F(SessionServiceTest, RemovePostDataWithPasswords) {
-  helper_.service()->save_post_data_ = true;
-
   SessionID tab_id;
   ASSERT_NE(window_id.id(), tab_id.id());
 
   // Create a content state representing a HTTP body with posted passwords.
   WebKit::WebHTTPBody http_body;
   http_body.initialize();
   const char char_data[] = "data";
   http_body.appendData(WebKit::WebData(char_data, sizeof(char_data)-1));
   http_body.setContainsPasswordData(true);
   WebKit::WebHistoryItem history_item;
@@ skipping 40 matching lines @@
   ASSERT_TRUE(file_util::CopyFile(v1_file_path, dest_file_path));
 
   SessionService* session_service = new SessionService(path_);
   helper_.set_service(session_service);
   ScopedVector<SessionWindow> windows;
   helper_.ReadWindows(&(windows.get()));
   ASSERT_EQ(1u, windows.size());
   EXPECT_EQ(1u, windows[0]->tabs.size());
 }
 #endif