Reverting 21059.

Review URL: http://codereview.chromium.org/159056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21060 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 1 insertions, 15 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 6528ae1..c3a7770 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -551,10 +551,4 @@ const wchar_t kEnableTabtastic2[] = L"enable-tabtastic2";
 // enabled.
 const wchar_t kPinnedTabCount[] = L"pinned-tab-count";
 
-// Enable local storage.  Still buggy.
-const wchar_t kEnableLocalStorage[] = L"enable-local-storage";
-
-// Enable session storage.  Still buggy.
-const wchar_t kEnableSessionStorage[] = L"enable-session-storage";
-
 }  // namespace switches
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 3af9fb2..135b148 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -211,10 +211,6 @@ extern const wchar_t kEnableTabtastic2[];
 
 extern const wchar_t kPinnedTabCount[];
 
-extern const wchar_t kEnableLocalStorage[];
-
-extern const wchar_t kEnableSessionStorage[];
-
 }  // namespace switches
 
 #endif  // CHROME_COMMON_CHROME_SWITCHES_H_
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index f769aaf..41b9466 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -1529,8 +1529,6 @@ struct ParamTraits<WebPreferences> {
     WriteParam(m, p.uses_page_cache);
     WriteParam(m, p.remote_fonts_enabled);
     WriteParam(m, p.xss_auditor_enabled);
-    WriteParam(m, p.local_storage_enabled);
-    WriteParam(m, p.session_storage_enabled);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return
@@ -1561,9 +1559,7 @@ struct ParamTraits<WebPreferences> {
         ReadParam(m, iter, &p->user_style_sheet_location) &&
         ReadParam(m, iter, &p->uses_page_cache) &&
         ReadParam(m, iter, &p->remote_fonts_enabled) &&
-        ReadParam(m, iter, &p->xss_auditor_enabled) &&
-        ReadParam(m, iter, &p->local_storage_enabled) &&
-        ReadParam(m, iter, &p->session_storage_enabled);
+        ReadParam(m, iter, &p->xss_auditor_enabled);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"<WebPreferences>");