OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "base/memory/ptr_util.h" | 5 #include "base/memory/ptr_util.h" |
6 #include "base/strings/string_number_conversions.h" | 6 #include "base/strings/string_number_conversions.h" |
7 #include "base/strings/sys_string_conversions.h" | 7 #include "base/strings/sys_string_conversions.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #import "ios/testing/wait_util.h" | 9 #import "ios/testing/wait_util.h" |
10 #import "ios/web/navigation/navigation_item_impl.h" | 10 #import "ios/web/navigation/navigation_item_impl.h" |
11 #import "ios/web/public/navigation_item.h" | 11 #import "ios/web/public/navigation_item.h" |
12 #import "ios/web/public/navigation_manager.h" | 12 #import "ios/web/public/navigation_manager.h" |
13 #import "ios/web/public/test/http_server.h" | 13 #import "ios/web/public/test/http_server/http_server.h" |
14 #include "ios/web/public/test/http_server_util.h" | 14 #include "ios/web/public/test/http_server/http_server_util.h" |
15 #import "ios/web/public/test/web_view_interaction_test_util.h" | 15 #import "ios/web/public/test/web_view_interaction_test_util.h" |
16 #import "ios/web/public/web_state/web_state.h" | 16 #import "ios/web/public/web_state/web_state.h" |
17 #import "ios/web/test/web_int_test.h" | 17 #import "ios/web/test/web_int_test.h" |
18 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
19 #include "testing/gtest_mac.h" | 19 #include "testing/gtest_mac.h" |
20 #include "url/url_canon.h" | 20 #include "url/url_canon.h" |
21 | 21 |
22 using base::ASCIIToUTF16; | 22 using base::ASCIIToUTF16; |
23 | 23 |
24 namespace { | 24 namespace { |
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
433 // Verify that url has been replaced. | 433 // Verify that url has been replaced. |
434 BOOL completed = | 434 BOOL completed = |
435 testing::WaitUntilConditionOrTimeout(kWaitForStateUpdateTimeout, ^{ | 435 testing::WaitUntilConditionOrTimeout(kWaitForStateUpdateTimeout, ^{ |
436 return GetLastCommittedItem()->GetURL() == new_url; | 436 return GetLastCommittedItem()->GetURL() == new_url; |
437 }); | 437 }); |
438 EXPECT_TRUE(completed) << "Failed to validate current url."; | 438 EXPECT_TRUE(completed) << "Failed to validate current url."; |
439 // Verify that the hashchange event was not fired. | 439 // Verify that the hashchange event was not fired. |
440 EXPECT_FALSE(static_cast<web::NavigationItemImpl*>(GetLastCommittedItem()) | 440 EXPECT_FALSE(static_cast<web::NavigationItemImpl*>(GetLastCommittedItem()) |
441 ->IsCreatedFromHashChange()); | 441 ->IsCreatedFromHashChange()); |
442 } | 442 } |
OLD | NEW |