| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 | 118 |
| 119 }; | 119 }; |
| 120 | 120 |
| 121 } // namespace | 121 } // namespace |
| 122 | 122 |
| 123 class BetterSessionRestoreTest : public InProcessBrowserTest { | 123 class BetterSessionRestoreTest : public InProcessBrowserTest { |
| 124 public: | 124 public: |
| 125 BetterSessionRestoreTest() | 125 BetterSessionRestoreTest() |
| 126 : fake_server_address_("http://www.test.com/"), | 126 : fake_server_address_("http://www.test.com/"), |
| 127 test_path_("session_restore/"), | 127 test_path_("session_restore/"), |
| 128 title_pass_(ASCIIToUTF16("PASS")), | 128 title_pass_(base::ASCIIToUTF16("PASS")), |
| 129 title_storing_(ASCIIToUTF16("STORING")), | 129 title_storing_(base::ASCIIToUTF16("STORING")), |
| 130 title_error_write_failed_(ASCIIToUTF16("ERROR_WRITE_FAILED")), | 130 title_error_write_failed_(base::ASCIIToUTF16("ERROR_WRITE_FAILED")), |
| 131 title_error_empty_(ASCIIToUTF16("ERROR_EMPTY")) { | 131 title_error_empty_(base::ASCIIToUTF16("ERROR_EMPTY")) { |
| 132 // Set up the URL request filtering. | 132 // Set up the URL request filtering. |
| 133 std::vector<std::string> test_files; | 133 std::vector<std::string> test_files; |
| 134 test_files.push_back("common.js"); | 134 test_files.push_back("common.js"); |
| 135 test_files.push_back("cookies.html"); | 135 test_files.push_back("cookies.html"); |
| 136 test_files.push_back("local_storage.html"); | 136 test_files.push_back("local_storage.html"); |
| 137 test_files.push_back("post.html"); | 137 test_files.push_back("post.html"); |
| 138 test_files.push_back("post_with_password.html"); | 138 test_files.push_back("post_with_password.html"); |
| 139 test_files.push_back("session_cookies.html"); | 139 test_files.push_back("session_cookies.html"); |
| 140 test_files.push_back("session_storage.html"); | 140 test_files.push_back("session_storage.html"); |
| 141 base::FilePath test_file_dir; | 141 base::FilePath test_file_dir; |
| (...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 CookieSettings::Factory::GetForProfile(new_browser->profile())-> | 790 CookieSettings::Factory::GetForProfile(new_browser->profile())-> |
| 791 SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY); | 791 SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY); |
| 792 // ... even if background mode is active. | 792 // ... even if background mode is active. |
| 793 EnableBackgroundMode(); | 793 EnableBackgroundMode(); |
| 794 new_browser = QuitBrowserAndRestore(new_browser, true); | 794 new_browser = QuitBrowserAndRestore(new_browser, true); |
| 795 StoreDataWithPage(new_browser, "cookies.html"); | 795 StoreDataWithPage(new_browser, "cookies.html"); |
| 796 DisableBackgroundMode(); | 796 DisableBackgroundMode(); |
| 797 new_browser = QuitBrowserAndRestore(new_browser, true); | 797 new_browser = QuitBrowserAndRestore(new_browser, true); |
| 798 StoreDataWithPage(new_browser, "cookies.html"); | 798 StoreDataWithPage(new_browser, "cookies.html"); |
| 799 } | 799 } |
| OLD | NEW |