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

chrome/browser/sessions/base_session_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/base_session_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/pickle.h"
 #include "base/stl_util.h"
@@ skipping 57 matching lines @@
 
 // static
 const int BaseSessionService::max_persist_navigation_count = 6;
 
 BaseSessionService::BaseSessionService(SessionType type,
                                        Profile* profile,
                                        const FilePath& path)
     : profile_(profile),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       pending_reset_(false),
-      commands_since_reset_(0),
-      save_post_data_(false) {
+      commands_since_reset_(0) {
   if (profile) {
     // We should never be created when incognito.
     DCHECK(!profile->IsOffTheRecord());
-    const CommandLine* command_line = CommandLine::ForCurrentProcess();
-    save_post_data_ =
-        !command_line->HasSwitch(switches::kDisableRestoreSessionState);
   }
   backend_ = new SessionBackend(type, profile_ ? profile_->GetPath() : path);
   DCHECK(backend_.get());
 
   // SessionBackend::Init() cannot be scheduled to be called here. There are
   // service processes which create the BaseSessionService, but they should not
   // initialize the backend. If they do, the backend will cycle the session
   // restore files. That in turn prevents the session restore from working when
   // the normal chromium process is launched. Normally, the backend will be
   // initialized before it's actually used. However, if we're running as a part
@@ skipping 72 matching lines @@
   int bytes_written = 0;
 
   WriteStringToPickle(pickle, &bytes_written, max_state_size,
                       entry.GetVirtualURL().spec());
 
   WriteString16ToPickle(pickle, &bytes_written, max_state_size,
                         entry.GetTitle());
 
   std::string content_state = entry.GetContentState();
   if (entry.GetHasPostData()) {
-    if (save_post_data_) {
-      content_state =
-          webkit_glue::RemovePasswordDataFromHistoryState(content_state);
-    } else {
-      content_state =
-          webkit_glue::RemoveFormDataFromHistoryState(content_state);
-    }
+    content_state =
+        webkit_glue::RemovePasswordDataFromHistoryState(content_state);
   }
   WriteStringToPickle(pickle, &bytes_written, max_state_size, content_state);
 
   pickle.WriteInt(entry.GetTransitionType());
   int type_mask = entry.GetHasPostData() ? TabNavigation::HAS_POST_DATA : 0;
   pickle.WriteInt(type_mask);
 
   WriteStringToPickle(pickle, &bytes_written, max_state_size,
       entry.GetReferrer().url.is_valid() ?
           entry.GetReferrer().url.spec() : std::string());
@@ skipping 189 matching lines @@
     // has gone away (around shutdown time) or if we're running as
     // part of a unit test that does not set profile_.
     task.Run();
     return true;
   }
 }
 
 bool BaseSessionService::RunningInProduction() const {
   return profile_ && BrowserThread::IsMessageLoopValid(BrowserThread::FILE);
 }