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

Side by Side Diff: ios/web/net/clients/crw_redirect_network_client.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 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ios/web/net/clients/crw_redirect_network_client.h" 5 #include "ios/web/net/clients/crw_redirect_network_client.h"
6 6
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/mac/bind_objc_block.h" 8 #include "base/mac/bind_objc_block.h"
9 #include "ios/web/public/web_thread.h" 9 #include "ios/web/public/web_thread.h"
10 10
(...skipping 20 matching lines...) Expand all
31 31
32 - (instancetype)init { 32 - (instancetype)init {
33 NOTREACHED(); 33 NOTREACHED();
34 return nil; 34 return nil;
35 } 35 }
36 36
37 - (void)wasRedirectedToRequest:(NSURLRequest*)request 37 - (void)wasRedirectedToRequest:(NSURLRequest*)request
38 nativeRequest:(net::URLRequest*)nativeRequest 38 nativeRequest:(net::URLRequest*)nativeRequest
39 redirectResponse:(NSURLResponse*)redirectResponse { 39 redirectResponse:(NSURLResponse*)redirectResponse {
40 DCHECK_CURRENTLY_ON(web::WebThread::IO); 40 DCHECK_CURRENTLY_ON(web::WebThread::IO);
41 web::WebThread::PostTask(web::WebThread::UI, FROM_HERE, base::BindBlock(^{ 41 web::WebThread::PostTask(web::WebThread::UI, FROM_HERE, base::BindBlockArc(^{
42 [_delegate 42 [_delegate
43 wasRedirectedToRequest:request 43 wasRedirectedToRequest:request
44 redirectResponse:redirectResponse]; 44 redirectResponse:redirectResponse];
45 })); 45 }));
46 [super wasRedirectedToRequest:request 46 [super wasRedirectedToRequest:request
47 nativeRequest:nativeRequest 47 nativeRequest:nativeRequest
48 redirectResponse:redirectResponse]; 48 redirectResponse:redirectResponse];
49 } 49 }
50 50
51 @end 51 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/ssl/ios_ssl_error_handler_unittest.mm ('k') | ios/web/net/crw_cert_verification_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698