| 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 #import <XCTest/XCTest.h> | 5 #import <XCTest/XCTest.h> |
| 6 #include <map> | 6 #include <map> |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/ios/ios_util.h" | 10 #include "base/ios/ios_util.h" |
| 11 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
| 12 #include "base/strings/sys_string_conversions.h" | 12 #include "base/strings/sys_string_conversions.h" |
| 13 #include "components/content_settings/core/browser/host_content_settings_map.h" | 13 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 14 #include "components/content_settings/core/common/content_settings.h" | 14 #include "components/content_settings/core/common/content_settings.h" |
| 15 #include "ios/chrome/browser/content_settings/host_content_settings_map_factory.
h" | 15 #include "ios/chrome/browser/content_settings/host_content_settings_map_factory.
h" |
| 16 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h" | 16 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h" |
| 17 #include "ios/chrome/browser/ui/commands/ios_command_ids.h" | 17 #include "ios/chrome/browser/ui/commands/ios_command_ids.h" |
| 18 #include "ios/chrome/browser/ui/ui_util.h" | 18 #include "ios/chrome/browser/ui/ui_util.h" |
| 19 #include "ios/chrome/grit/ios_strings.h" | 19 #include "ios/chrome/grit/ios_strings.h" |
| 20 #import "ios/chrome/test/app/chrome_test_util.h" | 20 #import "ios/chrome/test/app/chrome_test_util.h" |
| 21 #include "ios/chrome/test/app/navigation_test_util.h" | 21 #include "ios/chrome/test/app/navigation_test_util.h" |
| 22 #include "ios/chrome/test/app/web_view_interaction_test_util.h" | 22 #include "ios/chrome/test/app/web_view_interaction_test_util.h" |
| 23 #import "ios/chrome/test/earl_grey/chrome_assertions.h" | 23 #import "ios/chrome/test/earl_grey/chrome_assertions.h" |
| 24 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h" | 24 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h" |
| 25 #import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h" | 25 #import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h" |
| 26 #import "ios/chrome/test/earl_grey/chrome_matchers.h" | 26 #import "ios/chrome/test/earl_grey/chrome_matchers.h" |
| 27 #import "ios/chrome/test/earl_grey/chrome_test_case.h" | 27 #import "ios/chrome/test/earl_grey/chrome_test_case.h" |
| 28 #import "ios/testing/earl_grey/disabled_test_macros.h" | |
| 29 #import "ios/testing/wait_util.h" | 28 #import "ios/testing/wait_util.h" |
| 30 #import "ios/web/public/test/earl_grey/web_view_actions.h" | 29 #import "ios/web/public/test/earl_grey/web_view_actions.h" |
| 31 #import "ios/web/public/test/earl_grey/web_view_matchers.h" | 30 #import "ios/web/public/test/earl_grey/web_view_matchers.h" |
| 32 #import "ios/web/public/test/http_server.h" | 31 #import "ios/web/public/test/http_server.h" |
| 33 #include "ios/web/public/test/http_server_util.h" | 32 #include "ios/web/public/test/http_server_util.h" |
| 34 #include "ios/web/public/test/response_providers/data_response_provider.h" | 33 #include "ios/web/public/test/response_providers/data_response_provider.h" |
| 35 #include "net/http/http_response_headers.h" | 34 #include "net/http/http_response_headers.h" |
| 36 #include "ui/base/l10n/l10n_util.h" | 35 #include "ui/base/l10n/l10n_util.h" |
| 37 #include "url/gurl.h" | 36 #include "url/gurl.h" |
| 38 | 37 |
| (...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 662 [[EarlGrey selectElementWithMatcher:OmniboxText(destinationURL.GetContent())] | 661 [[EarlGrey selectElementWithMatcher:OmniboxText(destinationURL.GetContent())] |
| 663 assertWithMatcher:grey_notNil()]; | 662 assertWithMatcher:grey_notNil()]; |
| 664 | 663 |
| 665 // Go back and verify that the browser navigates to the original URL. | 664 // Go back and verify that the browser navigates to the original URL. |
| 666 [self goBack]; | 665 [self goBack]; |
| 667 [[EarlGrey selectElementWithMatcher:OmniboxText(URL.GetContent())] | 666 [[EarlGrey selectElementWithMatcher:OmniboxText(URL.GetContent())] |
| 668 assertWithMatcher:grey_notNil()]; | 667 assertWithMatcher:grey_notNil()]; |
| 669 } | 668 } |
| 670 | 669 |
| 671 @end | 670 @end |
| OLD | NEW |