Revert 165291 - Automate Better Session Restore tests: localStorage.

BUG=153260


Review URL: https://chromiumcodereview.appspot.com/11365006

TBR=marja@chromium.org
Review URL: https://codereview.chromium.org/11368026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165299 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 40 deletions

diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc
index e404ddd..be315e2 100644
--- a/chrome/browser/sessions/better_session_restore_browsertest.cc
+++ b/chrome/browser/sessions/better_session_restore_browsertest.cc
@@ -8,12 +8,10 @@
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/content_settings.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
@@ -58,7 +56,6 @@ class BetterSessionRestoreTest : public InProcessBrowserTest {
     // Set up the URL request filtering.
     std::vector<std::string> test_files;
     test_files.push_back("common.js");
-    test_files.push_back("local_storage.html");
     test_files.push_back("session_cookies.html");
     test_files.push_back("session_storage.html");
     FilePath test_file_dir;
@@ -92,28 +89,17 @@ class BetterSessionRestoreTest : public InProcessBrowserTest {
     EXPECT_EQ(title_storing_, final_title);
   }
 
-  void CheckReloadedPageRestored() {
-    CheckTitle(title_pass_);
-  }
-
-  void CheckReloadedPageNotRestored() {
-    CheckTitle(title_storing_);
-  }
-
-  void CheckTitle(const string16& expected_title) {
+  void CheckReloadedPage() {
     content::WebContents* web_contents = chrome::GetWebContentsAt(browser(), 0);
-    content::TitleWatcher title_watcher(web_contents, expected_title);
-    title_watcher.AlsoWaitForTitle(title_pass_);
+    content::TitleWatcher title_watcher(web_contents, title_pass_);
     title_watcher.AlsoWaitForTitle(title_storing_);
     title_watcher.AlsoWaitForTitle(title_error_write_failed_);
     title_watcher.AlsoWaitForTitle(title_error_empty_);
     // It's possible that the title was already the right one before
     // title_watcher was created.
-    if (web_contents->GetTitle().empty()) {
+    if (web_contents->GetTitle() != title_pass_) {
       string16 final_title = title_watcher.WaitAndGetTitle();
-      EXPECT_EQ(expected_title, final_title);
-    } else {
-      EXPECT_EQ(expected_title, web_contents->GetTitle());
+      EXPECT_EQ(title_pass_, final_title);
     }
   }
 
@@ -139,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(BetterSessionRestoreTest, PRE_SessionCookies) {
 IN_PROC_BROWSER_TEST_F(BetterSessionRestoreTest, SessionCookies) {
   // The browsing session will be continued; just wait for the page to reload
   // and check the stored data.
-  CheckReloadedPageRestored();
+  CheckReloadedPage();
 }
 
 IN_PROC_BROWSER_TEST_F(BetterSessionRestoreTest, PRE_SessionStorage) {
@@ -151,25 +137,5 @@ IN_PROC_BROWSER_TEST_F(BetterSessionRestoreTest, PRE_SessionStorage) {
 }
 
 IN_PROC_BROWSER_TEST_F(BetterSessionRestoreTest, SessionStorage) {
-  CheckReloadedPageRestored();
-}
-
-IN_PROC_BROWSER_TEST_F(BetterSessionRestoreTest,
-                       PRE_PRE_LocalStorageClearedOnExit) {
-  SessionStartupPref::SetStartupPref(
-      browser()->profile(), SessionStartupPref(SessionStartupPref::LAST));
-  StoreDataWithPage("local_storage.html");
-}
-
-IN_PROC_BROWSER_TEST_F(BetterSessionRestoreTest,
-                       PRE_LocalStorageClearedOnExit) {
-  // Normally localStorage is restored.
-  CheckReloadedPageRestored();
-  // ... but not if it's set to clear on exit.
-  CookieSettings::Factory::GetForProfile(browser()->profile())->
-      SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY);
-}
-
-IN_PROC_BROWSER_TEST_F(BetterSessionRestoreTest, LocalStorageClearedOnExit) {
-  CheckReloadedPageNotRestored();
+  CheckReloadedPage();
 }