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 #include <deque> | 6 #include <deque> |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <unordered_map> | 9 #include <unordered_map> |
10 #include <utility> | 10 #include <utility> |
(...skipping 16 matching lines...) Expand all Loading... |
27 #include "base/strings/utf_string_conversions.h" | 27 #include "base/strings/utf_string_conversions.h" |
28 #include "base/test/scoped_feature_list.h" | 28 #include "base/test/scoped_feature_list.h" |
29 #include "base/test/simple_test_tick_clock.h" | 29 #include "base/test/simple_test_tick_clock.h" |
30 #include "base/test/test_timeouts.h" | 30 #include "base/test/test_timeouts.h" |
31 #include "base/values.h" | 31 #include "base/values.h" |
32 #include "build/build_config.h" | 32 #include "build/build_config.h" |
33 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 33 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
34 #include "chrome/browser/browsing_data/browsing_data_remover.h" | 34 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
35 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" | 35 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" |
36 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h" | 36 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h" |
| 37 #include "chrome/browser/browsing_data/chrome_browsing_data_types.h" |
37 #include "chrome/browser/chrome_content_browser_client.h" | 38 #include "chrome/browser/chrome_content_browser_client.h" |
38 #include "chrome/browser/chrome_notification_types.h" | 39 #include "chrome/browser/chrome_notification_types.h" |
39 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 40 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
40 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" | 41 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" |
41 #include "chrome/browser/extensions/extension_apitest.h" | 42 #include "chrome/browser/extensions/extension_apitest.h" |
42 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 43 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
43 #include "chrome/browser/net/prediction_options.h" | 44 #include "chrome/browser/net/prediction_options.h" |
44 #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_
test_harness.h" | 45 #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_
test_harness.h" |
45 #include "chrome/browser/page_load_metrics/observers/prerender_page_load_metrics
_observer.h" | 46 #include "chrome/browser/page_load_metrics/observers/prerender_page_load_metrics
_observer.h" |
46 #include "chrome/browser/password_manager/password_store_factory.h" | 47 #include "chrome/browser/password_manager/password_store_factory.h" |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 const char* const kClientRedirectBase = "/client-redirect?"; | 225 const char* const kClientRedirectBase = "/client-redirect?"; |
225 return kClientRedirectBase + net::EscapeQueryParamValue(dest_url, false); | 226 return kClientRedirectBase + net::EscapeQueryParamValue(dest_url, false); |
226 } | 227 } |
227 | 228 |
228 std::string CreateServerRedirect(const std::string& dest_url) { | 229 std::string CreateServerRedirect(const std::string& dest_url) { |
229 const char* const kServerRedirectBase = "/server-redirect?"; | 230 const char* const kServerRedirectBase = "/server-redirect?"; |
230 return kServerRedirectBase + net::EscapeQueryParamValue(dest_url, false); | 231 return kServerRedirectBase + net::EscapeQueryParamValue(dest_url, false); |
231 } | 232 } |
232 | 233 |
233 // Clears the specified data using BrowsingDataRemover. | 234 // Clears the specified data using BrowsingDataRemover. |
234 void ClearBrowsingData(Browser* browser, int remove_mask) { | 235 void ClearBrowsingData( |
| 236 Browser* browser, |
| 237 const std::set<const content::BrowsingDataType*>& remove_mask) { |
235 BrowsingDataRemover* remover = | 238 BrowsingDataRemover* remover = |
236 BrowsingDataRemoverFactory::GetForBrowserContext(browser->profile()); | 239 BrowsingDataRemoverFactory::GetForBrowserContext(browser->profile()); |
237 BrowsingDataRemoverCompletionObserver observer(remover); | 240 BrowsingDataRemoverCompletionObserver observer(remover); |
238 remover->RemoveAndReply(base::Time(), base::Time::Max(), remove_mask, | 241 remover->RemoveAndReply(base::Time(), base::Time::Max(), remove_mask, |
239 BrowsingDataHelper::UNPROTECTED_WEB, &observer); | 242 BrowsingDataHelper::UNPROTECTED_WEB, &observer); |
240 observer.BlockUntilCompletion(); | 243 observer.BlockUntilCompletion(); |
241 // BrowsingDataRemover deletes itself. | 244 // BrowsingDataRemover deletes itself. |
242 } | 245 } |
243 | 246 |
244 // Returns true if the prerender is expected to abort on its own, before | 247 // Returns true if the prerender is expected to abort on its own, before |
(...skipping 2276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2521 } | 2524 } |
2522 | 2525 |
2523 | 2526 |
2524 // Checks that when the history is cleared, prerendering is cancelled and | 2527 // Checks that when the history is cleared, prerendering is cancelled and |
2525 // prerendering history is cleared. | 2528 // prerendering history is cleared. |
2526 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearHistory) { | 2529 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearHistory) { |
2527 std::unique_ptr<TestPrerender> prerender = | 2530 std::unique_ptr<TestPrerender> prerender = |
2528 PrerenderTestURL("/prerender/prerender_page.html", | 2531 PrerenderTestURL("/prerender/prerender_page.html", |
2529 FINAL_STATUS_CACHE_OR_HISTORY_CLEARED, 1); | 2532 FINAL_STATUS_CACHE_OR_HISTORY_CLEARED, 1); |
2530 | 2533 |
2531 ClearBrowsingData(current_browser(), BrowsingDataRemover::REMOVE_HISTORY); | 2534 ClearBrowsingData(current_browser(), {&kBrowsingDataTypeHistory}); |
2532 prerender->WaitForStop(); | 2535 prerender->WaitForStop(); |
2533 | 2536 |
2534 // Make sure prerender history was cleared. | 2537 // Make sure prerender history was cleared. |
2535 EXPECT_EQ(0U, GetHistoryLength()); | 2538 EXPECT_EQ(0U, GetHistoryLength()); |
2536 } | 2539 } |
2537 | 2540 |
2538 // Checks that when the cache is cleared, prerenders are cancelled but | 2541 // Checks that when the cache is cleared, prerenders are cancelled but |
2539 // prerendering history is not cleared. | 2542 // prerendering history is not cleared. |
2540 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearCache) { | 2543 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearCache) { |
2541 std::unique_ptr<TestPrerender> prerender = | 2544 std::unique_ptr<TestPrerender> prerender = |
2542 PrerenderTestURL("/prerender/prerender_page.html", | 2545 PrerenderTestURL("/prerender/prerender_page.html", |
2543 FINAL_STATUS_CACHE_OR_HISTORY_CLEARED, 1); | 2546 FINAL_STATUS_CACHE_OR_HISTORY_CLEARED, 1); |
2544 | 2547 |
2545 ClearBrowsingData(current_browser(), BrowsingDataRemover::REMOVE_CACHE); | 2548 ClearBrowsingData(current_browser(), {&kBrowsingDataTypeCache}); |
2546 prerender->WaitForStop(); | 2549 prerender->WaitForStop(); |
2547 | 2550 |
2548 // Make sure prerender history was not cleared. Not a vital behavior, but | 2551 // Make sure prerender history was not cleared. Not a vital behavior, but |
2549 // used to compare with PrerenderClearHistory test. | 2552 // used to compare with PrerenderClearHistory test. |
2550 EXPECT_EQ(1U, GetHistoryLength()); | 2553 EXPECT_EQ(1U, GetHistoryLength()); |
2551 } | 2554 } |
2552 | 2555 |
2553 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelAll) { | 2556 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelAll) { |
2554 std::unique_ptr<TestPrerender> prerender = PrerenderTestURL( | 2557 std::unique_ptr<TestPrerender> prerender = PrerenderTestURL( |
2555 "/prerender/prerender_page.html", FINAL_STATUS_CANCELLED, 1); | 2558 "/prerender/prerender_page.html", FINAL_STATUS_CANCELLED, 1); |
(...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3815 browser()->tab_strip_model()->GetActiveWebContents(); | 3818 browser()->tab_strip_model()->GetActiveWebContents(); |
3816 bool display_test_result = false; | 3819 bool display_test_result = false; |
3817 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, | 3820 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, |
3818 "DidDisplayReallyPass()", | 3821 "DidDisplayReallyPass()", |
3819 &display_test_result)); | 3822 &display_test_result)); |
3820 ASSERT_TRUE(display_test_result); | 3823 ASSERT_TRUE(display_test_result); |
3821 } | 3824 } |
3822 #endif // !defined(DISABLE_NACL) | 3825 #endif // !defined(DISABLE_NACL) |
3823 | 3826 |
3824 } // namespace prerender | 3827 } // namespace prerender |
OLD | NEW |