Fixes bug where first login attempt to hotmail after session restore...

chrome/browser/sessions/base_session_service.cc

 // Copyright (c) 2006-2008 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/base_session_service.h"
 
 #include "base/pickle.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/stl_util-inl.h"
+#include "webkit/glue/webkit_glue.h"
 
 // InternalGetCommandsRequest -------------------------------------------------
 
 BaseSessionService::InternalGetCommandsRequest::~InternalGetCommandsRequest() {
   STLDeleteElements(&commands);
 }
 
 // BaseSessionService ---------------------------------------------------------
 
 namespace {
@@ skipping 128 matching lines @@
       std::numeric_limits<SessionCommand::size_type>::max() - 1024;
 
   int bytes_written = 0;
 
   WriteStringToPickle(pickle, &bytes_written, max_state_size,
                       entry.display_url().spec());
 
   WriteWStringToPickle(pickle, &bytes_written, max_state_size,
                        UTF16ToWideHack(entry.title()));
 
-  WriteStringToPickle(pickle, &bytes_written, max_state_size,
-                      entry.content_state());
+  if (entry.has_post_data()) {
+    // Remove the form data, it may contain sensitive information.
+    WriteStringToPickle(pickle, &bytes_written, max_state_size,
+        webkit_glue::RemoveFormDataFromHistoryState(entry.content_state()));
+  } else {
+    WriteStringToPickle(pickle, &bytes_written, max_state_size,
+                        entry.content_state());
+  }
 
   pickle.WriteInt(entry.transition_type());
   int type_mask = entry.has_post_data() ? TabNavigation::HAS_POST_DATA : 0;
   pickle.WriteInt(type_mask);
 
   WriteStringToPickle(pickle, &bytes_written, max_state_size,
       entry.referrer().is_valid() ? entry.referrer().spec() : std::string());
 
   // Adding more data? Be sure and update TabRestoreService too.
   return new SessionCommand(command_id, pickle);
@@ skipping 27 matching lines @@
     pickle->ReadString(&iterator, &referrer_spec);
     if (!referrer_spec.empty())
       navigation->referrer_ = GURL(referrer_spec);
   }
 
   navigation->url_ = GURL(url_spec);
   return true;
 }
 
 bool BaseSessionService::ShouldTrackEntry(const NavigationEntry& entry) {
-  // Don't track entries that have post data. Post data may contain passwords
-  // and other sensitive data users don't want stored to disk.
-  return entry.display_url().is_valid() && !entry.has_post_data();
+  return entry.display_url().is_valid();
 }
 
 bool BaseSessionService::ShouldTrackEntry(const TabNavigation& navigation) {
-  // Don't track entries that have post data. Post data may contain passwords
-  // and other sensitive data users don't want stored to disk.
-  return navigation.url().is_valid() &&
-         (navigation.type_mask() & TabNavigation::HAS_POST_DATA) == 0;
+  return navigation.url().is_valid();
 }
 
 BaseSessionService::Handle BaseSessionService::ScheduleGetLastSessionCommands(
     InternalGetCommandsRequest* request,
     CancelableRequestConsumerBase* consumer) {
   scoped_refptr<InternalGetCommandsRequest> request_wrapper(request);
   AddRequest(request, consumer);
   if (backend_thread()) {
     backend_thread()->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
         backend(), &SessionBackend::ReadLastSessionCommands, request));
   } else {
     backend()->ReadLastSessionCommands(request);
   }
   return request->handle();
 }