chromium/src
0
Fork 0
Code Activity

[ios] Move HTTPS Only Code to ios/chrome/browser/https_upgrades

Browse Source 
By now the bulk of the HTTPS upgrade code is under its own directory
at  ios/chrome/browser/https_upgrades. Move the test and app interface
code as well.

Bug: 1195440
Change-Id: I45f493544471b2ddff857057ee2ece605a871679
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3693928
Commit-Queue: Mustafa Emre Acer <meacer@chromium.org>
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1012614}
This commit is contained in:
Mustafa Emre Acer
2022-06-09 18:16:42 +00:00
committed by Chromium LUCI CQ
parent 9dc6319127
commit fc3d19dc90
8 changed files with 87 additions and 16 deletions

79
ios/chrome/browser/https_upgrades/BUILD.gn

@ -55,3 +55,82 @@ source_set("unit_tests") {
"//testing/gtest",
]
}
source_set("eg_test_support+eg2") {
configs += [
"//build/config/compiler:enable_arc",
"//build/config/ios:xctest_config",
]
testonly = true
sources = [
"https_only_mode_app_interface.h",
"https_only_mode_app_interface_stub.mm",
]
deps = [
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib",
]
}
source_set("eg_app_support+eg2") {
configs += [
"//build/config/compiler:enable_arc",
"//build/config/ios:xctest_config",
]
testonly = true
sources = [
"https_only_mode_app_interface.h",
"https_only_mode_app_interface.mm",
]
deps = [
":https_upgrades",
"//base",
"//components/content_settings/core/browser",
"//components/lookalikes/core",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/content_settings",
"//ios/chrome/test/app:test_support",
"//ios/components/security_interstitials/https_only_mode",
"//ios/testing/earl_grey:eg_app_support+eg2",
"//ios/third_party/earl_grey2:app_framework+link",
"//ios/web/public",
"//net",
]
}
source_set("eg2_tests") {
configs += [
"//build/config/compiler:enable_arc",
"//build/config/ios:xctest_config",
]
testonly = true
sources = [ "https_only_mode_egtest.mm" ]
deps = [
":eg_test_support+eg2",
"//components/content_settings/core/common",
"//components/security_interstitials/core",
"//ios/chrome/browser:pref_names",
"//ios/chrome/browser/metrics:eg_test_support+eg2",
"//ios/chrome/test:eg_test_support+eg2",
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
"//ios/components/security_interstitials/https_only_mode:feature",
"//ios/net:test_support",
"//ios/testing:embedded_test_server_support",
"//ios/testing/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib",
"//ios/web/common:features",
"//ios/web/public/test:element_selector",
"//ios/web/public/test/http_server",
"//net:test_support",
"//ui/base",
"//url",
]
frameworks = [ "UIKit.framework" ]
}

6
ios/chrome/browser/web/https_only_mode_app_interface.h → ios/chrome/browser/https_upgrades/https_only_mode_app_interface.h

@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_WEB_HTTPS_ONLY_MODE_APP_INTERFACE_H_
#define IOS_CHROME_BROWSER_WEB_HTTPS_ONLY_MODE_APP_INTERFACE_H_
#ifndef IOS_CHROME_BROWSER_HTTPS_UPGRADES_HTTPS_ONLY_MODE_APP_INTERFACE_H_
#define IOS_CHROME_BROWSER_HTTPS_UPGRADES_HTTPS_ONLY_MODE_APP_INTERFACE_H_
#import <Foundation/Foundation.h>
@ -17,4 +17,4 @@
@end
#endif // IOS_CHROME_BROWSER_WEB_HTTPS_ONLY_MODE_APP_INTERFACE_H_
#endif // IOS_CHROME_BROWSER_HTTPS_UPGRADES_HTTPS_ONLY_MODE_APP_INTERFACE_H_

2
ios/chrome/browser/web/https_only_mode_app_interface.mm → ios/chrome/browser/https_upgrades/https_only_mode_app_interface.mm

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#import "ios/chrome/browser/web/https_only_mode_app_interface.h"
#import "ios/chrome/browser/https_upgrades/https_only_mode_app_interface.h"
#include "base/time/time.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"

