Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: webkit/dom_storage/dom_storage_context.cc

Issue 11280294: Revert 170932 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sessions/session_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/dom_storage/dom_storage_context.cc
===================================================================
--- webkit/dom_storage/dom_storage_context.cc (revision 170949)
+++ webkit/dom_storage/dom_storage_context.cc (working copy)
@@ -170,30 +170,24 @@
}
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).
@@ -312,17 +306,11 @@
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));
« no previous file with comments | « chrome/browser/sessions/session_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698