diff options
| -rw-r--r-- | chrome/browser/sessions/better_session_restore_browsertest.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/sessions/session_restore.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sessions/session_service.cc | 1 | ||||
| -rw-r--r-- | webkit/dom_storage/dom_storage_context.cc | 20 |
4 files changed, 21 insertions, 10 deletions
diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc index 2962d93..90b5bbf 100644 --- a/chrome/browser/sessions/better_session_restore_browsertest.cc +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc @@ -258,16 +258,12 @@ IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, // ... but not if it's set to clear on exit. CookieSettings::Factory::GetForProfile(browser()->profile())-> SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY); + LOG(ERROR) << "we've now set the session only preference"; } // Flaky on Linux: http://crbug.com/163096 -#if defined(OS_LINUX) -#define MAYBE_LocalStorageClearedOnExit DISABLED_LocalStorageClearedOnExit -#else -#define MAYBE_LocalStorageClearedOnExit LocalStorageClearedOnExit -#endif IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, - MAYBE_LocalStorageClearedOnExit) { + LocalStorageClearedOnExit) { CheckReloadedPageNotRestored(); } diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index 217eb62..87156e8 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -958,6 +958,8 @@ class SessionRestoreImpl : public content::NotificationObserver { std::min(selected_index, static_cast<int>(tab.navigations.size() - 1))); + LOG(ERROR) << "Restoring a tab, title: " + << tab.navigations.at(selected_index).title(); RecordAppLaunchForTab(browser, tab, selected_index); // Associate sessionStorage (if any) to the restored tab. diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index 11e9c53..001bf33 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -437,6 +437,7 @@ void SessionService::UpdateTabNavigation( const SessionID& window_id, const SessionID& tab_id, const TabNavigation& navigation) { + LOG(ERROR) << "UpdateTabNavigation, title: " << navigation.title(); if (!ShouldTrackEntry(navigation.virtual_url()) || !ShouldTrackChangesToWindow(window_id)) { return; diff --git a/webkit/dom_storage/dom_storage_context.cc b/webkit/dom_storage/dom_storage_context.cc index 6a67e8a..feba694 100644 --- a/webkit/dom_storage/dom_storage_context.cc +++ b/webkit/dom_storage/dom_storage_context.cc @@ -170,24 +170,30 @@ void DomStorageContext::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()) + if (localstorage_directory_.empty() && !session_storage_database_.get()) { + LOG(ERROR) << "No databases"; return; + } // Respect the content policy settings about what to // keep and what to discard. - if (force_keep_session_state_) + if (force_keep_session_state_) { + LOG(ERROR) << "Saving the 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). @@ -306,11 +312,17 @@ void DomStorageContext::ClearSessionOnlyOrigins() { GetLocalStorageUsage(&infos, kDontIncludeFileInfo); for (size_t i = 0; i < infos.size(); ++i) { const GURL& origin = infos[i].origin; - if (special_storage_policy_->IsStorageProtected(origin)) + LOG(ERROR) << "Data for origin " << origin; + if (special_storage_policy_->IsStorageProtected(origin)) { + LOG(ERROR) << "Was protected"; continue; - if (!special_storage_policy_->IsStorageSessionOnly(origin)) + } + if (!special_storage_policy_->IsStorageSessionOnly(origin)) { + LOG(ERROR) << "Not session only"; continue; + } + LOG(ERROR) << "Clearing it"; const bool kNotRecursive = false; FilePath database_file_path = localstorage_directory_.Append( DomStorageArea::DatabaseFileNameFromOrigin(origin)); |