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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 std::string CreateServerRedirect(const std::string& dest_url) { | 222 std::string CreateServerRedirect(const std::string& dest_url) { |
223 const char* const kServerRedirectBase = "/server-redirect?"; | 223 const char* const kServerRedirectBase = "/server-redirect?"; |
224 return kServerRedirectBase + net::EscapeQueryParamValue(dest_url, false); | 224 return kServerRedirectBase + net::EscapeQueryParamValue(dest_url, false); |
225 } | 225 } |
226 | 226 |
227 // Clears the specified data using BrowsingDataRemover. | 227 // Clears the specified data using BrowsingDataRemover. |
228 void ClearBrowsingData(Browser* browser, int remove_mask) { | 228 void ClearBrowsingData(Browser* browser, int remove_mask) { |
229 BrowsingDataRemover* remover = | 229 BrowsingDataRemover* remover = |
230 BrowsingDataRemoverFactory::GetForBrowserContext(browser->profile()); | 230 BrowsingDataRemoverFactory::GetForBrowserContext(browser->profile()); |
231 BrowsingDataRemoverCompletionObserver observer(remover); | 231 BrowsingDataRemoverCompletionObserver observer(remover); |
232 remover->RemoveAndReply(BrowsingDataRemover::Unbounded(), remove_mask, | 232 remover->RemoveAndReply(base::Time(), base::Time::Max(), remove_mask, |
233 BrowsingDataHelper::UNPROTECTED_WEB, &observer); | 233 BrowsingDataHelper::UNPROTECTED_WEB, &observer); |
234 observer.BlockUntilCompletion(); | 234 observer.BlockUntilCompletion(); |
235 // BrowsingDataRemover deletes itself. | 235 // BrowsingDataRemover deletes itself. |
236 } | 236 } |
237 | 237 |
238 // Returns true if the prerender is expected to abort on its own, before | 238 // Returns true if the prerender is expected to abort on its own, before |
239 // attempting to swap it. | 239 // attempting to swap it. |
240 bool ShouldAbortPrerenderBeforeSwap(FinalStatus status) { | 240 bool ShouldAbortPrerenderBeforeSwap(FinalStatus status) { |
241 switch (status) { | 241 switch (status) { |
242 case FINAL_STATUS_USED: | 242 case FINAL_STATUS_USED: |
(...skipping 3088 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3331 browser()->tab_strip_model()->GetActiveWebContents(); | 3331 browser()->tab_strip_model()->GetActiveWebContents(); |
3332 bool display_test_result = false; | 3332 bool display_test_result = false; |
3333 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, | 3333 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, |
3334 "DidDisplayReallyPass()", | 3334 "DidDisplayReallyPass()", |
3335 &display_test_result)); | 3335 &display_test_result)); |
3336 ASSERT_TRUE(display_test_result); | 3336 ASSERT_TRUE(display_test_result); |
3337 } | 3337 } |
3338 #endif // !defined(DISABLE_NACL) | 3338 #endif // !defined(DISABLE_NACL) |
3339 | 3339 |
3340 } // namespace prerender | 3340 } // namespace prerender |
OLD | NEW |