summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions
diff options
context:
space:
mode:
authormarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 11:56:17 +0000
committermarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 11:56:17 +0000
commit43b368fd8d04ed15a198f976a212003555721aca (patch)
tree27d496ea2ca5f4fb120e24ce6e356185c2ff7788 /chrome/browser/sessions
parentb695df63221af283bfabd7dc49fd04141875fb79 (diff)
downloadchromium_src-43b368fd8d04ed15a198f976a212003555721aca.zip
chromium_src-43b368fd8d04ed15a198f976a212003555721aca.tar.gz
chromium_src-43b368fd8d04ed15a198f976a212003555721aca.tar.bz2
Debug prints for a failing test (ContinueWhereILeftOffTest.LocalStorageClearedOnExit).
To be reverted immediately once a test run has started. BUG=153260 Review URL: https://codereview.chromium.org/11434037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170932 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
-rw-r--r--chrome/browser/sessions/better_session_restore_browsertest.cc8
-rw-r--r--chrome/browser/sessions/session_restore.cc2
-rw-r--r--chrome/browser/sessions/session_service.cc1
3 files changed, 5 insertions, 6 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;