Create an enum for local storage vs. session storage rather than using

a boolean.

TEST=It still works.
BUG=21070


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

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

3 files changed, 15 insertions, 14 deletions

diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index b6f3228..3907b53 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -142,13 +142,13 @@ WebStorageNamespace* RendererWebKitClientImpl::createLocalStorageNamespace(
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
     return WebStorageNamespace::createLocalStorageNamespace(path);
   // The browser process decides the path, so ignore that param.
-  return new RendererWebStorageNamespaceImpl(true);
+  return new RendererWebStorageNamespaceImpl(DOM_STORAGE_LOCAL);
 }
 
 WebStorageNamespace* RendererWebKitClientImpl::createSessionStorageNamespace() {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
     return WebStorageNamespace::createSessionStorageNamespace();
-  return new RendererWebStorageNamespaceImpl(false);
+  return new RendererWebStorageNamespaceImpl(DOM_STORAGE_SESSION);
 }
 
 WebApplicationCacheHost* RendererWebKitClientImpl::createApplicationCacheHost(
diff --git a/chrome/renderer/renderer_webstoragenamespace_impl.cc b/chrome/renderer/renderer_webstoragenamespace_impl.cc
index 0457207..c63d6da 100644
--- a/chrome/renderer/renderer_webstoragenamespace_impl.cc
+++ b/chrome/renderer/renderer_webstoragenamespace_impl.cc
@@ -9,14 +9,14 @@
 #include "chrome/renderer/renderer_webstoragearea_impl.h"
 
 RendererWebStorageNamespaceImpl::RendererWebStorageNamespaceImpl(
-    bool is_local_storage)
-    : is_local_storage_(is_local_storage),
+    DOMStorageType storage_type)
+    : storage_type_(storage_type),
       namespace_id_(kUninitializedNamespaceId) {
 }
 
 RendererWebStorageNamespaceImpl::RendererWebStorageNamespaceImpl(
-    bool is_local_storage, int64 namespace_id)
-    : is_local_storage_(is_local_storage),
+    DOMStorageType storage_type, int64 namespace_id)
+    : storage_type_(storage_type),
       namespace_id_(namespace_id) {
   DCHECK(namespace_id_ != kUninitializedNamespaceId);
 }
@@ -31,7 +31,7 @@ WebKit::WebStorageArea* RendererWebStorageNamespaceImpl::createStorageArea(
   // whether it's worth the complexity.
   if (namespace_id_ == kUninitializedNamespaceId) {
     RenderThread::current()->Send(
-        new ViewHostMsg_DOMStorageNamespaceId(is_local_storage_,
+        new ViewHostMsg_DOMStorageNamespaceId(storage_type_,
                                               &namespace_id_));
     DCHECK(namespace_id_ != kUninitializedNamespaceId);
   }
@@ -45,14 +45,14 @@ WebKit::WebStorageArea* RendererWebStorageNamespaceImpl::createStorageArea(
 WebKit::WebStorageNamespace* RendererWebStorageNamespaceImpl::copy() {
   // If we haven't been used yet, we might as well start out fresh (and lazy).
   if (namespace_id_ == kUninitializedNamespaceId)
-    return new RendererWebStorageNamespaceImpl(is_local_storage_);
+    return new RendererWebStorageNamespaceImpl(storage_type_);
 
   // This cannot easily be differed because we need a snapshot in time.
   int64 new_namespace_id;
   RenderThread::current()->Send(
       new ViewHostMsg_DOMStorageCloneNamespaceId(namespace_id_,
                                                  &new_namespace_id));
-  return new RendererWebStorageNamespaceImpl(is_local_storage_,
+  return new RendererWebStorageNamespaceImpl(storage_type_,
                                              new_namespace_id);
 }
 
diff --git a/chrome/renderer/renderer_webstoragenamespace_impl.h b/chrome/renderer/renderer_webstoragenamespace_impl.h
index 7478a67..c5a6dfb7 100644
--- a/chrome/renderer/renderer_webstoragenamespace_impl.h
+++ b/chrome/renderer/renderer_webstoragenamespace_impl.h
@@ -6,12 +6,14 @@
 #define CHROME_RENDERER_RENDERER_WEBSTORAGENAMESPACE_IMPL_H_
 
 #include "base/basictypes.h"
+#include "chrome/common/dom_storage_type.h"
 #include "webkit/api/public/WebStorageNamespace.h"
 
 class RendererWebStorageNamespaceImpl : public WebKit::WebStorageNamespace {
  public:
-  explicit RendererWebStorageNamespaceImpl(bool is_local_storage);
-  RendererWebStorageNamespaceImpl(bool is_local_storage, int64 namespace_id);
+  explicit RendererWebStorageNamespaceImpl(DOMStorageType storage_type);
+  RendererWebStorageNamespaceImpl(
+      DOMStorageType storage_type, int64 namespace_id);
 
   // See WebStorageNamespace.h for documentation on these functions.
   virtual ~RendererWebStorageNamespaceImpl();
@@ -21,9 +23,8 @@ class RendererWebStorageNamespaceImpl : public WebKit::WebStorageNamespace {
   virtual void close();
 
  private:
-  // Are we local storage (as opposed to session storage).  Used during lazy
-  // initialization of namespace_id_.
-  bool is_local_storage_;
+  // Used during lazy initialization of namespace_id_.
+  const DOMStorageType storage_type_;
 
   // Our namespace ID.  Lazily initialized.
   int64 namespace_id_;