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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 std::string CreateServerRedirect(const std::string& dest_url) { | 224 std::string CreateServerRedirect(const std::string& dest_url) { |
225 const char* const kServerRedirectBase = "/server-redirect?"; | 225 const char* const kServerRedirectBase = "/server-redirect?"; |
226 return kServerRedirectBase + net::EscapeQueryParamValue(dest_url, false); | 226 return kServerRedirectBase + net::EscapeQueryParamValue(dest_url, false); |
227 } | 227 } |
228 | 228 |
229 // Clears the specified data using BrowsingDataRemover. | 229 // Clears the specified data using BrowsingDataRemover. |
230 void ClearBrowsingData(Browser* browser, int remove_mask) { | 230 void ClearBrowsingData(Browser* browser, int remove_mask) { |
231 BrowsingDataRemover* remover = | 231 BrowsingDataRemover* remover = |
232 BrowsingDataRemoverFactory::GetForBrowserContext(browser->profile()); | 232 BrowsingDataRemoverFactory::GetForBrowserContext(browser->profile()); |
233 BrowsingDataRemoverCompletionObserver observer(remover); | 233 BrowsingDataRemoverCompletionObserver observer(remover); |
234 remover->Remove(BrowsingDataRemover::Unbounded(), remove_mask, | 234 remover->RemoveAndReply(BrowsingDataRemover::Unbounded(), remove_mask, |
235 BrowsingDataHelper::UNPROTECTED_WEB); | 235 BrowsingDataHelper::UNPROTECTED_WEB, &observer); |
236 observer.BlockUntilCompletion(); | 236 observer.BlockUntilCompletion(); |
237 // BrowsingDataRemover deletes itself. | 237 // BrowsingDataRemover deletes itself. |
238 } | 238 } |
239 | 239 |
240 // Returns true if the prerender is expected to abort on its own, before | 240 // Returns true if the prerender is expected to abort on its own, before |
241 // attempting to swap it. | 241 // attempting to swap it. |
242 bool ShouldAbortPrerenderBeforeSwap(FinalStatus status) { | 242 bool ShouldAbortPrerenderBeforeSwap(FinalStatus status) { |
243 switch (status) { | 243 switch (status) { |
244 case FINAL_STATUS_USED: | 244 case FINAL_STATUS_USED: |
245 case FINAL_STATUS_WINDOW_OPENER: | 245 case FINAL_STATUS_WINDOW_OPENER: |
(...skipping 3728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3974 browser()->tab_strip_model()->GetActiveWebContents(); | 3974 browser()->tab_strip_model()->GetActiveWebContents(); |
3975 bool display_test_result = false; | 3975 bool display_test_result = false; |
3976 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, | 3976 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, |
3977 "DidDisplayReallyPass()", | 3977 "DidDisplayReallyPass()", |
3978 &display_test_result)); | 3978 &display_test_result)); |
3979 ASSERT_TRUE(display_test_result); | 3979 ASSERT_TRUE(display_test_result); |
3980 } | 3980 } |
3981 #endif // !defined(DISABLE_NACL) | 3981 #endif // !defined(DISABLE_NACL) |
3982 | 3982 |
3983 } // namespace prerender | 3983 } // namespace prerender |
OLD | NEW |