Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(549)

Unified Diff: net/http/http_server_properties.cc

Issue 992733002: Remove //net (except for Android test stuff) and sdch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_server_properties.h ('k') | net/http/http_server_properties_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_server_properties.cc
diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc
deleted file mode 100644
index 6b5f226cad0b185d3de64a58b61b024ad2456103..0000000000000000000000000000000000000000
--- a/net/http/http_server_properties.cc
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "net/http/http_server_properties.h"
-
-#include "base/logging.h"
-#include "base/metrics/histogram.h"
-#include "base/strings/stringprintf.h"
-#include "net/socket/ssl_client_socket.h"
-#include "net/ssl/ssl_config.h"
-
-namespace net {
-
-const char kAlternateProtocolHeader[] = "Alternate-Protocol";
-
-namespace {
-
-// The order of these strings much match the order of the enum definition
-// for AlternateProtocol.
-const char* const kAlternateProtocolStrings[] = {
- "npn-spdy/2",
- "npn-spdy/3",
- "npn-spdy/3.1",
- "npn-h2-14", // HTTP/2 draft-14. Called SPDY4 internally.
- "npn-h2-15", // HTTP/2 draft-15. Called SPDY4 internally.
- "quic"
-};
-
-static_assert(arraysize(kAlternateProtocolStrings) ==
- NUM_VALID_ALTERNATE_PROTOCOLS,
- "kAlternateProtocolStrings has incorrect size");
-
-} // namespace
-
-void HistogramAlternateProtocolUsage(AlternateProtocolUsage usage) {
- UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolUsage", usage,
- ALTERNATE_PROTOCOL_USAGE_MAX);
-}
-
-void HistogramBrokenAlternateProtocolLocation(
- BrokenAlternateProtocolLocation location){
- UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolBrokenLocation", location,
- BROKEN_ALTERNATE_PROTOCOL_LOCATION_MAX);
-}
-
-bool IsAlternateProtocolValid(AlternateProtocol protocol) {
- return protocol >= ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION &&
- protocol <= ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION;
-}
-
-const char* AlternateProtocolToString(AlternateProtocol protocol) {
- switch (protocol) {
- case DEPRECATED_NPN_SPDY_2:
- case NPN_SPDY_3:
- case NPN_SPDY_3_1:
- case NPN_SPDY_4_14:
- case NPN_SPDY_4_15:
- case QUIC:
- DCHECK(IsAlternateProtocolValid(protocol));
- return kAlternateProtocolStrings[
- protocol - ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION];
- case UNINITIALIZED_ALTERNATE_PROTOCOL:
- return "Uninitialized";
- }
- NOTREACHED();
- return "";
-}
-
-AlternateProtocol AlternateProtocolFromString(const std::string& str) {
- for (int i = ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION;
- i <= ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION; ++i) {
- AlternateProtocol protocol = static_cast<AlternateProtocol>(i);
- if (str == AlternateProtocolToString(protocol))
- return protocol;
- }
- return UNINITIALIZED_ALTERNATE_PROTOCOL;
-}
-
-AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto) {
- switch (next_proto) {
- case kProtoDeprecatedSPDY2:
- return DEPRECATED_NPN_SPDY_2;
- case kProtoSPDY3:
- return NPN_SPDY_3;
- case kProtoSPDY31:
- return NPN_SPDY_3_1;
- case kProtoSPDY4_14:
- return NPN_SPDY_4_14;
- case kProtoSPDY4_15:
- return NPN_SPDY_4_15;
- case kProtoQUIC1SPDY3:
- return QUIC;
-
- case kProtoUnknown:
- case kProtoHTTP11:
- break;
- }
-
- NOTREACHED() << "Invalid NextProto: " << next_proto;
- return UNINITIALIZED_ALTERNATE_PROTOCOL;
-}
-
-std::string AlternateProtocolInfo::ToString() const {
- return base::StringPrintf("%d:%s p=%f%s", port,
- AlternateProtocolToString(protocol),
- probability,
- is_broken ? " (broken)" : "");
-}
-
-// static
-void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) {
- ssl_config->next_protos.clear();
- ssl_config->next_protos.push_back(kProtoHTTP11);
-}
-
-} // namespace net
« no previous file with comments | « net/http/http_server_properties.h ('k') | net/http/http_server_properties_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698