| OLD | NEW |
| 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 #import "ios/web/test/web_int_test.h" | 5 #import "ios/web/test/web_int_test.h" |
| 6 | 6 |
| 7 #import "base/ios/block_types.h" | 7 #import "base/ios/block_types.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #import "base/test/ios/wait_util.h" | 9 #import "base/test/ios/wait_util.h" |
| 10 #import "ios/web/public/test/http_server.h" | 10 #import "ios/web/public/test/http_server.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 ASSERT_FALSE(server.IsRunning()); | 57 ASSERT_FALSE(server.IsRunning()); |
| 58 server.StartOrDie(); | 58 server.StartOrDie(); |
| 59 | 59 |
| 60 // Remove any previously existing WKWebView data. | 60 // Remove any previously existing WKWebView data. |
| 61 RemoveWKWebViewCreatedData([WKWebsiteDataStore defaultDataStore], | 61 RemoveWKWebViewCreatedData([WKWebsiteDataStore defaultDataStore], |
| 62 [WKWebsiteDataStore allWebsiteDataTypes]); | 62 [WKWebsiteDataStore allWebsiteDataTypes]); |
| 63 | 63 |
| 64 // Create the WebState. | 64 // Create the WebState. |
| 65 web::WebState::CreateParams web_state_create_params(GetBrowserState()); | 65 web::WebState::CreateParams web_state_create_params(GetBrowserState()); |
| 66 web_state_ = web::WebState::Create(web_state_create_params); | 66 web_state_ = web::WebState::Create(web_state_create_params); |
| 67 | |
| 68 // Resize the webview so that pages can be properly rendered. | |
| 69 web_state()->GetView().frame = | |
| 70 [UIApplication sharedApplication].keyWindow.bounds; | |
| 71 | |
| 72 // Enable web usage for the WebState. | |
| 73 web_state()->SetWebUsageEnabled(true); | 67 web_state()->SetWebUsageEnabled(true); |
| 74 | |
| 75 web_state()->SetDelegate(&web_state_delegate_); | 68 web_state()->SetDelegate(&web_state_delegate_); |
| 76 } | 69 } |
| 77 | 70 |
| 78 void WebIntTest::TearDown() { | 71 void WebIntTest::TearDown() { |
| 79 RemoveWKWebViewCreatedData([WKWebsiteDataStore defaultDataStore], | 72 RemoveWKWebViewCreatedData([WKWebsiteDataStore defaultDataStore], |
| 80 [WKWebsiteDataStore allWebsiteDataTypes]); | 73 [WKWebsiteDataStore allWebsiteDataTypes]); |
| 81 | 74 |
| 82 web::test::HttpServer& server = web::test::HttpServer::GetSharedInstance(); | 75 web::test::HttpServer& server = web::test::HttpServer::GetSharedInstance(); |
| 83 server.Stop(); | 76 server.Stop(); |
| 84 EXPECT_FALSE(server.IsRunning()); | 77 EXPECT_FALSE(server.IsRunning()); |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 NSInteger WebIntTest::GetIndexOfNavigationItem( | 138 NSInteger WebIntTest::GetIndexOfNavigationItem( |
| 146 const web::NavigationItem* item) { | 139 const web::NavigationItem* item) { |
| 147 for (NSInteger i = 0; i < navigation_manager()->GetItemCount(); ++i) { | 140 for (NSInteger i = 0; i < navigation_manager()->GetItemCount(); ++i) { |
| 148 if (navigation_manager()->GetItemAtIndex(i) == item) | 141 if (navigation_manager()->GetItemAtIndex(i) == item) |
| 149 return i; | 142 return i; |
| 150 } | 143 } |
| 151 return NSNotFound; | 144 return NSNotFound; |
| 152 } | 145 } |
| 153 | 146 |
| 154 } // namespace web | 147 } // namespace web |
| OLD | NEW |