Don't hardcode the "Local Storage" directory name in DomStorageContext.

webkit/dom_storage/dom_storage_context_unittest.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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/scoped_temp_dir.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 24 matching lines @@
   const string16 kValue;
   const bool kDontIncludeFileInfo;
   const bool kDoIncludeFileInfo;
 
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     storage_policy_ = new quota::MockSpecialStoragePolicy;
     task_runner_ = new MockDomStorageTaskRunner(
             base::MessageLoopProxy::current());
     context_ = new DomStorageContext(temp_dir_.path(),
+                                     FilePath(),
                                      storage_policy_,
                                      task_runner_);
   }
 
   virtual void TearDown() {
     MessageLoop::current()->RunAllPending();
   }
 
   void VerifySingleOriginRemains(const GURL& origin) {
     // Use a new instance to examine the contexts of temp_dir_.
     scoped_refptr<DomStorageContext> context =
-        new DomStorageContext(temp_dir_.path(), NULL, NULL);
+        new DomStorageContext(temp_dir_.path(), FilePath(), NULL, NULL);
     std::vector<DomStorageContext::UsageInfo> infos;
     context->GetUsageInfo(&infos, kDontIncludeFileInfo);
     EXPECT_EQ(1u, infos.size());
     EXPECT_EQ(origin, infos[0].origin);
   }
 
  protected:
   ScopedTempDir temp_dir_;
   scoped_refptr<quota::MockSpecialStoragePolicy> storage_policy_;
   scoped_refptr<MockDomStorageTaskRunner> task_runner_;
   scoped_refptr<DomStorageContext> context_;
   DISALLOW_COPY_AND_ASSIGN(DomStorageContextTest);
 };
 
 TEST_F(DomStorageContextTest, Basics) {
   // This test doesn't do much, checks that the constructor
   // initializes members properly and that invoking methods
   // on a newly created object w/o any data on disk do no harm.
-  EXPECT_EQ(temp_dir_.path(), context_->directory());
+  EXPECT_EQ(temp_dir_.path(), context_->localstorage_directory());
+  EXPECT_EQ(FilePath(), context_->sessionstorage_directory());
   EXPECT_EQ(storage_policy_.get(), context_->special_storage_policy_.get());
   context_->PurgeMemory();
   context_->DeleteOrigin(GURL("http://chromium.org/"));
   context_->DeleteDataModifiedSince(base::Time::Now());
   const int kFirstSessionStorageNamespaceId = 1;
   EXPECT_TRUE(context_->GetStorageNamespace(kLocalStorageNamespaceId));
   EXPECT_FALSE(context_->GetStorageNamespace(kFirstSessionStorageNamespaceId));
   EXPECT_EQ(kFirstSessionStorageNamespaceId, context_->AllocateSessionId());
   std::vector<DomStorageContext::UsageInfo> infos;
   context_->GetUsageInfo(&infos, kDontIncludeFileInfo);
@@ skipping 13 matching lines @@
   // to ensure data is written to disk.
   NullableString16 old_value;
   EXPECT_TRUE(context_->GetStorageNamespace(kLocalStorageNamespaceId)->
       OpenStorageArea(kOrigin)->SetItem(kKey, kValue, &old_value));
   context_->Shutdown();
   context_ = NULL;
   MessageLoop::current()->RunAllPending();
 
   // Create a new context that points to the same directory, see that
   // it knows about the origin that we stored data for.
-  context_ = new DomStorageContext(temp_dir_.path(), NULL, NULL);
+  context_ = new DomStorageContext(temp_dir_.path(), FilePath(), NULL, NULL);
   context_->GetUsageInfo(&infos, kDontIncludeFileInfo);
   EXPECT_EQ(1u, infos.size());
   EXPECT_EQ(kOrigin, infos[0].origin);
   EXPECT_EQ(0u, infos[0].data_size);
   EXPECT_EQ(base::Time(), infos[0].last_modified);
   infos.clear();
   context_->GetUsageInfo(&infos, kDoIncludeFileInfo);
   EXPECT_EQ(1u, infos.size());
   EXPECT_EQ(kOrigin, infos[0].origin);
   EXPECT_NE(0u, infos[0].data_size);
@@ skipping 51 matching lines @@
   context_->SetClearLocalState(true);
   context_->SaveSessionState();  // Should override clear behavior.
   context_->Shutdown();
   context_ = NULL;
   MessageLoop::current()->RunAllPending();
 
   VerifySingleOriginRemains(kSessionOnlyOrigin);
 }
 
 }  // namespace dom_storage
-