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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 std::string CreateServerRedirect(const std::string& dest_url) { | 228 std::string CreateServerRedirect(const std::string& dest_url) { |
229 const char* const kServerRedirectBase = "/server-redirect?"; | 229 const char* const kServerRedirectBase = "/server-redirect?"; |
230 return kServerRedirectBase + net::EscapeQueryParamValue(dest_url, false); | 230 return kServerRedirectBase + net::EscapeQueryParamValue(dest_url, false); |
231 } | 231 } |
232 | 232 |
233 // Clears the specified data using BrowsingDataRemover. | 233 // Clears the specified data using BrowsingDataRemover. |
234 void ClearBrowsingData(Browser* browser, int remove_mask) { | 234 void ClearBrowsingData(Browser* browser, int remove_mask) { |
235 BrowsingDataRemover* remover = | 235 BrowsingDataRemover* remover = |
236 BrowsingDataRemoverFactory::GetForBrowserContext(browser->profile()); | 236 BrowsingDataRemoverFactory::GetForBrowserContext(browser->profile()); |
237 BrowsingDataRemoverCompletionObserver observer(remover); | 237 BrowsingDataRemoverCompletionObserver observer(remover); |
238 remover->RemoveAndReply(BrowsingDataRemover::Unbounded(), remove_mask, | 238 remover->RemoveAndReply(base::Time(), base::Time::Max(), remove_mask, |
239 BrowsingDataHelper::UNPROTECTED_WEB, &observer); | 239 BrowsingDataHelper::UNPROTECTED_WEB, &observer); |
240 observer.BlockUntilCompletion(); | 240 observer.BlockUntilCompletion(); |
241 // BrowsingDataRemover deletes itself. | 241 // BrowsingDataRemover deletes itself. |
242 } | 242 } |
243 | 243 |
244 // Returns true if the prerender is expected to abort on its own, before | 244 // Returns true if the prerender is expected to abort on its own, before |
245 // attempting to swap it. | 245 // attempting to swap it. |
246 bool ShouldAbortPrerenderBeforeSwap(FinalStatus status) { | 246 bool ShouldAbortPrerenderBeforeSwap(FinalStatus status) { |
247 switch (status) { | 247 switch (status) { |
248 case FINAL_STATUS_USED: | 248 case FINAL_STATUS_USED: |
(...skipping 3502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3751 browser()->tab_strip_model()->GetActiveWebContents(); | 3751 browser()->tab_strip_model()->GetActiveWebContents(); |
3752 bool display_test_result = false; | 3752 bool display_test_result = false; |
3753 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, | 3753 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, |
3754 "DidDisplayReallyPass()", | 3754 "DidDisplayReallyPass()", |
3755 &display_test_result)); | 3755 &display_test_result)); |
3756 ASSERT_TRUE(display_test_result); | 3756 ASSERT_TRUE(display_test_result); |
3757 } | 3757 } |
3758 #endif // !defined(DISABLE_NACL) | 3758 #endif // !defined(DISABLE_NACL) |
3759 | 3759 |
3760 } // namespace prerender | 3760 } // namespace prerender |
OLD | NEW |