| 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 } | 93 } |
| 94 | 94 |
| 95 std::string CreateServerRedirect(const std::string& dest_url) { | 95 std::string CreateServerRedirect(const std::string& dest_url) { |
| 96 const char* const kServerRedirectBase = "server-redirect?"; | 96 const char* const kServerRedirectBase = "server-redirect?"; |
| 97 return kServerRedirectBase + dest_url; | 97 return kServerRedirectBase + dest_url; |
| 98 } | 98 } |
| 99 | 99 |
| 100 // Clears the specified data using BrowsingDataRemover. | 100 // Clears the specified data using BrowsingDataRemover. |
| 101 void ClearBrowsingData(Browser* browser, int remove_mask) { | 101 void ClearBrowsingData(Browser* browser, int remove_mask) { |
| 102 BrowsingDataRemover* remover = | 102 BrowsingDataRemover* remover = |
| 103 new BrowsingDataRemover(browser->profile(), | 103 BrowsingDataRemover::CreateForUnboundedRange(browser->profile()); |
| 104 BrowsingDataRemover::EVERYTHING, | |
| 105 base::Time::Now()); | |
| 106 remover->Remove(remove_mask, BrowsingDataHelper::UNPROTECTED_WEB); | 104 remover->Remove(remove_mask, BrowsingDataHelper::UNPROTECTED_WEB); |
| 107 // BrowsingDataRemover deletes itself. | 105 // BrowsingDataRemover deletes itself. |
| 108 } | 106 } |
| 109 | 107 |
| 110 void CancelAllPrerenders(PrerenderManager* prerender_manager) { | 108 void CancelAllPrerenders(PrerenderManager* prerender_manager) { |
| 111 prerender_manager->CancelAllPrerenders(); | 109 prerender_manager->CancelAllPrerenders(); |
| 112 } | 110 } |
| 113 | 111 |
| 114 // Returns true if and only if the final status is one in which the prerendered | 112 // Returns true if and only if the final status is one in which the prerendered |
| 115 // page should prerender correctly. The page still may not be used. | 113 // page should prerender correctly. The page still may not be used. |
| (...skipping 2284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2400 ResultCatcher catcher; | 2398 ResultCatcher catcher; |
| 2401 | 2399 |
| 2402 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); | 2400 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); |
| 2403 NavigateToDestURL(); | 2401 NavigateToDestURL(); |
| 2404 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); | 2402 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); |
| 2405 | 2403 |
| 2406 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 2404 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 2407 } | 2405 } |
| 2408 | 2406 |
| 2409 } // namespace prerender | 2407 } // namespace prerender |
| OLD | NEW |