Reland 37913. Clear local state on exit.

chrome/browser/options_util.cc

 // Copyright (c) 2010 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/options_util.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/installer/util/google_update_settings.h"
 
 // static
 void OptionsUtil::ResetToDefaults(Profile* profile) {
   // TODO(tc): It would be nice if we could generate this list automatically so
   // changes to any of the options pages doesn't require updating this list
   // manually.
   PrefService* prefs = profile->GetPrefs();
   const wchar_t* kUserPrefs[] = {
     prefs::kAcceptLanguages,
     prefs::kAlternateErrorPagesEnabled,
+    prefs::kClearSiteDataOnExit,
     prefs::kCookieBehavior,
     prefs::kDefaultCharset,
     prefs::kDnsPrefetchingEnabled,
 #if defined(OS_LINUX)
     prefs::kCertRevocationCheckingEnabled,
     prefs::kSSL2Enabled,
     prefs::kSSL3Enabled,
     prefs::kTLS1Enabled,
 #endif
 #if defined(OS_CHROMEOS)
@@ skipping 70 matching lines @@
   if (metrics) {
     metrics->SetUserPermitsUpload(enabled);
     if (enabled)
       metrics->Start();
     else
       metrics->Stop();
   }
 
   return enabled;
 }