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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 new BrowsingDataRemover(browser->profile(), |
104 BrowsingDataRemover::EVERYTHING, | 104 BrowsingDataRemover::EVERYTHING, |
105 base::Time()); | 105 base::Time::Now()); |
106 remover->Remove(remove_mask, BrowsingDataHelper::UNPROTECTED_WEB); | 106 remover->Remove(remove_mask, BrowsingDataHelper::UNPROTECTED_WEB); |
107 // BrowsingDataRemover deletes itself. | 107 // BrowsingDataRemover deletes itself. |
108 } | 108 } |
109 | 109 |
110 void CancelAllPrerenders(PrerenderManager* prerender_manager) { | 110 void CancelAllPrerenders(PrerenderManager* prerender_manager) { |
111 prerender_manager->CancelAllPrerenders(); | 111 prerender_manager->CancelAllPrerenders(); |
112 } | 112 } |
113 | 113 |
114 // Returns true if and only if the final status is one in which the prerendered | 114 // 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. | 115 // page should prerender correctly. The page still may not be used. |
(...skipping 2270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2386 ResultCatcher catcher; | 2386 ResultCatcher catcher; |
2387 | 2387 |
2388 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); | 2388 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); |
2389 NavigateToDestURL(); | 2389 NavigateToDestURL(); |
2390 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); | 2390 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); |
2391 | 2391 |
2392 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 2392 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
2393 } | 2393 } |
2394 | 2394 |
2395 } // namespace prerender | 2395 } // namespace prerender |
OLD | NEW |