| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 | 401 |
| 402 DISALLOW_COPY_AND_ASSIGN(ContinueWhereILeftOffTest); | 402 DISALLOW_COPY_AND_ASSIGN(ContinueWhereILeftOffTest); |
| 403 }; | 403 }; |
| 404 | 404 |
| 405 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, PRE_SessionCookies) { | 405 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, PRE_SessionCookies) { |
| 406 // Set the startup preference to "continue where I left off" and visit a page | 406 // Set the startup preference to "continue where I left off" and visit a page |
| 407 // which stores a session cookie. | 407 // which stores a session cookie. |
| 408 StoreDataWithPage("session_cookies.html"); | 408 StoreDataWithPage("session_cookies.html"); |
| 409 } | 409 } |
| 410 | 410 |
| 411 // Flaky(crbug.com/700696) | 411 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, SessionCookies) { |
| 412 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, DISABLED_SessionCookies) { | |
| 413 // The browsing session will be continued; just wait for the page to reload | 412 // The browsing session will be continued; just wait for the page to reload |
| 414 // and check the stored data. | 413 // and check the stored data. |
| 415 CheckReloadedPageRestored(); | 414 CheckReloadedPageRestored(); |
| 416 } | 415 } |
| 417 | 416 |
| 418 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, PRE_SessionStorage) { | 417 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, PRE_SessionStorage) { |
| 419 StoreDataWithPage("session_storage.html"); | 418 StoreDataWithPage("session_storage.html"); |
| 420 } | 419 } |
| 421 | 420 |
| 422 // Flaky(crbug.com/700699) | 421 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, SessionStorage) { |
| 423 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, DISABLED_SessionStorage) { | |
| 424 CheckReloadedPageRestored(); | 422 CheckReloadedPageRestored(); |
| 425 } | 423 } |
| 426 | 424 |
| 427 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, | 425 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, |
| 428 PRE_PRE_LocalStorageClearedOnExit) { | 426 PRE_PRE_LocalStorageClearedOnExit) { |
| 429 StoreDataWithPage("local_storage.html"); | 427 StoreDataWithPage("local_storage.html"); |
| 430 } | 428 } |
| 431 | 429 |
| 432 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, | 430 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, |
| 433 PRE_LocalStorageClearedOnExit) { | 431 PRE_LocalStorageClearedOnExit) { |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 896 CookieSettingsFactory::GetForProfile(new_browser->profile()) | 894 CookieSettingsFactory::GetForProfile(new_browser->profile()) |
| 897 ->SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY); | 895 ->SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY); |
| 898 // ... even if background mode is active. | 896 // ... even if background mode is active. |
| 899 EnableBackgroundMode(); | 897 EnableBackgroundMode(); |
| 900 new_browser = QuitBrowserAndRestore(new_browser, true); | 898 new_browser = QuitBrowserAndRestore(new_browser, true); |
| 901 StoreDataWithPage(new_browser, "cookies.html"); | 899 StoreDataWithPage(new_browser, "cookies.html"); |
| 902 DisableBackgroundMode(); | 900 DisableBackgroundMode(); |
| 903 new_browser = QuitBrowserAndRestore(new_browser, true); | 901 new_browser = QuitBrowserAndRestore(new_browser, true); |
| 904 StoreDataWithPage(new_browser, "cookies.html"); | 902 StoreDataWithPage(new_browser, "cookies.html"); |
| 905 } | 903 } |
| OLD | NEW |