Revert 170932

webkit/dom_storage/dom_storage_context.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 "webkit/dom_storage/dom_storage_context.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/guid.h"
@@ skipping 152 matching lines @@
   // which is backed by disk.
   // TODO(marja): Purge sessionStorage, too. (Requires changes to the FastClear
   // functionality.)
   StorageNamespaceMap::iterator found =
       namespaces_.find(kLocalStorageNamespaceId);
   if (found != namespaces_.end())
     found->second->PurgeMemory();
 }
 
 void DomStorageContext::Shutdown() {
-  LOG(ERROR) << "DomStorageContext::Shutdown";
   is_shutdown_ = true;
   StorageNamespaceMap::const_iterator it = namespaces_.begin();
   for (; it != namespaces_.end(); ++it)
     it->second->Shutdown();
 
-  if (localstorage_directory_.empty() && !session_storage_database_.get()) {
-    LOG(ERROR) << "No databases";
+  if (localstorage_directory_.empty() && !session_storage_database_.get())
     return;
-  }
 
   // Respect the content policy settings about what to
   // keep and what to discard.
-  if (force_keep_session_state_) {
-    LOG(ERROR) << "Saving the session state";
+  if (force_keep_session_state_)
     return;  // Keep everything.
-  }
 
   bool has_session_only_origins =
       special_storage_policy_.get() &&
       special_storage_policy_->HasSessionOnlyOrigins();
 
   if (has_session_only_origins) {
-    LOG(ERROR) << "There is session only data to clear";
     // We may have to delete something. We continue on the
     // commit sequence after area shutdown tasks have cycled
     // thru that sequence (and closed their database files).
     bool success = task_runner_->PostShutdownBlockingTask(
         FROM_HERE,
         DomStorageTaskRunner::COMMIT_SEQUENCE,
         base::Bind(&DomStorageContext::ClearSessionOnlyOrigins, this));
     DCHECK(success);
   }
 }
@@ skipping 98 matching lines @@
     CreateSessionNamespace(new_id, new_persistent_id);
 }
 
 void DomStorageContext::ClearSessionOnlyOrigins() {
   if (!localstorage_directory_.empty()) {
     std::vector<LocalStorageUsageInfo> infos;
     const bool kDontIncludeFileInfo = false;
     GetLocalStorageUsage(&infos, kDontIncludeFileInfo);
     for (size_t i = 0; i < infos.size(); ++i) {
       const GURL& origin = infos[i].origin;
-      LOG(ERROR) << "Data for origin " << origin;
-      if (special_storage_policy_->IsStorageProtected(origin)) {
-        LOG(ERROR) << "Was protected";
+      if (special_storage_policy_->IsStorageProtected(origin))
         continue;
-      }
-      if (!special_storage_policy_->IsStorageSessionOnly(origin)) {
-        LOG(ERROR) << "Not session only";
+      if (!special_storage_policy_->IsStorageSessionOnly(origin))
         continue;
-      }
 
-      LOG(ERROR) << "Clearing it";
       const bool kNotRecursive = false;
       FilePath database_file_path = localstorage_directory_.Append(
           DomStorageArea::DatabaseFileNameFromOrigin(origin));
       file_util::Delete(database_file_path, kNotRecursive);
       file_util::Delete(
           DomStorageDatabase::GetJournalFilePath(database_file_path),
           kNotRecursive);
     }
   }
   if (session_storage_database_.get()) {
@@ skipping 90 matching lines @@
   if (!deletable_persistent_namespace_ids_.empty()) {
     task_runner_->PostDelayedTask(
         FROM_HERE, base::Bind(
             &DomStorageContext::DeleteNextUnusedNamespace,
             this),
         base::TimeDelta::FromSeconds(kSessionStoraceScavengingSeconds));
   }
 }
 
 }  // namespace dom_storage