Tidy up WebSocket-related histograms
Remove the following histograms as they are due to expire soon and have
not been very useful:
Net.WebSocket.DeflateMode
Net.WebSocket.Duration
SafeBrowsing.WebSocket.Result
Stop the Net.WebSocket.ResponseCode histogram from expiring as it is
useful.
BUG=974965,975027
Change-Id: I2cb529a89bd804c84e793e5f05cb4be0741b240d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1663466
Reviewed-by: Ilya Sherman <[email protected]>
Reviewed-by: Yutaka Hirano <[email protected]>
Reviewed-by: Varun Khaneja <[email protected]>
Commit-Queue: Adam Rice <[email protected]>
Cr-Commit-Position: refs/heads/master@{#670885}
diff --git a/net/websockets/websocket_basic_handshake_stream.cc b/net/websockets/websocket_basic_handshake_stream.cc
index 65f63e0..88f8646 100644
--- a/net/websockets/websocket_basic_handshake_stream.cc
+++ b/net/websockets/websocket_basic_handshake_stream.cc
@@ -406,15 +406,12 @@
state_.read_buf(), sub_protocol_, extensions_);
DCHECK(extension_params_.get());
if (extension_params_->deflate_enabled) {
- RecordDeflateMode(
- extension_params_->deflate_parameters.client_context_take_over_mode());
-
return std::make_unique<WebSocketDeflateStream>(
std::move(basic_stream), extension_params_->deflate_parameters,
std::make_unique<WebSocketDeflatePredictorImpl>());
- } else {
- return basic_stream;
}
+
+ return basic_stream;
}
base::WeakPtr<WebSocketHandshakeStreamBase>
diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc
index e656652..0a5408a 100644
--- a/net/websockets/websocket_channel.cc
+++ b/net/websockets/websocket_channel.cc
@@ -321,13 +321,6 @@
void WebSocketChannel::SetState(State new_state) {
DCHECK_NE(state_, new_state);
- if (new_state == CONNECTED)
- established_on_ = base::TimeTicks::Now();
- if (state_ == CONNECTED && !established_on_.is_null()) {
- UMA_HISTOGRAM_LONG_TIMES(
- "Net.WebSocket.Duration", base::TimeTicks::Now() - established_on_);
- }
-
state_ = new_state;
}
diff --git a/net/websockets/websocket_channel.h b/net/websockets/websocket_channel.h
index 24cb76534..0ca6868e 100644
--- a/net/websockets/websocket_channel.h
+++ b/net/websockets/websocket_channel.h
@@ -415,10 +415,6 @@
// message to the renderer. This can be false if the message is empty so far.
bool initial_frame_forwarded_;
- // For UMA. The time when OnConnectSuccess() method was called and |stream_|
- // was set.
- base::TimeTicks established_on_;
-
DISALLOW_COPY_AND_ASSIGN(WebSocketChannel);
};
diff --git a/net/websockets/websocket_deflater.h b/net/websockets/websocket_deflater.h
index 3aa6f24..d72c7335 100644
--- a/net/websockets/websocket_deflater.h
+++ b/net/websockets/websocket_deflater.h
@@ -23,8 +23,6 @@
class NET_EXPORT_PRIVATE WebSocketDeflater {
public:
- // Do not reorder or remove entries of this enum. The values of them are used
- // in UMA.
enum ContextTakeOverMode {
DO_NOT_TAKE_OVER_CONTEXT,
TAKE_OVER_CONTEXT,
diff --git a/net/websockets/websocket_handshake_stream_base.cc b/net/websockets/websocket_handshake_stream_base.cc
index 11d00c69..16b4db5 100644
--- a/net/websockets/websocket_handshake_stream_base.cc
+++ b/net/websockets/websocket_handshake_stream_base.cc
@@ -145,10 +145,4 @@
HandshakeResult::NUM_HANDSHAKE_RESULT_TYPES);
}
-void WebSocketHandshakeStreamBase::RecordDeflateMode(
- WebSocketDeflateParameters::ContextTakeOverMode deflate_mode) {
- UMA_HISTOGRAM_ENUMERATION("Net.WebSocket.DeflateMode", deflate_mode,
- WebSocketDeflater::NUM_CONTEXT_TAKEOVER_MODE_TYPES);
-}
-
} // namespace net
diff --git a/net/websockets/websocket_handshake_stream_base.h b/net/websockets/websocket_handshake_stream_base.h
index 860e0af..4fa19ad 100644
--- a/net/websockets/websocket_handshake_stream_base.h
+++ b/net/websockets/websocket_handshake_stream_base.h
@@ -147,8 +147,6 @@
WebSocketExtensionParams* params);
void RecordHandshakeResult(HandshakeResult result);
- void RecordDeflateMode(
- WebSocketDeflateParameters::ContextTakeOverMode deflate_mode);
private:
DISALLOW_COPY_AND_ASSIGN(WebSocketHandshakeStreamBase);
diff --git a/net/websockets/websocket_http2_handshake_stream.cc b/net/websockets/websocket_http2_handshake_stream.cc
index 055c4d5..ecd4ecc 100644
--- a/net/websockets/websocket_http2_handshake_stream.cc
+++ b/net/websockets/websocket_http2_handshake_stream.cc
@@ -246,9 +246,6 @@
if (!extension_params_->deflate_enabled)
return basic_stream;
- RecordDeflateMode(
- extension_params_->deflate_parameters.client_context_take_over_mode());
-
return std::make_unique<WebSocketDeflateStream>(
std::move(basic_stream), extension_params_->deflate_parameters,
std::make_unique<WebSocketDeflatePredictorImpl>());