2
ios/chrome/browser/web/https_only_mode_app_interface_stub.mm → ios/chrome/browser/https_upgrades/https_only_mode_app_interface_stub.mm

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#import "ios/chrome/browser/web/https_only_mode_app_interface.h"
#import "ios/chrome/browser/https_upgrades/https_only_mode_app_interface.h"
#import <TestLib/EarlGreyImpl/EarlGrey.h>

3
ios/chrome/browser/web/https_only_mode_egtest.mm → ios/chrome/browser/https_upgrades/https_only_mode_egtest.mm

@ -13,10 +13,9 @@
#import "base/test/ios/wait_util.h"
#include "base/test/metrics/histogram_tester.h"
#include "components/security_interstitials/core/https_only_mode_metrics.h"
#include "components/strings/grit/components_strings.h"
#import "ios/chrome/browser/https_upgrades/https_only_mode_app_interface.h"
#include "ios/chrome/browser/metrics/metrics_app_interface.h"
#include "ios/chrome/browser/pref_names.h"
#import "ios/chrome/browser/web/https_only_mode_app_interface.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h"

9
ios/chrome/browser/web/BUILD.gn

@ -343,8 +343,6 @@ source_set("eg_test_support+eg2") {
testonly = true
sources = [
"https_only_mode_app_interface.h",
"https_only_mode_app_interface_stub.mm",
"lookalike_url_app_interface.h",
"lookalike_url_app_interface_stub.mm",
"progress_indicator_app_interface.h",
@ -365,8 +363,6 @@ source_set("eg_app_support+eg2") {
testonly = true
sources = [
"https_only_mode_app_interface.h",
"https_only_mode_app_interface.mm",
"lookalike_url_app_interface.h",
"lookalike_url_app_interface.mm",
"progress_indicator_app_interface.h",
@ -379,10 +375,7 @@ source_set("eg_app_support+eg2") {
"//components/content_settings/core/browser",
"//components/lookalikes/core",
"//ios/chrome/browser/browser_state",
"//ios/chrome/browser/content_settings",
"//ios/chrome/browser/https_upgrades",
"//ios/chrome/test/app:test_support",
"//ios/components/security_interstitials/https_only_mode",
"//ios/components/security_interstitials/lookalikes",
"//ios/testing/earl_grey:eg_app_support+eg2",
"//ios/third_party/earl_grey2:app_framework+link",
@ -408,7 +401,6 @@ source_set("eg2_tests") {
"error_page_egtest.mm",
"forms_egtest.mm",
"http_auth_egtest.mm",
"https_only_mode_egtest.mm",
"js_print_egtest.mm",
"lookalike_url_egtest.mm",
"navigation_egtest.mm",
@ -443,7 +435,6 @@ source_set("eg2_tests") {
"//ios/chrome/browser/web:feature_flags",
"//ios/chrome/test:eg_test_support+eg2",
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
"//ios/components/security_interstitials/https_only_mode:feature",
"//ios/net:test_support",
"//ios/testing:embedded_test_server_support",
"//ios/testing/earl_grey:eg_test_support+eg2",

1
ios/chrome/test/earl_grey/BUILD.gn

@ -86,6 +86,7 @@ source_set("eg_app_support+eg2") {
"//ios/chrome/browser/device_sharing:eg_app_support+eg2",
"//ios/chrome/browser/feature_engagement:eg_app_support+eg2",
"//ios/chrome/browser/find_in_page",
"//ios/chrome/browser/https_upgrades:eg_app_support+eg2",
"//ios/chrome/browser/metrics:eg_app_support+eg2",
"//ios/chrome/browser/ntp:features",
"//ios/chrome/browser/optimization_guide:eg_app_support+eg2",

1
ios/chrome/test/earl_grey2/BUILD.gn

@ -76,6 +76,7 @@ chrome_ios_eg2_test("ios_chrome_integration_eg2tests_module") {
"//ios/chrome/browser/autofill:eg2_tests",
"//ios/chrome/browser/device_sharing:eg2_tests",
"//ios/chrome/browser/feature_engagement:eg2_tests",
"//ios/chrome/browser/https_upgrades:eg2_tests",
"//ios/chrome/browser/metrics:eg2_tests",
"//ios/chrome/browser/net:eg2_tests",
"//ios/chrome/browser/ntp_tiles:eg2_tests",