| 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" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 const char* const kServerRedirectBase = "server-redirect?"; | 86 const char* const kServerRedirectBase = "server-redirect?"; |
| 87 return kServerRedirectBase + dest_url; | 87 return kServerRedirectBase + dest_url; |
| 88 } | 88 } |
| 89 | 89 |
| 90 // Clears the specified data using BrowsingDataRemover. | 90 // Clears the specified data using BrowsingDataRemover. |
| 91 void ClearBrowsingData(Browser* browser, int remove_mask) { | 91 void ClearBrowsingData(Browser* browser, int remove_mask) { |
| 92 BrowsingDataRemover* remover = | 92 BrowsingDataRemover* remover = |
| 93 new BrowsingDataRemover(browser->profile(), | 93 new BrowsingDataRemover(browser->profile(), |
| 94 BrowsingDataRemover::EVERYTHING, | 94 BrowsingDataRemover::EVERYTHING, |
| 95 base::Time()); | 95 base::Time()); |
| 96 remover->Remove(remove_mask); | 96 bool include_protected_origins = false; |
| 97 remover->Remove(remove_mask, include_protected_origins); |
| 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 2141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2248 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLReferrerPolicy) { | 2249 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLReferrerPolicy) { |
| 2249 set_use_https_src(true); | 2250 set_use_https_src(true); |
| 2250 set_loader_path("files/prerender/prerender_loader_with_referrer_policy.html"); | 2251 set_loader_path("files/prerender/prerender_loader_with_referrer_policy.html"); |
| 2251 PrerenderTestURL("files/prerender/prerender_referrer_policy.html", | 2252 PrerenderTestURL("files/prerender/prerender_referrer_policy.html", |
| 2252 FINAL_STATUS_USED, | 2253 FINAL_STATUS_USED, |
| 2253 1); | 2254 1); |
| 2254 NavigateToDestURL(); | 2255 NavigateToDestURL(); |
| 2255 } | 2256 } |
| 2256 | 2257 |
| 2257 } // namespace prerender | 2258 } // namespace prerender |
| OLD | NEW |