Unwire the clear on exit preference from the storage systems.

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 124 matching lines @@
   EXPECT_TRUE(context_->GetStorageNamespace(kLocalStorageNamespaceId)->
       OpenStorageArea(kSessionOnlyOrigin)->SetItem(kKey, kValue, &old_value));
   context_->Shutdown();
   context_ = NULL;
   MessageLoop::current()->RunAllPending();
 
   // Verify that the session-only origin data is gone.
   VerifySingleOriginRemains(kOrigin);
 }
 
-TEST_F(DomStorageContextTest, ClearLocalState) {
-  const GURL kProtectedOrigin("http://www.protected.com/");
-  storage_policy_->AddProtected(kProtectedOrigin);
-
-  // Store data for a normal and a protected origin, setup shutdown options
-  // to clear normal local state, then shutdown and let things flush.
-  NullableString16 old_value;
-  EXPECT_TRUE(context_->GetStorageNamespace(kLocalStorageNamespaceId)->
-      OpenStorageArea(kOrigin)->SetItem(kKey, kValue, &old_value));
-  EXPECT_TRUE(context_->GetStorageNamespace(kLocalStorageNamespaceId)->
-      OpenStorageArea(kProtectedOrigin)->SetItem(kKey, kValue, &old_value));
-  context_->SetClearLocalState(true);
-  context_->Shutdown();
-  context_ = NULL;
-  MessageLoop::current()->RunAllPending();
-
-  VerifySingleOriginRemains(kProtectedOrigin);
-}
-
-TEST_F(DomStorageContextTest, SaveSessionState) {
+TEST_F(DomStorageContextTest, SetForceKeepSessionState) {
   const GURL kSessionOnlyOrigin("http://www.sessiononly.com/");
   storage_policy_->AddSessionOnly(kSessionOnlyOrigin);
 
   // Store data for a session-only origin, setup to save session data, then
   // shutdown.
   NullableString16 old_value;
   EXPECT_TRUE(context_->GetStorageNamespace(kLocalStorageNamespaceId)->
       OpenStorageArea(kSessionOnlyOrigin)->SetItem(kKey, kValue, &old_value));
-  context_->SetClearLocalState(true);
-  context_->SaveSessionState();  // Should override clear behavior.
+  context_->SetForceKeepSessionState();  // Should override clear behavior.
   context_->Shutdown();
   context_ = NULL;
   MessageLoop::current()->RunAllPending();
 
   VerifySingleOriginRemains(kSessionOnlyOrigin);
 }
 
 }  // namespace dom_storage