| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #import "ios/web/web_state/ui/crw_web_controller.h" | 5 #import "ios/web/web_state/ui/crw_web_controller.h" |
| 6 | 6 |
| 7 #import <WebKit/WebKit.h> | 7 #import <WebKit/WebKit.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 requestURL: | 144 requestURL: |
| 145 completionHandler:)) { | 145 completionHandler:)) { |
| 146 return YES; | 146 return YES; |
| 147 } | 147 } |
| 148 return [super respondsToSelector:selector]; | 148 return [super respondsToSelector:selector]; |
| 149 } | 149 } |
| 150 @end | 150 @end |
| 151 | 151 |
| 152 @implementation MockInteractionLoader { | 152 @implementation MockInteractionLoader { |
| 153 // Backs up the property with the same name. | 153 // Backs up the property with the same name. |
| 154 scoped_ptr<web::BlockedPopupInfo> _blockedPopupInfo; | 154 std::unique_ptr<web::BlockedPopupInfo> _blockedPopupInfo; |
| 155 } | 155 } |
| 156 @synthesize popupURL = _popupURL; | 156 @synthesize popupURL = _popupURL; |
| 157 @synthesize sourceURL = _sourceURL; | 157 @synthesize sourceURL = _sourceURL; |
| 158 @synthesize blockPopups = _blockPopups; | 158 @synthesize blockPopups = _blockPopups; |
| 159 @synthesize childWebController = _childWebController; | 159 @synthesize childWebController = _childWebController; |
| 160 @synthesize SSLInfo = _SSLInfo; | 160 @synthesize SSLInfo = _SSLInfo; |
| 161 @synthesize SSLStatus = _SSLStatus; | 161 @synthesize SSLStatus = _SSLStatus; |
| 162 @synthesize recoverable = _recoverable; | 162 @synthesize recoverable = _recoverable; |
| 163 @synthesize shouldContinueCallback = _shouldContinueCallback; | 163 @synthesize shouldContinueCallback = _shouldContinueCallback; |
| 164 | 164 |
| (...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 989 | 989 |
| 990 [webController_ setDelegate:delegate]; | 990 [webController_ setDelegate:delegate]; |
| 991 web::SimulateWKWebViewCrash(webView_); | 991 web::SimulateWKWebViewCrash(webView_); |
| 992 | 992 |
| 993 EXPECT_OCMOCK_VERIFY(delegate); | 993 EXPECT_OCMOCK_VERIFY(delegate); |
| 994 EXPECT_FALSE([webController_ isViewAlive]); | 994 EXPECT_FALSE([webController_ isViewAlive]); |
| 995 [webController_ setDelegate:nil]; | 995 [webController_ setDelegate:nil]; |
| 996 }; | 996 }; |
| 997 | 997 |
| 998 } // namespace | 998 } // namespace |
| OLD | NEW |