Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Unified Diff: ios/chrome/browser/ssl/ios_ssl_error_handler_unittest.mm

Issue 2522943003: [iOS/ARC] Fix a violation of ODR in base::BindBlock under ARC. (Closed)
Patch Set: Use EXPECT_NSEQ instead of EXPECT_EQ/EXPECT_TRUE. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/ssl/ios_ssl_error_handler_unittest.mm
diff --git a/ios/chrome/browser/ssl/ios_ssl_error_handler_unittest.mm b/ios/chrome/browser/ssl/ios_ssl_error_handler_unittest.mm
index 77e807bd321e06726e1aba6c527b6295a47cd7b2..2114a1eea468c4ff9e77b8afc177198200d45c16 100644
--- a/ios/chrome/browser/ssl/ios_ssl_error_handler_unittest.mm
+++ b/ios/chrome/browser/ssl/ios_ssl_error_handler_unittest.mm
@@ -55,7 +55,7 @@ TEST_F(IOSSSLErrorHandlerTest, NonOverridable) {
__block bool do_not_proceed_callback_called = false;
IOSSSLErrorHandler::HandleSSLError(
web_state(), net::ERR_CERT_AUTHORITY_INVALID, ssl_info, url, false,
- base::BindBlock(^(bool proceed) {
+ base::BindBlockArc(^(bool proceed) {
EXPECT_FALSE(proceed);
do_not_proceed_callback_called = true;
}));
@@ -79,7 +79,7 @@ TEST_F(IOSSSLErrorHandlerTest, DISABLED_OverridableProceed) {
__block bool proceed_callback_called = false;
IOSSSLErrorHandler::HandleSSLError(
web_state(), net::ERR_CERT_AUTHORITY_INVALID, ssl_info, url, true,
- base::BindBlock(^(bool proceed) {
+ base::BindBlockArc(^(bool proceed) {
EXPECT_TRUE(proceed);
proceed_callback_called = true;
}));
@@ -102,7 +102,7 @@ TEST_F(IOSSSLErrorHandlerTest, OverridableDontProceed) {
__block bool do_not_proceed_callback_called = false;
IOSSSLErrorHandler::HandleSSLError(
web_state(), net::ERR_CERT_AUTHORITY_INVALID, ssl_info, url, true,
- base::BindBlock(^(bool proceed) {
+ base::BindBlockArc(^(bool proceed) {
EXPECT_FALSE(proceed);
do_not_proceed_callback_called = true;
}));

Powered by Google App Engine
This is Rietveld 408576698