Commit f80ff966 authored by Eric Roman's avatar Eric Roman Committed by Commit Bot

Remove unused ProxyInfo::did_use_pac_script.

Change-Id: Ie62002a6a2f1e16a19ea58230b4b951b439eb65d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2161969
Commit-Queue: Matt Mueller <mattm@chromium.org>
Auto-Submit: Eric Roman <eroman@chromium.org>
Reviewed-by: default avatarMatt Mueller <mattm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#761984}
parent cdd68625
...@@ -97,7 +97,6 @@ int ConfiguredProxyResolutionRequest::QueryDidComplete(int result_code) { ...@@ -97,7 +97,6 @@ int ConfiguredProxyResolutionRequest::QueryDidComplete(int result_code) {
// Make a note in the results which configuration was in use at the // Make a note in the results which configuration was in use at the
// time of the resolve. // time of the resolve.
results_->set_did_use_pac_script(true);
results_->set_proxy_resolve_start_time(creation_time_); results_->set_proxy_resolve_start_time(creation_time_);
results_->set_proxy_resolve_end_time(base::TimeTicks::Now()); results_->set_proxy_resolve_end_time(base::TimeTicks::Now());
......
...@@ -932,7 +932,6 @@ TEST_F(ConfiguredProxyResolutionServiceTest, PAC) { ...@@ -932,7 +932,6 @@ TEST_F(ConfiguredProxyResolutionServiceTest, PAC) {
EXPECT_THAT(callback.WaitForResult(), IsOk()); EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct()); EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy:80", info.proxy_server().ToURI()); EXPECT_EQ("foopy:80", info.proxy_server().ToURI());
EXPECT_TRUE(info.did_use_pac_script());
EXPECT_FALSE(info.proxy_resolve_start_time().is_null()); EXPECT_FALSE(info.proxy_resolve_start_time().is_null());
EXPECT_FALSE(info.proxy_resolve_end_time().is_null()); EXPECT_FALSE(info.proxy_resolve_end_time().is_null());
...@@ -1026,7 +1025,6 @@ TEST_F(ConfiguredProxyResolutionServiceTest, PAC_FailoverWithoutDirect) { ...@@ -1026,7 +1025,6 @@ TEST_F(ConfiguredProxyResolutionServiceTest, PAC_FailoverWithoutDirect) {
EXPECT_THAT(callback1.WaitForResult(), IsOk()); EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct()); EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy:8080", info.proxy_server().ToURI()); EXPECT_EQ("foopy:8080", info.proxy_server().ToURI());
EXPECT_TRUE(info.did_use_pac_script());
EXPECT_FALSE(info.proxy_resolve_start_time().is_null()); EXPECT_FALSE(info.proxy_resolve_start_time().is_null());
EXPECT_FALSE(info.proxy_resolve_end_time().is_null()); EXPECT_FALSE(info.proxy_resolve_end_time().is_null());
...@@ -1077,7 +1075,6 @@ TEST_F(ConfiguredProxyResolutionServiceTest, PAC_RuntimeError) { ...@@ -1077,7 +1075,6 @@ TEST_F(ConfiguredProxyResolutionServiceTest, PAC_RuntimeError) {
// Since the PAC script was non-mandatory, we should have fallen-back to // Since the PAC script was non-mandatory, we should have fallen-back to
// DIRECT. // DIRECT.
EXPECT_TRUE(info.is_direct()); EXPECT_TRUE(info.is_direct());
EXPECT_TRUE(info.did_use_pac_script());
EXPECT_FALSE(info.proxy_resolve_start_time().is_null()); EXPECT_FALSE(info.proxy_resolve_start_time().is_null());
EXPECT_FALSE(info.proxy_resolve_end_time().is_null()); EXPECT_FALSE(info.proxy_resolve_end_time().is_null());
...@@ -1189,7 +1186,6 @@ TEST_F(ConfiguredProxyResolutionServiceTest, PAC_ConfigSourcePropagates) { ...@@ -1189,7 +1186,6 @@ TEST_F(ConfiguredProxyResolutionServiceTest, PAC_ConfigSourcePropagates) {
EXPECT_THAT(callback.WaitForResult(), IsOk()); EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_EQ(MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS), EXPECT_EQ(MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS),
info.traffic_annotation()); info.traffic_annotation());
EXPECT_TRUE(info.did_use_pac_script());
EXPECT_FALSE(info.proxy_resolve_start_time().is_null()); EXPECT_FALSE(info.proxy_resolve_start_time().is_null());
EXPECT_FALSE(info.proxy_resolve_end_time().is_null()); EXPECT_FALSE(info.proxy_resolve_end_time().is_null());
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
namespace net { namespace net {
ProxyInfo::ProxyInfo() : did_bypass_proxy_(false), did_use_pac_script_(false) {} ProxyInfo::ProxyInfo() : did_bypass_proxy_(false) {}
ProxyInfo::ProxyInfo(const ProxyInfo& other) = default; ProxyInfo::ProxyInfo(const ProxyInfo& other) = default;
...@@ -21,7 +21,6 @@ void ProxyInfo::Use(const ProxyInfo& other) { ...@@ -21,7 +21,6 @@ void ProxyInfo::Use(const ProxyInfo& other) {
proxy_retry_info_ = other.proxy_retry_info_; proxy_retry_info_ = other.proxy_retry_info_;
traffic_annotation_ = other.traffic_annotation_; traffic_annotation_ = other.traffic_annotation_;
did_bypass_proxy_ = other.did_bypass_proxy_; did_bypass_proxy_ = other.did_bypass_proxy_;
did_use_pac_script_ = other.did_use_pac_script_;
} }
void ProxyInfo::UseDirect() { void ProxyInfo::UseDirect() {
...@@ -87,7 +86,6 @@ void ProxyInfo::Reset() { ...@@ -87,7 +86,6 @@ void ProxyInfo::Reset() {
proxy_retry_info_.clear(); proxy_retry_info_.clear();
traffic_annotation_.reset(); traffic_annotation_.reset();
did_bypass_proxy_ = false; did_bypass_proxy_ = false;
did_use_pac_script_ = false;
} }
} // namespace net } // namespace net
...@@ -122,15 +122,6 @@ class NET_EXPORT ProxyInfo { ...@@ -122,15 +122,6 @@ class NET_EXPORT ProxyInfo {
return did_bypass_proxy_; return did_bypass_proxy_;
} }
void set_did_use_pac_script(bool did_use_pac_script) {
did_use_pac_script_ = did_use_pac_script;
}
// Returns true if the proxy resolution was done using a PAC script.
bool did_use_pac_script() const {
return did_use_pac_script_;
}
// Returns the first valid proxy server. is_empty() must be false to be able // Returns the first valid proxy server. is_empty() must be false to be able
// to call this function. // to call this function.
const ProxyServer& proxy_server() const { return proxy_list_.Get(); } const ProxyServer& proxy_server() const { return proxy_list_.Get(); }
...@@ -210,9 +201,6 @@ class NET_EXPORT ProxyInfo { ...@@ -210,9 +201,6 @@ class NET_EXPORT ProxyInfo {
// Whether the proxy result represent a proxy bypass. // Whether the proxy result represent a proxy bypass.
bool did_bypass_proxy_; bool did_bypass_proxy_;
// Whether we used a PAC script for resolving the proxy.
bool did_use_pac_script_;
// How long it took to resolve the proxy. Times are both null if proxy was // How long it took to resolve the proxy. Times are both null if proxy was
// determined synchronously without running a PAC. // determined synchronously without running a PAC.
base::TimeTicks proxy_resolve_start_time_; base::TimeTicks proxy_resolve_start_time_;
......
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