| 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 <deque> | 5 #include <deque> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
| 11 #include "base/test/test_timeouts.h" | 11 #include "base/test/test_timeouts.h" |
| 12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 13 #include "base/values.h" | 13 #include "base/values.h" |
| 14 #include "chrome/browser/browsing_data_helper.h" |
| 14 #include "chrome/browser/browsing_data_remover.h" | 15 #include "chrome/browser/browsing_data_remover.h" |
| 15 #include "chrome/browser/content_settings/host_content_settings_map.h" | 16 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 16 #include "chrome/browser/favicon/favicon_tab_helper.h" | 17 #include "chrome/browser/favicon/favicon_tab_helper.h" |
| 17 #include "chrome/browser/prefs/pref_service.h" | 18 #include "chrome/browser/prefs/pref_service.h" |
| 18 #include "chrome/browser/prerender/prerender_contents.h" | 19 #include "chrome/browser/prerender/prerender_contents.h" |
| 19 #include "chrome/browser/prerender/prerender_link_manager.h" | 20 #include "chrome/browser/prerender/prerender_link_manager.h" |
| 20 #include "chrome/browser/prerender/prerender_link_manager_factory.h" | 21 #include "chrome/browser/prerender/prerender_link_manager_factory.h" |
| 21 #include "chrome/browser/prerender/prerender_manager.h" | 22 #include "chrome/browser/prerender/prerender_manager.h" |
| 22 #include "chrome/browser/prerender/prerender_manager_factory.h" | 23 #include "chrome/browser/prerender/prerender_manager_factory.h" |
| 23 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 const char* const kServerRedirectBase = "server-redirect?"; | 87 const char* const kServerRedirectBase = "server-redirect?"; |
| 87 return kServerRedirectBase + dest_url; | 88 return kServerRedirectBase + dest_url; |
| 88 } | 89 } |
| 89 | 90 |
| 90 // Clears the specified data using BrowsingDataRemover. | 91 // Clears the specified data using BrowsingDataRemover. |
| 91 void ClearBrowsingData(Browser* browser, int remove_mask) { | 92 void ClearBrowsingData(Browser* browser, int remove_mask) { |
| 92 BrowsingDataRemover* remover = | 93 BrowsingDataRemover* remover = |
| 93 new BrowsingDataRemover(browser->profile(), | 94 new BrowsingDataRemover(browser->profile(), |
| 94 BrowsingDataRemover::EVERYTHING, | 95 BrowsingDataRemover::EVERYTHING, |
| 95 base::Time()); | 96 base::Time()); |
| 96 remover->Remove(remove_mask); | 97 remover->Remove(remove_mask, BrowsingDataRemover::UNPROTECTED_WEB); |
| 97 // BrowsingDataRemover deletes itself. | 98 // BrowsingDataRemover deletes itself. |
| 98 } | 99 } |
| 99 | 100 |
| 100 void CancelAllPrerenders(PrerenderManager* prerender_manager) { | 101 void CancelAllPrerenders(PrerenderManager* prerender_manager) { |
| 101 prerender_manager->CancelAllPrerenders(); | 102 prerender_manager->CancelAllPrerenders(); |
| 102 } | 103 } |
| 103 | 104 |
| 104 // Returns true if and only if the final status is one in which the prerendered | 105 // Returns true if and only if the final status is one in which the prerendered |
| 105 // page should prerender correctly. The page still may not be used. | 106 // page should prerender correctly. The page still may not be used. |
| 106 bool ShouldRenderPrerenderedPageCorrectly(FinalStatus status) { | 107 bool ShouldRenderPrerenderedPageCorrectly(FinalStatus status) { |
| (...skipping 2137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2244 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLReferrerPolicy) { | 2245 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLReferrerPolicy) { |
| 2245 set_use_https_src(true); | 2246 set_use_https_src(true); |
| 2246 set_loader_path("files/prerender/prerender_loader_with_referrer_policy.html"); | 2247 set_loader_path("files/prerender/prerender_loader_with_referrer_policy.html"); |
| 2247 PrerenderTestURL("files/prerender/prerender_referrer_policy.html", | 2248 PrerenderTestURL("files/prerender/prerender_referrer_policy.html", |
| 2248 FINAL_STATUS_USED, | 2249 FINAL_STATUS_USED, |
| 2249 1); | 2250 1); |
| 2250 NavigateToDestURL(); | 2251 NavigateToDestURL(); |
| 2251 } | 2252 } |
| 2252 | 2253 |
| 2253 } // namespace prerender | 2254 } // namespace prerender |
| OLD | NEW |