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

Side by Side Diff: ios/web/web_state/ui/crw_web_controller_unittest.mm

Issue 2090463002: Move net/base/test_data_directory.[cc,h] to net/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months 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
« no previous file with comments | « ios/web/net/request_tracker_impl_unittest.mm ('k') | net/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 18 matching lines...) Expand all
29 #import "ios/web/public/web_state/ui/crw_web_view_content_view.h" 29 #import "ios/web/public/web_state/ui/crw_web_view_content_view.h"
30 #include "ios/web/public/web_state/url_verification_constants.h" 30 #include "ios/web/public/web_state/url_verification_constants.h"
31 #import "ios/web/test/web_test_with_web_controller.h" 31 #import "ios/web/test/web_test_with_web_controller.h"
32 #import "ios/web/test/wk_web_view_crash_utils.h" 32 #import "ios/web/test/wk_web_view_crash_utils.h"
33 #include "ios/web/web_state/blocked_popup_info.h" 33 #include "ios/web/web_state/blocked_popup_info.h"
34 #import "ios/web/web_state/js/crw_js_invoke_parameter_queue.h" 34 #import "ios/web/web_state/js/crw_js_invoke_parameter_queue.h"
35 #import "ios/web/web_state/ui/crw_web_controller_container_view.h" 35 #import "ios/web/web_state/ui/crw_web_controller_container_view.h"
36 #import "ios/web/web_state/web_state_impl.h" 36 #import "ios/web/web_state/web_state_impl.h"
37 #import "ios/web/web_state/wk_web_view_security_util.h" 37 #import "ios/web/web_state/wk_web_view_security_util.h"
38 #import "net/base/mac/url_conversions.h" 38 #import "net/base/mac/url_conversions.h"
39 #include "net/base/test_data_directory.h"
40 #include "net/ssl/ssl_info.h" 39 #include "net/ssl/ssl_info.h"
41 #include "net/test/cert_test_util.h" 40 #include "net/test/cert_test_util.h"
41 #include "net/test/test_data_directory.h"
42 #include "testing/gtest/include/gtest/gtest.h" 42 #include "testing/gtest/include/gtest/gtest.h"
43 #include "testing/gtest_mac.h" 43 #include "testing/gtest_mac.h"
44 #include "third_party/ocmock/OCMock/OCMock.h" 44 #include "third_party/ocmock/OCMock/OCMock.h"
45 #include "third_party/ocmock/gtest_support.h" 45 #include "third_party/ocmock/gtest_support.h"
46 #include "third_party/ocmock/ocmock_extensions.h" 46 #include "third_party/ocmock/ocmock_extensions.h"
47 #import "ui/base/test/ios/keyboard_appearance_listener.h" 47 #import "ui/base/test/ios/keyboard_appearance_listener.h"
48 #include "ui/base/test/ios/ui_view_test_utils.h" 48 #include "ui/base/test/ios/ui_view_test_utils.h"
49 49
50 using web::NavigationManagerImpl; 50 using web::NavigationManagerImpl;
51 51
(...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after
1064 1064
1065 [web_controller() setDelegate:delegate]; 1065 [web_controller() setDelegate:delegate];
1066 web::SimulateWKWebViewCrash(webView_); 1066 web::SimulateWKWebViewCrash(webView_);
1067 1067
1068 EXPECT_OCMOCK_VERIFY(delegate); 1068 EXPECT_OCMOCK_VERIFY(delegate);
1069 EXPECT_FALSE([web_controller() isViewAlive]); 1069 EXPECT_FALSE([web_controller() isViewAlive]);
1070 [web_controller() setDelegate:nil]; 1070 [web_controller() setDelegate:nil];
1071 }; 1071 };
1072 1072
1073 } // namespace 1073 } // namespace
OLDNEW
« no previous file with comments | « ios/web/net/request_tracker_impl_unittest.mm ('k') | net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698