Commit cf9a8ebf authored by Eric Noyau's avatar Eric Noyau Committed by Commit Bot

Removing webpage replay obsolete flags

Bug: None
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I20f55719c1f8ab5bf29af553eac25a5978098519
Reviewed-on: https://chromium-review.googlesource.com/1043966Reviewed-by: default avatarMoe Ahmadi <mahmadi@chromium.org>
Commit-Queue: Eric Noyau <noyau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556248}
parent 109dbccc
...@@ -312,20 +312,6 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { ...@@ -312,20 +312,6 @@ const flags_ui::FeatureEntry kFeatureEntries[] = {
void AppendSwitchesFromExperimentalSettings(base::CommandLine* command_line) { void AppendSwitchesFromExperimentalSettings(base::CommandLine* command_line) {
NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
// Web page replay flags.
BOOL webPageReplayEnabled = [defaults boolForKey:@"WebPageReplayEnabled"];
NSString* webPageReplayProxy =
[defaults stringForKey:@"WebPageReplayProxyAddress"];
if (webPageReplayEnabled && [webPageReplayProxy length]) {
command_line->AppendSwitch(switches::kIOSIgnoreCertificateErrors);
// 80 and 443 are the default ports from web page replay.
command_line->AppendSwitchASCII(switches::kIOSTestingFixedHttpPort, "80");
command_line->AppendSwitchASCII(switches::kIOSTestingFixedHttpsPort, "443");
command_line->AppendSwitchASCII(
switches::kIOSHostResolverRules,
"MAP * " + base::SysNSStringToUTF8(webPageReplayProxy));
}
// Set the UA flag if UseMobileSafariUA is enabled. // Set the UA flag if UseMobileSafariUA is enabled.
if ([defaults boolForKey:@"UseMobileSafariUA"]) { if ([defaults boolForKey:@"UseMobileSafariUA"]) {
// Safari uses "Vesion/", followed by the OS version excluding bugfix, where // Safari uses "Vesion/", followed by the OS version excluding bugfix, where
......
...@@ -36,14 +36,4 @@ const char kEnableThirdPartyKeyboardWorkaround[] = ...@@ -36,14 +36,4 @@ const char kEnableThirdPartyKeyboardWorkaround[] =
// A string used to override the default user agent with a custom one. // A string used to override the default user agent with a custom one.
const char kUserAgent[] = "user-agent"; const char kUserAgent[] = "user-agent";
// These mappings only apply to the host resolver.
const char kIOSHostResolverRules[] = "host-resolver-rules";
// Ignores certificate-related errors.
const char kIOSIgnoreCertificateErrors[] = "ignore-certificate-errors";
// Allows for forcing socket connections to http/https to use fixed ports.
const char kIOSTestingFixedHttpPort[] = "testing-fixed-http-port";
const char kIOSTestingFixedHttpsPort[] = "testing-fixed-https-port";
} // namespace switches } // namespace switches
...@@ -20,11 +20,6 @@ extern const char kEnableThirdPartyKeyboardWorkaround[]; ...@@ -20,11 +20,6 @@ extern const char kEnableThirdPartyKeyboardWorkaround[];
extern const char kUserAgent[]; extern const char kUserAgent[];
extern const char kIOSHostResolverRules[];
extern const char kIOSIgnoreCertificateErrors[];
extern const char kIOSTestingFixedHttpPort[];
extern const char kIOSTestingFixedHttpsPort[];
} // namespace switches } // namespace switches
#endif // IOS_CHROME_BROWSER_CHROME_SWITCHES_H_ #endif // IOS_CHROME_BROWSER_CHROME_SWITCHES_H_
...@@ -182,34 +182,6 @@ ...@@ -182,34 +182,6 @@
<key>AutocorrectionType</key> <key>AutocorrectionType</key>
<string>No</string> <string>No</string>
</dict> </dict>
<dict>
<key>Type</key>
<string>PSGroupSpecifier</string>
<key>Title</key>
<string>Web Page Replay Settings</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Enable Web Page Replay</string>
<key>Key</key>
<string>WebPageReplayEnabled</string>
<key>DefaultValue</key>
<false/>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>Title</key>
<string>Proxy Server</string>
<key>Key</key>
<string>WebPageReplayProxyAddress</string>
<key>DefaultValue</key>
<string></string>
<key>KeyboardType</key>
<string>URL</string>
</dict>
<dict> <dict>
<key>Type</key> <key>Type</key>
<string>PSGroupSpecifier</string> <string>PSGroupSpecifier</string>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment