commit 94658bfc87f7dcb2daeb277c3c290b854c93cfdd
author Bence Béky <bnc@chromium.org> Fri May 11 19:22:58 2018
committer Commit Bot <commit-bot@chromium.org> Fri May 11 19:22:58 2018
tree aaa6e7b6743a272c2aa47249c73ecc6c2b731aef
parent a1aa8b05bf97485d8d9515c6eb1954b57c83b687

Move //net/spdy/chromium to //net/spdy.

This change was made possible by https://crrev.com/c/1028984, which left
chromium as the only directory in //net/spdy.

This change is not git cl formatted, and presubmit checks are skipped
(there are pre-existing presubmit errors), because this is only a move.

NOPRESUBMIT=true

Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I670e6e7204870a78d738b7e2fe18569b6c8f0264
Reviewed-on: https://chromium-review.googlesource.com/1054470
Reviewed-by: Ryan Hamilton <rch@chromium.org>
Reviewed-by: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Mike Dougherty <michaeldo@chromium.org>
Commit-Queue: Bence Béky <bnc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557975}

ios/components/io_thread/ios_io_thread.mm

diff --git a/ios/components/io_thread/ios_io_thread.mm b/ios/components/io_thread/ios_io_thread.mm
index 9109f7b..9120cdf 100644
--- a/ios/components/io_thread/ios_io_thread.mm
+++ b/ios/components/io_thread/ios_io_thread.mm
@@ -57,7 +57,7 @@
 #include "net/proxy_resolution/proxy_config_service.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
 #include "net/socket/tcp_client_socket.h"
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/spdy_session.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/default_channel_id_store.h"
 #include "net/ssl/ssl_config_service_defaults.h"

net/BUILD.gn

diff --git a/net/BUILD.gn b/net/BUILD.gn
index 31f7288..7eb5a27aa 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1091,45 +1091,45 @@
       "socket/websocket_transport_client_socket_pool.h",
       "socket/websocket_transport_connect_sub_job.cc",
       "socket/websocket_transport_connect_sub_job.h",
-      "spdy/chromium/bidirectional_stream_spdy_impl.cc",
-      "spdy/chromium/bidirectional_stream_spdy_impl.h",
-      "spdy/chromium/buffered_spdy_framer.cc",
-      "spdy/chromium/buffered_spdy_framer.h",
-      "spdy/chromium/header_coalescer.cc",
-      "spdy/chromium/header_coalescer.h",
-      "spdy/chromium/http2_priority_dependencies.cc",
-      "spdy/chromium/http2_priority_dependencies.h",
-      "spdy/chromium/http2_push_promise_index.cc",
-      "spdy/chromium/http2_push_promise_index.h",
-      "spdy/chromium/multiplexed_http_stream.cc",
-      "spdy/chromium/multiplexed_http_stream.h",
-      "spdy/chromium/multiplexed_session.cc",
-      "spdy/chromium/multiplexed_session.h",
-      "spdy/chromium/server_push_delegate.h",
-      "spdy/chromium/spdy_buffer.cc",
-      "spdy/chromium/spdy_buffer.h",
-      "spdy/chromium/spdy_buffer_producer.cc",
-      "spdy/chromium/spdy_buffer_producer.h",
-      "spdy/chromium/spdy_http_stream.cc",
-      "spdy/chromium/spdy_http_stream.h",
-      "spdy/chromium/spdy_http_utils.cc",
-      "spdy/chromium/spdy_http_utils.h",
-      "spdy/chromium/spdy_log_util.cc",
-      "spdy/chromium/spdy_log_util.h",
-      "spdy/chromium/spdy_proxy_client_socket.cc",
-      "spdy/chromium/spdy_proxy_client_socket.h",
-      "spdy/chromium/spdy_read_queue.cc",
-      "spdy/chromium/spdy_read_queue.h",
-      "spdy/chromium/spdy_session.cc",
-      "spdy/chromium/spdy_session.h",
-      "spdy/chromium/spdy_session_key.cc",
-      "spdy/chromium/spdy_session_key.h",
-      "spdy/chromium/spdy_session_pool.cc",
-      "spdy/chromium/spdy_session_pool.h",
-      "spdy/chromium/spdy_stream.cc",
-      "spdy/chromium/spdy_stream.h",
-      "spdy/chromium/spdy_write_queue.cc",
-      "spdy/chromium/spdy_write_queue.h",
+      "spdy/bidirectional_stream_spdy_impl.cc",
+      "spdy/bidirectional_stream_spdy_impl.h",
+      "spdy/buffered_spdy_framer.cc",
+      "spdy/buffered_spdy_framer.h",
+      "spdy/header_coalescer.cc",
+      "spdy/header_coalescer.h",
+      "spdy/http2_priority_dependencies.cc",
+      "spdy/http2_priority_dependencies.h",
+      "spdy/http2_push_promise_index.cc",
+      "spdy/http2_push_promise_index.h",
+      "spdy/multiplexed_http_stream.cc",
+      "spdy/multiplexed_http_stream.h",
+      "spdy/multiplexed_session.cc",
+      "spdy/multiplexed_session.h",
+      "spdy/server_push_delegate.h",
+      "spdy/spdy_buffer.cc",
+      "spdy/spdy_buffer.h",
+      "spdy/spdy_buffer_producer.cc",
+      "spdy/spdy_buffer_producer.h",
+      "spdy/spdy_http_stream.cc",
+      "spdy/spdy_http_stream.h",
+      "spdy/spdy_http_utils.cc",
+      "spdy/spdy_http_utils.h",
+      "spdy/spdy_log_util.cc",
+      "spdy/spdy_log_util.h",
+      "spdy/spdy_proxy_client_socket.cc",
+      "spdy/spdy_proxy_client_socket.h",
+      "spdy/spdy_read_queue.cc",
+      "spdy/spdy_read_queue.h",
+      "spdy/spdy_session.cc",
+      "spdy/spdy_session.h",
+      "spdy/spdy_session_key.cc",
+      "spdy/spdy_session_key.h",
+      "spdy/spdy_session_pool.cc",
+      "spdy/spdy_session_pool.h",
+      "spdy/spdy_stream.cc",
+      "spdy/spdy_stream.h",
+      "spdy/spdy_write_queue.cc",
+      "spdy/spdy_write_queue.h",
       "ssl/client_cert_store.h",
       "ssl/client_cert_store_mac.cc",
       "ssl/client_cert_store_mac.h",
@@ -2623,8 +2623,8 @@
     "proxy_resolution/proxy_config_service_common_unittest.h",
     "socket/socket_test_util.cc",
     "socket/socket_test_util.h",
-    "spdy/chromium/spdy_test_util_common.cc",
-    "spdy/chromium/spdy_test_util_common.h",
+    "spdy/spdy_test_util_common.cc",
+    "spdy/spdy_test_util_common.h",
     "ssl/client_cert_identity_test_util.cc",
     "ssl/client_cert_identity_test_util.h",
     "ssl/ssl_private_key_test_util.cc",
@@ -5205,26 +5205,26 @@
     "socket/udp_socket_unittest.cc",
     "socket/websocket_endpoint_lock_manager_unittest.cc",
     "socket/websocket_transport_client_socket_pool_unittest.cc",
-    "spdy/chromium/bidirectional_stream_spdy_impl_unittest.cc",
-    "spdy/chromium/buffered_spdy_framer_unittest.cc",
-    "spdy/chromium/header_coalescer_test.cc",
-    "spdy/chromium/http2_priority_dependencies_unittest.cc",
-    "spdy/chromium/http2_push_promise_index_test.cc",
-    "spdy/chromium/spdy_buffer_unittest.cc",
-    "spdy/chromium/spdy_http_stream_unittest.cc",
-    "spdy/chromium/spdy_http_utils_unittest.cc",
-    "spdy/chromium/spdy_log_util_unittest.cc",
-    "spdy/chromium/spdy_network_transaction_unittest.cc",
-    "spdy/chromium/spdy_proxy_client_socket_unittest.cc",
-    "spdy/chromium/spdy_read_queue_unittest.cc",
-    "spdy/chromium/spdy_session_pool_unittest.cc",
-    "spdy/chromium/spdy_session_test_util.cc",
-    "spdy/chromium/spdy_session_test_util.h",
-    "spdy/chromium/spdy_session_unittest.cc",
-    "spdy/chromium/spdy_stream_test_util.cc",
-    "spdy/chromium/spdy_stream_test_util.h",
-    "spdy/chromium/spdy_stream_unittest.cc",
-    "spdy/chromium/spdy_write_queue_unittest.cc",
+    "spdy/bidirectional_stream_spdy_impl_unittest.cc",
+    "spdy/buffered_spdy_framer_unittest.cc",
+    "spdy/header_coalescer_test.cc",
+    "spdy/http2_priority_dependencies_unittest.cc",
+    "spdy/http2_push_promise_index_test.cc",
+    "spdy/spdy_buffer_unittest.cc",
+    "spdy/spdy_http_stream_unittest.cc",
+    "spdy/spdy_http_utils_unittest.cc",
+    "spdy/spdy_log_util_unittest.cc",
+    "spdy/spdy_network_transaction_unittest.cc",
+    "spdy/spdy_proxy_client_socket_unittest.cc",
+    "spdy/spdy_read_queue_unittest.cc",
+    "spdy/spdy_session_pool_unittest.cc",
+    "spdy/spdy_session_test_util.cc",
+    "spdy/spdy_session_test_util.h",
+    "spdy/spdy_session_unittest.cc",
+    "spdy/spdy_stream_test_util.cc",
+    "spdy/spdy_stream_test_util.h",
+    "spdy/spdy_stream_unittest.cc",
+    "spdy/spdy_write_queue_unittest.cc",
     "ssl/channel_id_service_unittest.cc",
     "ssl/client_cert_identity_unittest.cc",
     "ssl/client_cert_store_mac_unittest.cc",
@@ -5703,8 +5703,8 @@
       "http/http_network_transaction_unittest.cc",
       "http/http_proxy_client_socket_pool_unittest.cc",
       "socket/ssl_client_socket_pool_unittest.cc",
-      "spdy/chromium/spdy_network_transaction_unittest.cc",
-      "spdy/chromium/spdy_proxy_client_socket_unittest.cc",
+      "spdy/spdy_network_transaction_unittest.cc",
+      "spdy/spdy_proxy_client_socket_unittest.cc",
       "url_request/url_request_job_unittest.cc",
       "url_request/url_request_unittest.cc",
     ]
@@ -6365,7 +6365,7 @@
 
 fuzzer_test("net_spdy_session_fuzzer") {
   sources = [
-    "spdy/chromium/spdy_session_fuzzer.cc",
+    "spdy/spdy_session_fuzzer.cc",
   ]
   deps = [
     ":net_fuzzer_test_support",

net/http/bidirectional_stream.cc

diff --git a/net/http/bidirectional_stream.cc b/net/http/bidirectional_stream.cc
index 6e3e44c1..1bf42ad 100644
--- a/net/http/bidirectional_stream.cc
+++ b/net/http/bidirectional_stream.cc
@@ -24,8 +24,8 @@
 #include "net/log/net_log_capture_mode.h"
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source_type.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
-#include "net/spdy/chromium/spdy_log_util.h"
+#include "net/spdy/spdy_http_utils.h"
+#include "net/spdy/spdy_log_util.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_config.h"
 #include "net/third_party/spdy/core/spdy_header_block.h"

net/http/bidirectional_stream_unittest.cc

diff --git a/net/http/bidirectional_stream_unittest.cc b/net/http/bidirectional_stream_unittest.cc
index 42fb27e..915c01a 100644
--- a/net/http/bidirectional_stream_unittest.cc
+++ b/net/http/bidirectional_stream_unittest.cc
@@ -32,8 +32,8 @@
 #include "net/log/test_net_log_util.h"
 #include "net/socket/socket_tag.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"

net/http/http_cache_lookup_manager.h

diff --git a/net/http/http_cache_lookup_manager.h b/net/http/http_cache_lookup_manager.h
index e2b4e97..8a651bd 100644
--- a/net/http/http_cache_lookup_manager.h
+++ b/net/http/http_cache_lookup_manager.h
@@ -8,7 +8,7 @@
 #include "net/base/net_export.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_cache_transaction.h"
-#include "net/spdy/chromium/server_push_delegate.h"
+#include "net/spdy/server_push_delegate.h"
 
 namespace net {
 

net/http/http_network_layer.cc

diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index 3deabe5..359b4d2 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -13,8 +13,8 @@
 #include "net/http/http_network_transaction.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/http/http_stream_factory_job.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_pool.h"
 #include "net/third_party/spdy/core/spdy_framer.h"
 
 namespace net {

net/http/http_network_layer_unittest.cc

diff --git a/net/http/http_network_layer_unittest.cc b/net/http/http_network_layer_unittest.cc
index eaf1502..acce463 100644
--- a/net/http/http_network_layer_unittest.cc
+++ b/net/http/http_network_layer_unittest.cc
@@ -18,7 +18,7 @@
 #include "net/log/net_log_with_source.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
+#include "net/spdy/spdy_session_pool.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/test/gtest_util.h"
 #include "net/test/test_with_scoped_task_environment.h"

net/http/http_network_session.cc

diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index dae5a054..d60a326 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -32,7 +32,7 @@
 #include "net/socket/next_proto.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/websocket_endpoint_lock_manager.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
+#include "net/spdy/spdy_session_pool.h"
 #include "net/third_party/quic/core/crypto/quic_random.h"
 #include "net/third_party/quic/core/quic_packets.h"
 #include "net/third_party/quic/core/quic_tag.h"

net/http/http_network_session.h

diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index f6b9fce..9f4434b 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -30,7 +30,7 @@
 #include "net/http/http_stream_factory.h"
 #include "net/quic/chromium/quic_stream_factory.h"
 #include "net/socket/next_proto.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
+#include "net/spdy/spdy_session_pool.h"
 #include "net/ssl/ssl_client_auth_cache.h"
 #include "net/third_party/spdy/core/spdy_protocol.h"
 

net/http/http_network_transaction.cc

diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index d4c0320..6cb10b29 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -60,9 +60,9 @@
 #include "net/socket/next_proto.h"
 #include "net/socket/socks_client_socket_pool.h"
 #include "net/socket/transport_client_socket_pool.h"
-#include "net/spdy/chromium/spdy_http_stream.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
+#include "net/spdy/spdy_http_stream.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_pool.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 #include "net/ssl/ssl_info.h"

net/http/http_network_transaction_unittest.cc

diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index db1f4e6..dc2c2f5 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -82,9 +82,9 @@
 #include "net/socket/socket_tag.h"
 #include "net/socket/socket_test_util.h"
 #include "net/socket/ssl_client_socket.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/ssl/default_channel_id_store.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_config_service.h"

net/http/http_proxy_client_socket_pool.cc

diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc
index 9a8e7574..8f5fcae 100644
--- a/net/http/http_proxy_client_socket_pool.cc
+++ b/net/http/http_proxy_client_socket_pool.cc
@@ -29,10 +29,10 @@
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/ssl_client_socket_pool.h"
 #include "net/socket/transport_client_socket_pool.h"
-#include "net/spdy/chromium/spdy_proxy_client_socket.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/spdy_proxy_client_socket.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_stream.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "url/gurl.h"
 

net/http/http_proxy_client_socket_pool.h

diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h
index 502aac7..88a6053 100644
--- a/net/http/http_proxy_client_socket_pool.h
+++ b/net/http/http_proxy_client_socket_pool.h
@@ -22,7 +22,7 @@
 #include "net/socket/client_socket_pool.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "net/socket/ssl_client_socket.h"
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/spdy_session.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 
 namespace net {

net/http/http_proxy_client_socket_pool_unittest.cc

diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc
index 4c7c3aa..d6e2da9 100644
--- a/net/http/http_proxy_client_socket_pool_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_unittest.cc
@@ -29,7 +29,7 @@
 #include "net/socket/next_proto.h"
 #include "net/socket/socket_tag.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/test/gtest_util.h"
 #include "net/test/test_with_scoped_task_environment.h"
 #include "net/third_party/spdy/core/spdy_protocol.h"

net/http/http_proxy_client_socket_wrapper.cc

diff --git a/net/http/http_proxy_client_socket_wrapper.cc b/net/http/http_proxy_client_socket_wrapper.cc
index 1a04c85..4252e5a 100644
--- a/net/http/http_proxy_client_socket_wrapper.cc
+++ b/net/http/http_proxy_client_socket_wrapper.cc
@@ -22,10 +22,10 @@
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/socket_tag.h"
-#include "net/spdy/chromium/spdy_proxy_client_socket.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/spdy_proxy_client_socket.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_stream.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "url/gurl.h"

net/http/http_proxy_client_socket_wrapper.h

diff --git a/net/http/http_proxy_client_socket_wrapper.h b/net/http/http_proxy_client_socket_wrapper.h
index 3d87ee0..0caf79f 100644
--- a/net/http/http_proxy_client_socket_wrapper.h
+++ b/net/http/http_proxy_client_socket_wrapper.h
@@ -26,7 +26,7 @@
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/ssl_client_socket_pool.h"
 #include "net/socket/transport_client_socket_pool.h"
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/spdy_session.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 
 namespace net {

net/http/http_stream_factory.cc

diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc
index bd3baac..39ad492 100644
--- a/net/http/http_stream_factory.cc
+++ b/net/http/http_stream_factory.cc
@@ -29,8 +29,8 @@
 #include "net/http/http_stream_factory_job_controller.h"
 #include "net/http/transport_security_state.h"
 #include "net/quic/chromium/quic_http_utils.h"
-#include "net/spdy/chromium/bidirectional_stream_spdy_impl.h"
-#include "net/spdy/chromium/spdy_http_stream.h"
+#include "net/spdy/bidirectional_stream_spdy_impl.h"
+#include "net/spdy/spdy_http_stream.h"
 #include "net/third_party/quic/core/quic_packets.h"
 #include "net/third_party/quic/core/quic_server_id.h"
 #include "net/third_party/spdy/core/spdy_alt_svc_wire_format.h"

net/http/http_stream_factory.h

diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h
index 6b1640e..45a0657 100644
--- a/net/http/http_stream_factory.h
+++ b/net/http/http_stream_factory.h
@@ -32,7 +32,7 @@
 #include "net/log/net_log_with_source.h"
 #include "net/proxy_resolution/proxy_info.h"
 #include "net/socket/ssl_client_socket.h"
-#include "net/spdy/chromium/spdy_session_key.h"
+#include "net/spdy/spdy_session_key.h"
 #include "net/ssl/ssl_config.h"
 #include "net/websockets/websocket_handshake_stream_base.h"
 

net/http/http_stream_factory_job.cc

diff --git a/net/http/http_stream_factory_job.cc b/net/http/http_stream_factory_job.cc
index 4763173..7879b64 100644
--- a/net/http/http_stream_factory_job.cc
+++ b/net/http/http_stream_factory_job.cc
@@ -49,11 +49,11 @@
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/ssl_client_socket_pool.h"
 #include "net/socket/stream_socket.h"
-#include "net/spdy/chromium/bidirectional_stream_spdy_impl.h"
-#include "net/spdy/chromium/http2_push_promise_index.h"
-#include "net/spdy/chromium/spdy_http_stream.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
+#include "net/spdy/bidirectional_stream_spdy_impl.h"
+#include "net/spdy/http2_push_promise_index.h"
+#include "net/spdy/spdy_http_stream.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_pool.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/third_party/spdy/core/spdy_protocol.h"

net/http/http_stream_factory_job.h

diff --git a/net/http/http_stream_factory_job.h b/net/http/http_stream_factory_job.h
index cd6a6a1..9317d20 100644
--- a/net/http/http_stream_factory_job.h
+++ b/net/http/http_stream_factory_job.h
@@ -29,7 +29,7 @@
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/socket/next_proto.h"
 #include "net/socket/ssl_client_socket.h"
-#include "net/spdy/chromium/spdy_session_key.h"
+#include "net/spdy/spdy_session_key.h"
 #include "net/ssl/ssl_config_service.h"
 
 namespace net {

net/http/http_stream_factory_job_controller.cc

diff --git a/net/http/http_stream_factory_job_controller.cc b/net/http/http_stream_factory_job_controller.cc
index 3fb25a6..70e8391c 100644
--- a/net/http/http_stream_factory_job_controller.cc
+++ b/net/http/http_stream_factory_job_controller.cc
@@ -22,7 +22,7 @@
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_with_source.h"
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/spdy_session.h"
 #include "url/url_constants.h"
 
 namespace net {

net/http/http_stream_factory_job_controller_unittest.cc

diff --git a/net/http/http_stream_factory_job_controller_unittest.cc b/net/http/http_stream_factory_job_controller_unittest.cc
index d03e28f..b499032 100644
--- a/net/http/http_stream_factory_job_controller_unittest.cc
+++ b/net/http/http_stream_factory_job_controller_unittest.cc
@@ -40,7 +40,7 @@
 #include "net/quic/chromium/quic_stream_factory_peer.h"
 #include "net/quic/chromium/quic_test_packet_maker.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/test/test_with_scoped_task_environment.h"
 #include "net/third_party/quic/test_tools/mock_random.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"

net/http/http_stream_factory_unittest.cc

diff --git a/net/http/http_stream_factory_unittest.cc b/net/http/http_stream_factory_unittest.cc
index fbf3a0b0..77aba9c1 100644
--- a/net/http/http_stream_factory_unittest.cc
+++ b/net/http/http_stream_factory_unittest.cc
@@ -51,9 +51,9 @@
 #include "net/socket/next_proto.h"
 #include "net/socket/socket_tag.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/ssl/ssl_config_service.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/test/cert_test_util.h"

net/http/http_stream_request.cc

diff --git a/net/http/http_stream_request.cc b/net/http/http_stream_request.cc
index deb3902..1f22351 100644
--- a/net/http/http_stream_request.cc
+++ b/net/http/http_stream_request.cc
@@ -11,8 +11,8 @@
 #include "base/stl_util.h"
 #include "net/http/bidirectional_stream_impl.h"
 #include "net/log/net_log_event_type.h"
-#include "net/spdy/chromium/spdy_http_stream.h"
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/spdy_http_stream.h"
+#include "net/spdy/spdy_session.h"
 
 namespace net {
 

net/http/http_stream_request.h

diff --git a/net/http/http_stream_request.h b/net/http/http_stream_request.h
index 2cce5741..c07e7f6 100644
--- a/net/http/http_stream_request.h
+++ b/net/http/http_stream_request.h
@@ -18,7 +18,7 @@
 #include "net/proxy_resolution/proxy_info.h"
 #include "net/socket/connection_attempts.h"
 #include "net/socket/next_proto.h"
-#include "net/spdy/chromium/spdy_session_key.h"
+#include "net/spdy/spdy_session_key.h"
 #include "net/ssl/ssl_config.h"
 #include "net/ssl/ssl_info.h"
 #include "net/websockets/websocket_handshake_stream_base.h"

net/http/http_stream_request_unittest.cc

diff --git a/net/http/http_stream_request_unittest.cc b/net/http/http_stream_request_unittest.cc
index 62eebe84..cb9a646 100644
--- a/net/http/http_stream_request_unittest.cc
+++ b/net/http/http_stream_request_unittest.cc
@@ -13,7 +13,7 @@
 #include "net/http/http_stream_factory_job_controller.h"
 #include "net/http/http_stream_factory_test_util.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;

net/quic/chromium/bidirectional_stream_quic_impl.cc

diff --git a/net/quic/chromium/bidirectional_stream_quic_impl.cc b/net/quic/chromium/bidirectional_stream_quic_impl.cc
index f03fabe2..1454764 100644
--- a/net/quic/chromium/bidirectional_stream_quic_impl.cc
+++ b/net/quic/chromium/bidirectional_stream_quic_impl.cc
@@ -14,7 +14,7 @@
 #include "net/http/bidirectional_stream_request_info.h"
 #include "net/http/http_util.h"
 #include "net/socket/next_proto.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
+#include "net/spdy/spdy_http_utils.h"
 #include "net/third_party/quic/core/quic_connection.h"
 #include "net/third_party/quic/platform/api/quic_string_piece.h"
 #include "net/third_party/spdy/core/spdy_header_block.h"

net/quic/chromium/quic_chromium_client_session.cc

diff --git a/net/quic/chromium/quic_chromium_client_session.cc b/net/quic/chromium/quic_chromium_client_session.cc
index ba22bd1..8259c43 100644
--- a/net/quic/chromium/quic_chromium_client_session.cc
+++ b/net/quic/chromium/quic_chromium_client_session.cc
@@ -32,9 +32,9 @@
 #include "net/quic/chromium/quic_server_info.h"
 #include "net/quic/chromium/quic_stream_factory.h"
 #include "net/socket/datagram_client_socket.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
-#include "net/spdy/chromium/spdy_log_util.h"
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/spdy_http_utils.h"
+#include "net/spdy/spdy_log_util.h"
+#include "net/spdy/spdy_session.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 #include "net/ssl/ssl_info.h"

net/quic/chromium/quic_chromium_client_session.h

diff --git a/net/quic/chromium/quic_chromium_client_session.h b/net/quic/chromium/quic_chromium_client_session.h
index 994dd41..0ba77bbb 100644
--- a/net/quic/chromium/quic_chromium_client_session.h
+++ b/net/quic/chromium/quic_chromium_client_session.h
@@ -35,9 +35,9 @@
 #include "net/quic/chromium/quic_connectivity_probing_manager.h"
 #include "net/quic/chromium/quic_session_key.h"
 #include "net/socket/socket_performance_watcher.h"
-#include "net/spdy/chromium/http2_priority_dependencies.h"
-#include "net/spdy/chromium/multiplexed_session.h"
-#include "net/spdy/chromium/server_push_delegate.h"
+#include "net/spdy/http2_priority_dependencies.h"
+#include "net/spdy/multiplexed_session.h"
+#include "net/spdy/server_push_delegate.h"
 #include "net/third_party/quic/core/quic_client_push_promise_index.h"
 #include "net/third_party/quic/core/quic_crypto_client_stream.h"
 #include "net/third_party/quic/core/quic_packets.h"

net/quic/chromium/quic_chromium_client_session_test.cc

diff --git a/net/quic/chromium/quic_chromium_client_session_test.cc b/net/quic/chromium/quic_chromium_client_session_test.cc
index 4a999b7..d0eb22ef 100644
--- a/net/quic/chromium/quic_chromium_client_session_test.cc
+++ b/net/quic/chromium/quic_chromium_client_session_test.cc
@@ -30,7 +30,7 @@
 #include "net/quic/chromium/quic_test_packet_maker.h"
 #include "net/socket/datagram_client_socket.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"
 #include "net/test/test_data_directory.h"

net/quic/chromium/quic_chromium_client_stream.cc

diff --git a/net/quic/chromium/quic_chromium_client_stream.cc b/net/quic/chromium/quic_chromium_client_stream.cc
index 762ec44..aca18260 100644
--- a/net/quic/chromium/quic_chromium_client_stream.cc
+++ b/net/quic/chromium/quic_chromium_client_stream.cc
@@ -15,7 +15,7 @@
 #include "net/log/net_log_event_type.h"
 #include "net/quic/chromium/quic_chromium_client_session.h"
 #include "net/quic/chromium/quic_http_utils.h"
-#include "net/spdy/chromium/spdy_log_util.h"
+#include "net/spdy/spdy_log_util.h"
 #include "net/third_party/quic/core/quic_spdy_session.h"
 #include "net/third_party/quic/core/quic_write_blocked_list.h"
 #include "net/third_party/quic/core/spdy_utils.h"

net/quic/chromium/quic_http_stream.cc

diff --git a/net/quic/chromium/quic_http_stream.cc b/net/quic/chromium/quic_http_stream.cc
index 04059072..0113084f 100644
--- a/net/quic/chromium/quic_http_stream.cc
+++ b/net/quic/chromium/quic_http_stream.cc
@@ -19,7 +19,7 @@
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
 #include "net/quic/chromium/quic_http_utils.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
+#include "net/spdy/spdy_http_utils.h"
 #include "net/ssl/ssl_info.h"
 #include "net/third_party/quic/core/quic_client_promised_info.h"
 #include "net/third_party/quic/core/quic_stream_sequencer.h"

net/quic/chromium/quic_http_stream.h

diff --git a/net/quic/chromium/quic_http_stream.h b/net/quic/chromium/quic_http_stream.h
index 36b9d5b..18bb650 100644
--- a/net/quic/chromium/quic_http_stream.h
+++ b/net/quic/chromium/quic_http_stream.h
@@ -23,7 +23,7 @@
 #include "net/log/net_log_with_source.h"
 #include "net/quic/chromium/quic_chromium_client_session.h"
 #include "net/quic/chromium/quic_chromium_client_stream.h"
-#include "net/spdy/chromium/multiplexed_http_stream.h"
+#include "net/spdy/multiplexed_http_stream.h"
 #include "net/third_party/quic/core/quic_client_push_promise_index.h"
 #include "net/third_party/quic/core/quic_packets.h"
 

net/quic/chromium/quic_http_stream_test.cc

diff --git a/net/quic/chromium/quic_http_stream_test.cc b/net/quic/chromium/quic_http_stream_test.cc
index 5049a70..3a2e818 100644
--- a/net/quic/chromium/quic_http_stream_test.cc
+++ b/net/quic/chromium/quic_http_stream_test.cc
@@ -39,7 +39,7 @@
 #include "net/quic/chromium/test_task_runner.h"
 #include "net/socket/socket_performance_watcher.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
+#include "net/spdy/spdy_http_utils.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"
 #include "net/test/test_data_directory.h"

net/quic/chromium/quic_http_utils.cc

diff --git a/net/quic/chromium/quic_http_utils.cc b/net/quic/chromium/quic_http_utils.cc
index aa6380af..72d182b 100644
--- a/net/quic/chromium/quic_http_utils.cc
+++ b/net/quic/chromium/quic_http_utils.cc
@@ -7,7 +7,7 @@
 #include <utility>
 
 #include "base/metrics/histogram_macros.h"
-#include "net/spdy/chromium/spdy_log_util.h"
+#include "net/spdy/spdy_log_util.h"
 #include "net/third_party/quic/platform/api/quic_endian.h"
 
 namespace net {

net/quic/chromium/quic_network_transaction_unittest.cc

diff --git a/net/quic/chromium/quic_network_transaction_unittest.cc b/net/quic/chromium/quic_network_transaction_unittest.cc
index 1ae542c..398bebe 100644
--- a/net/quic/chromium/quic_network_transaction_unittest.cc
+++ b/net/quic/chromium/quic_network_transaction_unittest.cc
@@ -54,7 +54,7 @@
 #include "net/socket/socket_performance_watcher.h"
 #include "net/socket/socket_performance_watcher_factory.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"

net/quic/chromium/quic_proxy_client_socket.cc

diff --git a/net/quic/chromium/quic_proxy_client_socket.cc b/net/quic/chromium/quic_proxy_client_socket.cc
index baa81021..4dfaf6a5 100644
--- a/net/quic/chromium/quic_proxy_client_socket.cc
+++ b/net/quic/chromium/quic_proxy_client_socket.cc
@@ -16,7 +16,7 @@
 #include "net/http/proxy_connect_redirect_http_stream.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_source_type.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
+#include "net/spdy/spdy_http_utils.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 
 namespace net {

net/quic/chromium/quic_proxy_client_socket.h

diff --git a/net/quic/chromium/quic_proxy_client_socket.h b/net/quic/chromium/quic_proxy_client_socket.h
index 903527d..586e897a 100644
--- a/net/quic/chromium/quic_proxy_client_socket.h
+++ b/net/quic/chromium/quic_proxy_client_socket.h
@@ -14,7 +14,7 @@
 #include "net/http/proxy_client_socket.h"
 #include "net/quic/chromium/quic_chromium_client_session.h"
 #include "net/quic/chromium/quic_chromium_client_stream.h"
-#include "net/spdy/chromium/spdy_read_queue.h"
+#include "net/spdy/spdy_read_queue.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 
 namespace net {

net/quic/chromium/quic_stream_factory_test.cc

diff --git a/net/quic/chromium/quic_stream_factory_test.cc b/net/quic/chromium/quic_stream_factory_test.cc
index 0a18a9e..cccc69aa 100644
--- a/net/quic/chromium/quic_stream_factory_test.cc
+++ b/net/quic/chromium/quic_stream_factory_test.cc
@@ -38,8 +38,8 @@
 #include "net/quic/chromium/test_task_runner.h"
 #include "net/socket/next_proto.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_session_test_util.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_session_test_util.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/default_channel_id_store.h"
 #include "net/test/cert_test_util.h"

net/socket/ssl_client_socket_pool_unittest.cc

diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index 7ec62aa..2778e36c 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -32,9 +32,9 @@
 #include "net/socket/next_proto.h"
 #include "net/socket/socket_tag.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/gtest_util.h"

net/spdy/bidirectional_stream_spdy_impl.cc

diff --git a/net/spdy/chromium/bidirectional_stream_spdy_impl.cc b/net/spdy/bidirectional_stream_spdy_impl.cc
similarity index 98%
rename from net/spdy/chromium/bidirectional_stream_spdy_impl.cc
rename to net/spdy/bidirectional_stream_spdy_impl.cc
index 6a9f8a7..5fd9d90f 100644
--- a/net/spdy/chromium/bidirectional_stream_spdy_impl.cc
+++ b/net/spdy/bidirectional_stream_spdy_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/bidirectional_stream_spdy_impl.h"
+#include "net/spdy/bidirectional_stream_spdy_impl.h"
 
 #include <utility>
 
@@ -13,9 +13,9 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "net/http/bidirectional_stream_request_info.h"
-#include "net/spdy/chromium/spdy_buffer.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/spdy_buffer.h"
+#include "net/spdy/spdy_http_utils.h"
+#include "net/spdy/spdy_stream.h"
 #include "net/third_party/spdy/core/spdy_header_block.h"
 
 namespace net {

net/spdy/bidirectional_stream_spdy_impl.h

diff --git a/net/spdy/chromium/bidirectional_stream_spdy_impl.h b/net/spdy/bidirectional_stream_spdy_impl.h
similarity index 93%
rename from net/spdy/chromium/bidirectional_stream_spdy_impl.h
rename to net/spdy/bidirectional_stream_spdy_impl.h
index f7df8cf..bbbd622 100644
--- a/net/spdy/chromium/bidirectional_stream_spdy_impl.h
+++ b/net/spdy/bidirectional_stream_spdy_impl.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 NET_SPDY_CHROMIUM_BIDIRECTIONAL_STREAM_SPDY_IMPL_H_
-#define NET_SPDY_CHROMIUM_BIDIRECTIONAL_STREAM_SPDY_IMPL_H_
+#ifndef NET_SPDY_BIDIRECTIONAL_STREAM_SPDY_IMPL_H_
+#define NET_SPDY_BIDIRECTIONAL_STREAM_SPDY_IMPL_H_
 
 #include <stdint.h>
 
@@ -19,9 +19,9 @@
 #include "net/http/bidirectional_stream_request_info.h"
 #include "net/http/http_request_info.h"
 #include "net/log/net_log_source.h"
-#include "net/spdy/chromium/spdy_read_queue.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/spdy_read_queue.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_stream.h"
 
 namespace base {
 class Timer;
@@ -134,4 +134,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_BIDIRECTIONAL_STREAM_SPDY_IMPL_H_
+#endif  // NET_SPDY_BIDIRECTIONAL_STREAM_SPDY_IMPL_H_

net/spdy/bidirectional_stream_spdy_impl_unittest.cc

diff --git a/net/spdy/chromium/bidirectional_stream_spdy_impl_unittest.cc b/net/spdy/bidirectional_stream_spdy_impl_unittest.cc
similarity index 98%
rename from net/spdy/chromium/bidirectional_stream_spdy_impl_unittest.cc
rename to net/spdy/bidirectional_stream_spdy_impl_unittest.cc
index 33685e72..e1d3fc72 100644
--- a/net/spdy/chromium/bidirectional_stream_spdy_impl_unittest.cc
+++ b/net/spdy/bidirectional_stream_spdy_impl_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/bidirectional_stream_spdy_impl.h"
+#include "net/spdy/bidirectional_stream_spdy_impl.h"
 
 #include "base/containers/span.h"
 #include "base/macros.h"
@@ -20,8 +20,8 @@
 #include "net/log/test_net_log.h"
 #include "net/socket/socket_tag.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"
 #include "net/test/test_data_directory.h"

net/spdy/buffered_spdy_framer.cc

diff --git a/net/spdy/chromium/buffered_spdy_framer.cc b/net/spdy/buffered_spdy_framer.cc
similarity index 99%
rename from net/spdy/chromium/buffered_spdy_framer.cc
rename to net/spdy/buffered_spdy_framer.cc
index 9d9baeb..fb91f82 100644
--- a/net/spdy/chromium/buffered_spdy_framer.cc
+++ b/net/spdy/buffered_spdy_framer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/buffered_spdy_framer.h"
+#include "net/spdy/buffered_spdy_framer.h"
 
 #include <algorithm>
 #include <utility>

net/spdy/buffered_spdy_framer.h

diff --git a/net/spdy/chromium/buffered_spdy_framer.h b/net/spdy/buffered_spdy_framer.h
similarity index 97%
rename from net/spdy/chromium/buffered_spdy_framer.h
rename to net/spdy/buffered_spdy_framer.h
index e69f14025..b139cb9 100644
--- a/net/spdy/chromium/buffered_spdy_framer.h
+++ b/net/spdy/buffered_spdy_framer.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 NET_SPDY_CHROMIUM_BUFFERED_SPDY_FRAMER_H_
-#define NET_SPDY_CHROMIUM_BUFFERED_SPDY_FRAMER_H_
+#ifndef NET_SPDY_BUFFERED_SPDY_FRAMER_H_
+#define NET_SPDY_BUFFERED_SPDY_FRAMER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -13,7 +13,7 @@
 #include "base/macros.h"
 #include "net/base/net_export.h"
 #include "net/log/net_log_source.h"
-#include "net/spdy/chromium/header_coalescer.h"
+#include "net/spdy/header_coalescer.h"
 #include "net/third_party/spdy/core/http2_frame_decoder_adapter.h"
 #include "net/third_party/spdy/core/spdy_alt_svc_wire_format.h"
 #include "net/third_party/spdy/core/spdy_framer.h"
@@ -268,4 +268,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_BUFFERED_SPDY_FRAMER_H_
+#endif  // NET_SPDY_BUFFERED_SPDY_FRAMER_H_

net/spdy/buffered_spdy_framer_unittest.cc

diff --git a/net/spdy/chromium/buffered_spdy_framer_unittest.cc b/net/spdy/buffered_spdy_framer_unittest.cc
similarity index 98%
rename from net/spdy/chromium/buffered_spdy_framer_unittest.cc
rename to net/spdy/buffered_spdy_framer_unittest.cc
index 8c4d0c1..5bdfa2f 100644
--- a/net/spdy/chromium/buffered_spdy_framer_unittest.cc
+++ b/net/spdy/buffered_spdy_framer_unittest.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/buffered_spdy_framer.h"
+#include "net/spdy/buffered_spdy_framer.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
 #include "net/log/net_log_with_source.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "testing/platform_test.h"
 
 namespace net {

net/spdy/header_coalescer.cc

diff --git a/net/spdy/chromium/header_coalescer.cc b/net/spdy/header_coalescer.cc
similarity index 98%
rename from net/spdy/chromium/header_coalescer.cc
rename to net/spdy/header_coalescer.cc
index 2b0206a2..82f880d 100644
--- a/net/spdy/chromium/header_coalescer.cc
+++ b/net/spdy/header_coalescer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/header_coalescer.h"
+#include "net/spdy/header_coalescer.h"
 
 #include <memory>
 #include <string>

net/spdy/header_coalescer.h

diff --git a/net/spdy/chromium/header_coalescer.h b/net/spdy/header_coalescer.h
similarity index 90%
rename from net/spdy/chromium/header_coalescer.h
rename to net/spdy/header_coalescer.h
index a1ccabb5..09ab1e3 100644
--- a/net/spdy/chromium/header_coalescer.h
+++ b/net/spdy/header_coalescer.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 NET_SPDY_CHROMIUM_HEADER_COALESCER_H_
-#define NET_SPDY_CHROMIUM_HEADER_COALESCER_H_
+#ifndef NET_SPDY_HEADER_COALESCER_H_
+#define NET_SPDY_HEADER_COALESCER_H_
 
 #include "net/base/net_export.h"
 #include "net/log/net_log_with_source.h"
@@ -46,4 +46,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_HEADER_COALESCER_H_
+#endif  // NET_SPDY_HEADER_COALESCER_H_

net/spdy/header_coalescer_test.cc

diff --git a/net/spdy/chromium/header_coalescer_test.cc b/net/spdy/header_coalescer_test.cc
similarity index 97%
rename from net/spdy/chromium/header_coalescer_test.cc
rename to net/spdy/header_coalescer_test.cc
index c8c1534e..1f9ce51 100644
--- a/net/spdy/chromium/header_coalescer_test.cc
+++ b/net/spdy/header_coalescer_test.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/header_coalescer.h"
+#include "net/spdy/header_coalescer.h"
 
 #include <string>
 #include <vector>
 
 #include "net/log/test_net_log.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/third_party/spdy/platform/api/spdy_string.h"
 #include "net/third_party/spdy/platform/api/spdy_string_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"

net/spdy/http2_priority_dependencies.cc

diff --git a/net/spdy/chromium/http2_priority_dependencies.cc b/net/spdy/http2_priority_dependencies.cc
similarity index 98%
rename from net/spdy/chromium/http2_priority_dependencies.cc
rename to net/spdy/http2_priority_dependencies.cc
index 56bc070..ab38f5ea5 100644
--- a/net/spdy/chromium/http2_priority_dependencies.cc
+++ b/net/spdy/http2_priority_dependencies.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/http2_priority_dependencies.h"
+#include "net/spdy/http2_priority_dependencies.h"
 #include "net/third_party/spdy/platform/api/spdy_estimate_memory_usage.h"
 
 namespace net {

net/spdy/http2_priority_dependencies.h

diff --git a/net/spdy/chromium/http2_priority_dependencies.h b/net/spdy/http2_priority_dependencies.h
similarity index 95%
rename from net/spdy/chromium/http2_priority_dependencies.h
rename to net/spdy/http2_priority_dependencies.h
index 3de3cc4..5f338a2 100644
--- a/net/spdy/chromium/http2_priority_dependencies.h
+++ b/net/spdy/http2_priority_dependencies.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 NET_SPDY_CHROMIUM_HTTP2_PRIORITY_DEPENDENCIES_H_
-#define NET_SPDY_CHROMIUM_HTTP2_PRIORITY_DEPENDENCIES_H_
+#ifndef NET_SPDY_HTTP2_PRIORITY_DEPENDENCIES_H_
+#define NET_SPDY_HTTP2_PRIORITY_DEPENDENCIES_H_
 
 #include <list>
 #include <map>
@@ -96,4 +96,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_HTTP2_PRIORITY_DEPENDENCIES_H_
+#endif  // NET_SPDY_HTTP2_PRIORITY_DEPENDENCIES_H_

net/spdy/http2_priority_dependencies_unittest.cc

diff --git a/net/spdy/chromium/http2_priority_dependencies_unittest.cc b/net/spdy/http2_priority_dependencies_unittest.cc
similarity index 99%
rename from net/spdy/chromium/http2_priority_dependencies_unittest.cc
rename to net/spdy/http2_priority_dependencies_unittest.cc
index f654471..a604b62 100644
--- a/net/spdy/chromium/http2_priority_dependencies_unittest.cc
+++ b/net/spdy/http2_priority_dependencies_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/http2_priority_dependencies.h"
+#include "net/spdy/http2_priority_dependencies.h"
 
 #include <algorithm>
 

net/spdy/http2_push_promise_index.cc

diff --git a/net/spdy/chromium/http2_push_promise_index.cc b/net/spdy/http2_push_promise_index.cc
similarity index 98%
rename from net/spdy/chromium/http2_push_promise_index.cc
rename to net/spdy/http2_push_promise_index.cc
index b8ed939..5a488d9 100644
--- a/net/spdy/chromium/http2_push_promise_index.cc
+++ b/net/spdy/http2_push_promise_index.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/http2_push_promise_index.h"
+#include "net/spdy/http2_push_promise_index.h"
 
 #include <algorithm>
 #include <utility>

net/spdy/http2_push_promise_index.h

diff --git a/net/spdy/chromium/http2_push_promise_index.h b/net/spdy/http2_push_promise_index.h
similarity index 95%
rename from net/spdy/chromium/http2_push_promise_index.h
rename to net/spdy/http2_push_promise_index.h
index 39d2237..37881cb3e 100644
--- a/net/spdy/chromium/http2_push_promise_index.h
+++ b/net/spdy/http2_push_promise_index.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 NET_SPDY_CHROMIUM_HTTP2_PUSH_PROMISE_INDEX_H_
-#define NET_SPDY_CHROMIUM_HTTP2_PUSH_PROMISE_INDEX_H_
+#ifndef NET_SPDY_HTTP2_PUSH_PROMISE_INDEX_H_
+#define NET_SPDY_HTTP2_PUSH_PROMISE_INDEX_H_
 
 #include <set>
 
@@ -12,7 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "net/base/net_export.h"
 #include "net/http/http_request_info.h"
-#include "net/spdy/chromium/spdy_session_key.h"
+#include "net/spdy/spdy_session_key.h"
 #include "net/third_party/spdy/core/spdy_protocol.h"
 #include "url/gurl.h"
 
@@ -133,4 +133,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_HTTP2_PUSH_PROMISE_INDEX_H_
+#endif  // NET_SPDY_HTTP2_PUSH_PROMISE_INDEX_H_

net/spdy/http2_push_promise_index_test.cc

diff --git a/net/spdy/chromium/http2_push_promise_index_test.cc b/net/spdy/http2_push_promise_index_test.cc
similarity index 99%
rename from net/spdy/chromium/http2_push_promise_index_test.cc
rename to net/spdy/http2_push_promise_index_test.cc
index 3f5706fa..7b63d01 100644
--- a/net/spdy/chromium/http2_push_promise_index_test.cc
+++ b/net/spdy/http2_push_promise_index_test.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/http2_push_promise_index.h"
+#include "net/spdy/http2_push_promise_index.h"
 
 #include "net/base/host_port_pair.h"
 #include "net/base/privacy_mode.h"

net/spdy/multiplexed_http_stream.cc

diff --git a/net/spdy/chromium/multiplexed_http_stream.cc b/net/spdy/multiplexed_http_stream.cc
similarity index 97%
rename from net/spdy/chromium/multiplexed_http_stream.cc
rename to net/spdy/multiplexed_http_stream.cc
index f25fa9a..2b8781a 100644
--- a/net/spdy/chromium/multiplexed_http_stream.cc
+++ b/net/spdy/multiplexed_http_stream.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/multiplexed_http_stream.h"
+#include "net/spdy/multiplexed_http_stream.h"
 
 #include <utility>
 

net/spdy/multiplexed_http_stream.h

diff --git a/net/spdy/chromium/multiplexed_http_stream.h b/net/spdy/multiplexed_http_stream.h
similarity index 88%
rename from net/spdy/chromium/multiplexed_http_stream.h
rename to net/spdy/multiplexed_http_stream.h
index 1378a10c..ac3b169 100644
--- a/net/spdy/chromium/multiplexed_http_stream.h
+++ b/net/spdy/multiplexed_http_stream.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_SPDY_CHROMIUM_MULTIPLEXED_HTTP_STREAM_H_
-#define NET_SPDY_CHROMIUM_MULTIPLEXED_HTTP_STREAM_H_
+#ifndef NET_SPDY_MULTIPLEXED_HTTP_STREAM_H_
+#define NET_SPDY_MULTIPLEXED_HTTP_STREAM_H_
 
 #include <memory>
 #include <vector>
 
 #include "net/http/http_stream.h"
-#include "net/spdy/chromium/multiplexed_session.h"
+#include "net/spdy/multiplexed_session.h"
 
 namespace net {
 class SpdyHeaderBlock;
@@ -49,4 +49,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_MULTIPLEXED_HTTP_STREAM_H_
+#endif  // NET_SPDY_MULTIPLEXED_HTTP_STREAM_H_

net/spdy/multiplexed_session.cc

diff --git a/net/spdy/chromium/multiplexed_session.cc b/net/spdy/multiplexed_session.cc
similarity index 95%
rename from net/spdy/chromium/multiplexed_session.cc
rename to net/spdy/multiplexed_session.cc
index 8b380265..6429cfc 100644
--- a/net/spdy/chromium/multiplexed_session.cc
+++ b/net/spdy/multiplexed_session.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/multiplexed_session.h"
+#include "net/spdy/multiplexed_session.h"
 
 namespace net {
 

net/spdy/multiplexed_session.h

diff --git a/net/spdy/chromium/multiplexed_session.h b/net/spdy/multiplexed_session.h
similarity index 94%
rename from net/spdy/chromium/multiplexed_session.h
rename to net/spdy/multiplexed_session.h
index 374529d..aaeb292 100644
--- a/net/spdy/chromium/multiplexed_session.h
+++ b/net/spdy/multiplexed_session.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 NET_SPDY_CHROMIUM_MULTIPLEXED_SESSION_H_
-#define NET_SPDY_CHROMIUM_MULTIPLEXED_SESSION_H_
+#ifndef NET_SPDY_MULTIPLEXED_SESSION_H_
+#define NET_SPDY_MULTIPLEXED_SESSION_H_
 
 #include <vector>
 
@@ -73,4 +73,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_MULTIPLEXED_SESSION_H_
+#endif  // NET_SPDY_MULTIPLEXED_SESSION_H_

net/spdy/server_push_delegate.h

diff --git a/net/spdy/chromium/server_push_delegate.h b/net/spdy/server_push_delegate.h
similarity index 87%
rename from net/spdy/chromium/server_push_delegate.h
rename to net/spdy/server_push_delegate.h
index ba76715..ed2d4f2 100644
--- a/net/spdy/chromium/server_push_delegate.h
+++ b/net/spdy/server_push_delegate.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 NET_SPDY_CHROMIUM_SERVER_PUSH_DELEGATE_H_
-#define NET_SPDY_CHROMIUM_SERVER_PUSH_DELEGATE_H_
+#ifndef NET_SPDY_SERVER_PUSH_DELEGATE_H_
+#define NET_SPDY_SERVER_PUSH_DELEGATE_H_
 
 #include <memory>
 
@@ -38,4 +38,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SERVER_PUSH_DELEGATE_H_
+#endif  // NET_SPDY_SERVER_PUSH_DELEGATE_H_

net/spdy/spdy_buffer.cc

diff --git a/net/spdy/chromium/spdy_buffer.cc b/net/spdy/spdy_buffer.cc
similarity index 98%
rename from net/spdy/chromium/spdy_buffer.cc
rename to net/spdy/spdy_buffer.cc
index f4440d7..dea7c1c 100644
--- a/net/spdy/chromium/spdy_buffer.cc
+++ b/net/spdy/spdy_buffer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_buffer.h"
+#include "net/spdy/spdy_buffer.h"
 
 #include <cstring>
 #include <utility>

net/spdy/spdy_buffer.h

diff --git a/net/spdy/chromium/spdy_buffer.h b/net/spdy/spdy_buffer.h
similarity index 96%
rename from net/spdy/chromium/spdy_buffer.h
rename to net/spdy/spdy_buffer.h
index becfde3..c2271a5 100644
--- a/net/spdy/chromium/spdy_buffer.h
+++ b/net/spdy/spdy_buffer.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 NET_SPDY_CHROMIUM_SPDY_BUFFER_H_
-#define NET_SPDY_CHROMIUM_SPDY_BUFFER_H_
+#ifndef NET_SPDY_SPDY_BUFFER_H_
+#define NET_SPDY_SPDY_BUFFER_H_
 
 #include <cstddef>
 #include <memory>
@@ -105,4 +105,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_BUFFER_H_
+#endif  // NET_SPDY_SPDY_BUFFER_H_

net/spdy/spdy_buffer_producer.cc

diff --git a/net/spdy/chromium/spdy_buffer_producer.cc b/net/spdy/spdy_buffer_producer.cc
similarity index 90%
rename from net/spdy/chromium/spdy_buffer_producer.cc
rename to net/spdy/spdy_buffer_producer.cc
index fd58aaf..2dadefc2 100644
--- a/net/spdy/chromium/spdy_buffer_producer.cc
+++ b/net/spdy/spdy_buffer_producer.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_buffer_producer.h"
+#include "net/spdy/spdy_buffer_producer.h"
 
 #include <utility>
 
 #include "base/logging.h"
-#include "net/spdy/chromium/spdy_buffer.h"
+#include "net/spdy/spdy_buffer.h"
 #include "net/third_party/spdy/core/spdy_protocol.h"
 #include "net/third_party/spdy/platform/api/spdy_estimate_memory_usage.h"
 

net/spdy/spdy_buffer_producer.h

diff --git a/net/spdy/chromium/spdy_buffer_producer.h b/net/spdy/spdy_buffer_producer.h
similarity index 89%
rename from net/spdy/chromium/spdy_buffer_producer.h
rename to net/spdy/spdy_buffer_producer.h
index 921c1e7..5b18c187 100644
--- a/net/spdy/chromium/spdy_buffer_producer.h
+++ b/net/spdy/spdy_buffer_producer.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 NET_SPDY_CHROMIUM_SPDY_BUFFER_PRODUCER_H_
-#define NET_SPDY_CHROMIUM_SPDY_BUFFER_PRODUCER_H_
+#ifndef NET_SPDY_SPDY_BUFFER_PRODUCER_H_
+#define NET_SPDY_SPDY_BUFFER_PRODUCER_H_
 
 #include <memory>
 
@@ -53,4 +53,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_BUFFER_PRODUCER_H_
+#endif  // NET_SPDY_SPDY_BUFFER_PRODUCER_H_

net/spdy/spdy_buffer_unittest.cc

diff --git a/net/spdy/chromium/spdy_buffer_unittest.cc b/net/spdy/spdy_buffer_unittest.cc
similarity index 98%
rename from net/spdy/chromium/spdy_buffer_unittest.cc
rename to net/spdy/spdy_buffer_unittest.cc
index 8ba6bba..6063534 100644
--- a/net/spdy/chromium/spdy_buffer_unittest.cc
+++ b/net/spdy/spdy_buffer_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_buffer.h"
+#include "net/spdy/spdy_buffer.h"
 
 #include <cstddef>
 #include <cstring>

net/spdy/spdy_http_stream.cc

diff --git a/net/spdy/chromium/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
similarity index 98%
rename from net/spdy/chromium/spdy_http_stream.cc
rename to net/spdy/spdy_http_stream.cc
index d92c734..8788a74 100644
--- a/net/spdy/chromium/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_http_stream.h"
+#include "net/spdy/spdy_http_stream.h"
 
 #include <algorithm>
 #include <list>
@@ -22,9 +22,9 @@
 #include "net/http/http_response_info.h"
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_with_source.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
-#include "net/spdy/chromium/spdy_log_util.h"
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/spdy_http_utils.h"
+#include "net/spdy/spdy_log_util.h"
+#include "net/spdy/spdy_session.h"
 #include "net/third_party/spdy/core/spdy_header_block.h"
 #include "net/third_party/spdy/core/spdy_protocol.h"
 #include "net/third_party/spdy/platform/api/spdy_string.h"

net/spdy/spdy_http_stream.h

diff --git a/net/spdy/chromium/spdy_http_stream.h b/net/spdy/spdy_http_stream.h
similarity index 95%
rename from net/spdy/chromium/spdy_http_stream.h
rename to net/spdy/spdy_http_stream.h
index cb2ac24..134da30 100644
--- a/net/spdy/chromium/spdy_http_stream.h
+++ b/net/spdy/spdy_http_stream.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 NET_SPDY_CHROMIUM_SPDY_HTTP_STREAM_H_
-#define NET_SPDY_CHROMIUM_SPDY_HTTP_STREAM_H_
+#ifndef NET_SPDY_SPDY_HTTP_STREAM_H_
+#define NET_SPDY_SPDY_HTTP_STREAM_H_
 
 #include <stdint.h>
 
@@ -16,10 +16,10 @@
 #include "net/base/completion_once_callback.h"
 #include "net/base/net_export.h"
 #include "net/log/net_log_source.h"
-#include "net/spdy/chromium/multiplexed_http_stream.h"
-#include "net/spdy/chromium/spdy_read_queue.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/multiplexed_http_stream.h"
+#include "net/spdy/spdy_read_queue.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_stream.h"
 
 namespace net {
 
@@ -215,4 +215,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_HTTP_STREAM_H_
+#endif  // NET_SPDY_SPDY_HTTP_STREAM_H_

net/spdy/spdy_http_stream_unittest.cc

diff --git a/net/spdy/chromium/spdy_http_stream_unittest.cc b/net/spdy/spdy_http_stream_unittest.cc
similarity index 99%
rename from net/spdy/chromium/spdy_http_stream_unittest.cc
rename to net/spdy/spdy_http_stream_unittest.cc
index e6fa443d..ae922ff 100644
--- a/net/spdy/chromium/spdy_http_stream_unittest.cc
+++ b/net/spdy/spdy_http_stream_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_http_stream.h"
+#include "net/spdy/spdy_http_stream.h"
 
 #include <stdint.h>
 
@@ -24,8 +24,8 @@
 #include "net/log/test_net_log.h"
 #include "net/socket/socket_tag.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_http_utils.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/ssl/default_channel_id_store.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"

net/spdy/spdy_http_utils.cc

diff --git a/net/spdy/chromium/spdy_http_utils.cc b/net/spdy/spdy_http_utils.cc
similarity index 98%
rename from net/spdy/chromium/spdy_http_utils.cc
rename to net/spdy/spdy_http_utils.cc
index f8d5abb..020d79c 100644
--- a/net/spdy/chromium/spdy_http_utils.cc
+++ b/net/spdy/spdy_http_utils.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_http_utils.h"
+#include "net/spdy/spdy_http_utils.h"
 
 #include <vector>
 

net/spdy/spdy_http_utils.h

diff --git a/net/spdy/chromium/spdy_http_utils.h b/net/spdy/spdy_http_utils.h
similarity index 93%
rename from net/spdy/chromium/spdy_http_utils.h
rename to net/spdy/spdy_http_utils.h
index 8b4be13..d1fbf54086 100644
--- a/net/spdy/chromium/spdy_http_utils.h
+++ b/net/spdy/spdy_http_utils.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 NET_SPDY_CHROMIUM_SPDY_HTTP_UTILS_H_
-#define NET_SPDY_CHROMIUM_SPDY_HTTP_UTILS_H_
+#ifndef NET_SPDY_SPDY_HTTP_UTILS_H_
+#define NET_SPDY_SPDY_HTTP_UTILS_H_
 
 #include "net/base/net_export.h"
 #include "net/base/request_priority.h"
@@ -57,4 +57,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_HTTP_UTILS_H_
+#endif  // NET_SPDY_SPDY_HTTP_UTILS_H_

net/spdy/spdy_http_utils_unittest.cc

diff --git a/net/spdy/chromium/spdy_http_utils_unittest.cc b/net/spdy/spdy_http_utils_unittest.cc
similarity index 98%
rename from net/spdy/chromium/spdy_http_utils_unittest.cc
rename to net/spdy/spdy_http_utils_unittest.cc
index bfd227aa..4b4f690 100644
--- a/net/spdy/chromium/spdy_http_utils_unittest.cc
+++ b/net/spdy/spdy_http_utils_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_http_utils.h"
+#include "net/spdy/spdy_http_utils.h"
 
 #include <stdint.h>
 

net/spdy/spdy_log_util.cc

diff --git a/net/spdy/chromium/spdy_log_util.cc b/net/spdy/spdy_log_util.cc
similarity index 97%
rename from net/spdy/chromium/spdy_log_util.cc
rename to net/spdy/spdy_log_util.cc
index 2ba44f301..9ca97f6 100644
--- a/net/spdy/chromium/spdy_log_util.cc
+++ b/net/spdy/spdy_log_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_log_util.h"
+#include "net/spdy/spdy_log_util.h"
 
 #include <utility>
 

net/spdy/spdy_log_util.h

diff --git a/net/spdy/chromium/spdy_log_util.h b/net/spdy/spdy_log_util.h
similarity index 90%
rename from net/spdy/chromium/spdy_log_util.h
rename to net/spdy/spdy_log_util.h
index 9b7ddcd..5b11d33 100644
--- a/net/spdy/chromium/spdy_log_util.h
+++ b/net/spdy/spdy_log_util.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 NET_SPDY_CHROMIUM_SPDY_LOG_UTIL_H_
-#define NET_SPDY_CHROMIUM_SPDY_LOG_UTIL_H_
+#ifndef NET_SPDY_SPDY_LOG_UTIL_H_
+#define NET_SPDY_SPDY_LOG_UTIL_H_
 
 #include <memory>
 
@@ -39,4 +39,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_LOG_UTIL_H_
+#endif  // NET_SPDY_SPDY_LOG_UTIL_H_

net/spdy/spdy_log_util_unittest.cc

diff --git a/net/spdy/chromium/spdy_log_util_unittest.cc b/net/spdy/spdy_log_util_unittest.cc
similarity index 96%
rename from net/spdy/chromium/spdy_log_util_unittest.cc
rename to net/spdy/spdy_log_util_unittest.cc
index 5e274e5..7c1f6d7d 100644
--- a/net/spdy/chromium/spdy_log_util_unittest.cc
+++ b/net/spdy/spdy_log_util_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_log_util.h"
+#include "net/spdy/spdy_log_util.h"
 
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"

net/spdy/spdy_network_transaction_unittest.cc

diff --git a/net/spdy/chromium/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
similarity index 99%
rename from net/spdy/chromium/spdy_network_transaction_unittest.cc
rename to net/spdy/spdy_network_transaction_unittest.cc
index 157387e..5fe5f1a 100644
--- a/net/spdy/chromium/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -40,12 +40,12 @@
 #include "net/socket/client_socket_pool_base.h"
 #include "net/socket/next_proto.h"
 #include "net/socket/socket_tag.h"
-#include "net/spdy/chromium/buffered_spdy_framer.h"
-#include "net/spdy/chromium/spdy_http_stream.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/buffered_spdy_framer.h"
+#include "net/spdy/spdy_http_stream.h"
+#include "net/spdy/spdy_http_utils.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"

net/spdy/spdy_proxy_client_socket.cc

diff --git a/net/spdy/chromium/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc
similarity index 99%
rename from net/spdy/chromium/spdy_proxy_client_socket.cc
rename to net/spdy/spdy_proxy_client_socket.cc
index e9d07b6f..c0f552e 100644
--- a/net/spdy/chromium/spdy_proxy_client_socket.cc
+++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_proxy_client_socket.h"
+#include "net/spdy/spdy_proxy_client_socket.h"
 
 #include <algorithm>  // min
 #include <utility>
@@ -25,7 +25,7 @@
 #include "net/http/proxy_connect_redirect_http_stream.h"
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source_type.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
+#include "net/spdy/spdy_http_utils.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "url/gurl.h"
 

net/spdy/spdy_proxy_client_socket.h

diff --git a/net/spdy/chromium/spdy_proxy_client_socket.h b/net/spdy/spdy_proxy_client_socket.h
similarity index 94%
rename from net/spdy/chromium/spdy_proxy_client_socket.h
rename to net/spdy/spdy_proxy_client_socket.h
index 62e3ebc9..c8ea7ad 100644
--- a/net/spdy/chromium/spdy_proxy_client_socket.h
+++ b/net/spdy/spdy_proxy_client_socket.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 NET_SPDY_CHROMIUM_SPDY_PROXY_CLIENT_SOCKET_H_
-#define NET_SPDY_CHROMIUM_SPDY_PROXY_CLIENT_SOCKET_H_
+#ifndef NET_SPDY_SPDY_PROXY_CLIENT_SOCKET_H_
+#define NET_SPDY_SPDY_PROXY_CLIENT_SOCKET_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -26,10 +26,10 @@
 #include "net/http/proxy_client_socket.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_with_source.h"
-#include "net/spdy/chromium/spdy_http_stream.h"
-#include "net/spdy/chromium/spdy_read_queue.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/spdy_http_stream.h"
+#include "net/spdy/spdy_read_queue.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_stream.h"
 #include "net/third_party/spdy/core/spdy_protocol.h"
 #include "net/third_party/spdy/platform/api/spdy_string.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
@@ -189,4 +189,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_PROXY_CLIENT_SOCKET_H_
+#endif  // NET_SPDY_SPDY_PROXY_CLIENT_SOCKET_H_

net/spdy/spdy_proxy_client_socket_unittest.cc

diff --git a/net/spdy/chromium/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
similarity index 99%
rename from net/spdy/chromium/spdy_proxy_client_socket_unittest.cc
rename to net/spdy/spdy_proxy_client_socket_unittest.cc
index 5f031b5..15b0f38c 100644
--- a/net/spdy/chromium/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_proxy_client_socket.h"
+#include "net/spdy/spdy_proxy_client_socket.h"
 
 #include <utility>
 
@@ -27,10 +27,10 @@
 #include "net/socket/socket_tag.h"
 #include "net/socket/socket_test_util.h"
 #include "net/socket/tcp_client_socket.h"
-#include "net/spdy/chromium/buffered_spdy_framer.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/buffered_spdy_framer.h"
+#include "net/spdy/spdy_http_utils.h"
+#include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"
 #include "net/test/test_data_directory.h"

net/spdy/spdy_read_queue.cc

diff --git a/net/spdy/chromium/spdy_read_queue.cc b/net/spdy/spdy_read_queue.cc
similarity index 93%
rename from net/spdy/chromium/spdy_read_queue.cc
rename to net/spdy/spdy_read_queue.cc
index 3975cb19..0c1eaf5d 100644
--- a/net/spdy/chromium/spdy_read_queue.cc
+++ b/net/spdy/spdy_read_queue.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_read_queue.h"
+#include "net/spdy/spdy_read_queue.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
-#include "net/spdy/chromium/spdy_buffer.h"
+#include "net/spdy/spdy_buffer.h"
 
 namespace net {
 

net/spdy/spdy_read_queue.h

diff --git a/net/spdy/chromium/spdy_read_queue.h b/net/spdy/spdy_read_queue.h
similarity index 89%
rename from net/spdy/chromium/spdy_read_queue.h
rename to net/spdy/spdy_read_queue.h
index 89c17da..73f1c67 100644
--- a/net/spdy/chromium/spdy_read_queue.h
+++ b/net/spdy/spdy_read_queue.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 NET_SPDY_CHROMIUM_SPDY_READ_QUEUE_H_
-#define NET_SPDY_CHROMIUM_SPDY_READ_QUEUE_H_
+#ifndef NET_SPDY_SPDY_READ_QUEUE_H_
+#define NET_SPDY_SPDY_READ_QUEUE_H_
 
 #include <cstddef>
 #include <memory>
@@ -50,4 +50,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_READ_QUEUE_H_
+#endif  // NET_SPDY_SPDY_READ_QUEUE_H_

net/spdy/spdy_read_queue_unittest.cc

diff --git a/net/spdy/chromium/spdy_read_queue_unittest.cc b/net/spdy/spdy_read_queue_unittest.cc
similarity index 97%
rename from net/spdy/chromium/spdy_read_queue_unittest.cc
rename to net/spdy/spdy_read_queue_unittest.cc
index 2f46165b..48e17983 100644
--- a/net/spdy/chromium/spdy_read_queue_unittest.cc
+++ b/net/spdy/spdy_read_queue_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_read_queue.h"
+#include "net/spdy/spdy_read_queue.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -11,7 +11,7 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/stl_util.h"
-#include "net/spdy/chromium/spdy_buffer.h"
+#include "net/spdy/spdy_buffer.h"
 #include "net/third_party/spdy/platform/api/spdy_string.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

net/spdy/spdy_session.cc

diff --git a/net/spdy/chromium/spdy_session.cc b/net/spdy/spdy_session.cc
similarity index 99%
rename from net/spdy/chromium/spdy_session.cc
rename to net/spdy/spdy_session.cc
index 86c7c62..0b7024b 100644
--- a/net/spdy/chromium/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/spdy_session.h"
 
 #include <algorithm>
 #include <limits>
@@ -43,12 +43,12 @@
 #include "net/quic/chromium/quic_http_utils.h"
 #include "net/socket/socket.h"
 #include "net/socket/ssl_client_socket.h"
-#include "net/spdy/chromium/header_coalescer.h"
-#include "net/spdy/chromium/spdy_buffer_producer.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
-#include "net/spdy/chromium/spdy_log_util.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/header_coalescer.h"
+#include "net/spdy/spdy_buffer_producer.h"
+#include "net/spdy/spdy_http_utils.h"
+#include "net/spdy/spdy_log_util.h"
+#include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_stream.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/ssl_cipher_suite_names.h"
 #include "net/ssl/ssl_connection_status_flags.h"

net/spdy/spdy_session.h

diff --git a/net/spdy/chromium/spdy_session.h b/net/spdy/spdy_session.h
similarity index 98%
rename from net/spdy/chromium/spdy_session.h
rename to net/spdy/spdy_session.h
index 0a31f4d..6167423 100644
--- a/net/spdy/chromium/spdy_session.h
+++ b/net/spdy/spdy_session.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 NET_SPDY_CHROMIUM_SPDY_SESSION_H_
-#define NET_SPDY_CHROMIUM_SPDY_SESSION_H_
+#ifndef NET_SPDY_SPDY_SESSION_H_
+#define NET_SPDY_SPDY_SESSION_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -33,15 +33,15 @@
 #include "net/socket/next_proto.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/stream_socket.h"
-#include "net/spdy/chromium/buffered_spdy_framer.h"
-#include "net/spdy/chromium/http2_priority_dependencies.h"
-#include "net/spdy/chromium/http2_push_promise_index.h"
-#include "net/spdy/chromium/multiplexed_session.h"
-#include "net/spdy/chromium/server_push_delegate.h"
-#include "net/spdy/chromium/spdy_buffer.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
-#include "net/spdy/chromium/spdy_stream.h"
-#include "net/spdy/chromium/spdy_write_queue.h"
+#include "net/spdy/buffered_spdy_framer.h"
+#include "net/spdy/http2_priority_dependencies.h"
+#include "net/spdy/http2_push_promise_index.h"
+#include "net/spdy/multiplexed_session.h"
+#include "net/spdy/server_push_delegate.h"
+#include "net/spdy/spdy_buffer.h"
+#include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_stream.h"
+#include "net/spdy/spdy_write_queue.h"
 #include "net/ssl/ssl_config_service.h"
 #include "net/third_party/spdy/core/spdy_alt_svc_wire_format.h"
 #include "net/third_party/spdy/core/spdy_framer.h"
@@ -1114,4 +1114,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_SESSION_H_
+#endif  // NET_SPDY_SPDY_SESSION_H_

net/spdy/spdy_session_fuzzer.cc

diff --git a/net/spdy/chromium/spdy_session_fuzzer.cc b/net/spdy/spdy_session_fuzzer.cc
similarity index 98%
rename from net/spdy/chromium/spdy_session_fuzzer.cc
rename to net/spdy/spdy_session_fuzzer.cc
index 2688728..fedffae 100644
--- a/net/spdy/chromium/spdy_session_fuzzer.cc
+++ b/net/spdy/spdy_session_fuzzer.cc
@@ -17,7 +17,7 @@
 #include "net/socket/socket_tag.h"
 #include "net/socket/socket_test_util.h"
 #include "net/socket/ssl_client_socket.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/ssl/ssl_config.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 

net/spdy/spdy_session_key.cc

diff --git a/net/spdy/chromium/spdy_session_key.cc b/net/spdy/spdy_session_key.cc
similarity index 97%
rename from net/spdy/chromium/spdy_session_key.cc
rename to net/spdy/spdy_session_key.cc
index b0c5a93..f1a0ef35 100644
--- a/net/spdy/chromium/spdy_session_key.cc
+++ b/net/spdy/spdy_session_key.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_session_key.h"
+#include "net/spdy/spdy_session_key.h"
 
 #include <tuple>
 

net/spdy/spdy_session_key.h

diff --git a/net/spdy/chromium/spdy_session_key.h b/net/spdy/spdy_session_key.h
similarity index 91%
rename from net/spdy/chromium/spdy_session_key.h
rename to net/spdy/spdy_session_key.h
index fe1e874..f529ced 100644
--- a/net/spdy/chromium/spdy_session_key.h
+++ b/net/spdy/spdy_session_key.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 NET_SPDY_CHROMIUM_SPDY_SESSION_KEY_H_
-#define NET_SPDY_CHROMIUM_SPDY_SESSION_KEY_H_
+#ifndef NET_SPDY_SPDY_SESSION_KEY_H_
+#define NET_SPDY_SPDY_SESSION_KEY_H_
 
 #include "net/base/net_export.h"
 #include "net/base/privacy_mode.h"
@@ -61,4 +61,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_SESSION_KEY_H_
+#endif  // NET_SPDY_SPDY_SESSION_KEY_H_

net/spdy/spdy_session_pool.cc

diff --git a/net/spdy/chromium/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
similarity index 98%
rename from net/spdy/chromium/spdy_session_pool.cc
rename to net/spdy/spdy_session_pool.cc
index ef1d03f..cec74848 100644
--- a/net/spdy/chromium/spdy_session_pool.cc
+++ b/net/spdy/spdy_session_pool.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_session_pool.h"
+#include "net/spdy/spdy_session_pool.h"
 
 #include <algorithm>
 #include <utility>
@@ -23,9 +23,9 @@
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_with_source.h"
-#include "net/spdy/chromium/bidirectional_stream_spdy_impl.h"
-#include "net/spdy/chromium/spdy_http_stream.h"
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/bidirectional_stream_spdy_impl.h"
+#include "net/spdy/spdy_http_stream.h"
+#include "net/spdy/spdy_session.h"
 #include "net/third_party/spdy/core/hpack/hpack_constants.h"
 #include "net/third_party/spdy/core/hpack/hpack_huffman_table.h"
 #include "net/third_party/spdy/core/hpack/hpack_static_table.h"

net/spdy/spdy_session_pool.h

diff --git a/net/spdy/chromium/spdy_session_pool.h b/net/spdy/spdy_session_pool.h
similarity index 97%
rename from net/spdy/chromium/spdy_session_pool.h
rename to net/spdy/spdy_session_pool.h
index 0eaa97fa..ffba837 100644
--- a/net/spdy/chromium/spdy_session_pool.h
+++ b/net/spdy/spdy_session_pool.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 NET_SPDY_CHROMIUM_SPDY_SESSION_POOL_H_
-#define NET_SPDY_CHROMIUM_SPDY_SESSION_POOL_H_
+#ifndef NET_SPDY_SPDY_SESSION_POOL_H_
+#define NET_SPDY_SPDY_SESSION_POOL_H_
 
 #include <stddef.h>
 
@@ -24,9 +24,9 @@
 #include "net/base/proxy_server.h"
 #include "net/cert/cert_database.h"
 #include "net/proxy_resolution/proxy_config.h"
-#include "net/spdy/chromium/http2_push_promise_index.h"
-#include "net/spdy/chromium/server_push_delegate.h"
-#include "net/spdy/chromium/spdy_session_key.h"
+#include "net/spdy/http2_push_promise_index.h"
+#include "net/spdy/server_push_delegate.h"
+#include "net/spdy/spdy_session_key.h"
 #include "net/ssl/ssl_config_service.h"
 #include "net/third_party/quic/core/quic_versions.h"
 #include "net/third_party/spdy/core/spdy_protocol.h"
@@ -289,4 +289,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_SESSION_POOL_H_
+#endif  // NET_SPDY_SPDY_SESSION_POOL_H_

net/spdy/spdy_session_pool_unittest.cc

diff --git a/net/spdy/chromium/spdy_session_pool_unittest.cc b/net/spdy/spdy_session_pool_unittest.cc
similarity index 99%
rename from net/spdy/chromium/spdy_session_pool_unittest.cc
rename to net/spdy/spdy_session_pool_unittest.cc
index 6cf8669..dc68a0be 100644
--- a/net/spdy/chromium/spdy_session_pool_unittest.cc
+++ b/net/spdy/spdy_session_pool_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_session_pool.h"
+#include "net/spdy/spdy_session_pool.h"
 
 #include <cstddef>
 #include <utility>
@@ -22,9 +22,9 @@
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/socket_tag.h"
 #include "net/socket/transport_client_socket_pool.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_stream_test_util.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_stream_test_util.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"
 #include "net/test/test_data_directory.h"

net/spdy/spdy_session_test_util.cc

diff --git a/net/spdy/chromium/spdy_session_test_util.cc b/net/spdy/spdy_session_test_util.cc
similarity index 95%
rename from net/spdy/chromium/spdy_session_test_util.cc
rename to net/spdy/spdy_session_test_util.cc
index 4baedbb..73cabb5 100644
--- a/net/spdy/chromium/spdy_session_test_util.cc
+++ b/net/spdy/spdy_session_test_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_session_test_util.h"
+#include "net/spdy/spdy_session_test_util.h"
 
 #include "base/location.h"
 #include "base/message_loop/message_loop_current.h"

net/spdy/spdy_session_test_util.h

diff --git a/net/spdy/chromium/spdy_session_test_util.h b/net/spdy/spdy_session_test_util.h
similarity index 90%
rename from net/spdy/chromium/spdy_session_test_util.h
rename to net/spdy/spdy_session_test_util.h
index 9d10055..a41d03d 100644
--- a/net/spdy/chromium/spdy_session_test_util.h
+++ b/net/spdy/spdy_session_test_util.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 NET_SPDY_CHROMIUM_SPDY_SESSION_TEST_UTIL_H_
-#define NET_SPDY_CHROMIUM_SPDY_SESSION_TEST_UTIL_H_
+#ifndef NET_SPDY_SPDY_SESSION_TEST_UTIL_H_
+#define NET_SPDY_SPDY_SESSION_TEST_UTIL_H_
 
 #include <stdint.h>
 
@@ -43,4 +43,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_SESSION_TEST_UTIL_H_
+#endif  // NET_SPDY_SPDY_SESSION_TEST_UTIL_H_

net/spdy/spdy_session_unittest.cc

diff --git a/net/spdy/chromium/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
similarity index 99%
rename from net/spdy/chromium/spdy_session_unittest.cc
rename to net/spdy/spdy_session_unittest.cc
index e138343..ae9e430 100644
--- a/net/spdy/chromium/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/spdy_session.h"
 
 #include <algorithm>
 #include <string>
@@ -34,12 +34,12 @@
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/socket/socket_tag.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
-#include "net/spdy/chromium/spdy_session_test_util.h"
-#include "net/spdy/chromium/spdy_stream.h"
-#include "net/spdy/chromium/spdy_stream_test_util.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_http_utils.h"
+#include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_session_test_util.h"
+#include "net/spdy/spdy_stream.h"
+#include "net/spdy/spdy_stream_test_util.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"
 #include "net/test/test_data_directory.h"

net/spdy/spdy_stream.cc

diff --git a/net/spdy/chromium/spdy_stream.cc b/net/spdy/spdy_stream.cc
similarity index 99%
rename from net/spdy/chromium/spdy_stream.cc
rename to net/spdy/spdy_stream.cc
index 8acac97..0139598 100644
--- a/net/spdy/chromium/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/spdy_stream.h"
 
 #include <algorithm>
 #include <limits>
@@ -20,9 +20,9 @@
 #include "net/log/net_log.h"
 #include "net/log/net_log_capture_mode.h"
 #include "net/log/net_log_event_type.h"
-#include "net/spdy/chromium/spdy_buffer_producer.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/spdy_buffer_producer.h"
+#include "net/spdy/spdy_http_utils.h"
+#include "net/spdy/spdy_session.h"
 #include "net/third_party/spdy/platform/api/spdy_estimate_memory_usage.h"
 #include "net/third_party/spdy/platform/api/spdy_string_piece.h"
 #include "net/third_party/spdy/platform/api/spdy_string_utils.h"

net/spdy/spdy_stream.h

diff --git a/net/spdy/chromium/spdy_stream.h b/net/spdy/spdy_stream.h
similarity index 98%
rename from net/spdy/chromium/spdy_stream.h
rename to net/spdy/spdy_stream.h
index dea2b63e26b..f1d7dcde 100644
--- a/net/spdy/chromium/spdy_stream.h
+++ b/net/spdy/spdy_stream.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 NET_SPDY_CHROMIUM_SPDY_STREAM_H_
-#define NET_SPDY_CHROMIUM_SPDY_STREAM_H_
+#ifndef NET_SPDY_SPDY_STREAM_H_
+#define NET_SPDY_SPDY_STREAM_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -22,7 +22,7 @@
 #include "net/log/net_log_with_source.h"
 #include "net/socket/next_proto.h"
 #include "net/socket/ssl_client_socket.h"
-#include "net/spdy/chromium/spdy_buffer.h"
+#include "net/spdy/spdy_buffer.h"
 #include "net/ssl/ssl_client_cert_type.h"
 #include "net/ssl/token_binding.h"
 #include "net/third_party/spdy/core/spdy_framer.h"
@@ -555,4 +555,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_STREAM_H_
+#endif  // NET_SPDY_SPDY_STREAM_H_

net/spdy/spdy_stream_test_util.cc

diff --git a/net/spdy/chromium/spdy_stream_test_util.cc b/net/spdy/spdy_stream_test_util.cc
similarity index 97%
rename from net/spdy/chromium/spdy_stream_test_util.cc
rename to net/spdy/spdy_stream_test_util.cc
index e936bd9..a8f4d76 100644
--- a/net/spdy/chromium/spdy_stream_test_util.cc
+++ b/net/spdy/spdy_stream_test_util.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_stream_test_util.h"
+#include "net/spdy/spdy_stream_test_util.h"
 
 #include <cstddef>
 #include <utility>
 
 #include "base/stl_util.h"
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/spdy_stream.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {

net/spdy/spdy_stream_test_util.h

diff --git a/net/spdy/chromium/spdy_stream_test_util.h b/net/spdy/spdy_stream_test_util.h
similarity index 94%
rename from net/spdy/chromium/spdy_stream_test_util.h
rename to net/spdy/spdy_stream_test_util.h
index fdef20f..0bd64c6 100644
--- a/net/spdy/chromium/spdy_stream_test_util.h
+++ b/net/spdy/spdy_stream_test_util.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 NET_SPDY_CHROMIUM_SPDY_STREAM_TEST_UTIL_H_
-#define NET_SPDY_CHROMIUM_SPDY_STREAM_TEST_UTIL_H_
+#ifndef NET_SPDY_SPDY_STREAM_TEST_UTIL_H_
+#define NET_SPDY_SPDY_STREAM_TEST_UTIL_H_
 
 #include <memory>
 
@@ -12,8 +12,8 @@
 #include "net/base/io_buffer.h"
 #include "net/base/test_completion_callback.h"
 #include "net/log/net_log_source.h"
-#include "net/spdy/chromium/spdy_read_queue.h"
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/spdy_read_queue.h"
+#include "net/spdy/spdy_stream.h"
 #include "net/third_party/spdy/platform/api/spdy_string_piece.h"
 
 namespace net {
@@ -145,4 +145,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_STREAM_TEST_UTIL_H_
+#endif  // NET_SPDY_SPDY_STREAM_TEST_UTIL_H_

net/spdy/spdy_stream_unittest.cc

diff --git a/net/spdy/chromium/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc
similarity index 98%
rename from net/spdy/chromium/spdy_stream_unittest.cc
rename to net/spdy/spdy_stream_unittest.cc
index 8144b7f..24e65da8 100644
--- a/net/spdy/chromium/spdy_stream_unittest.cc
+++ b/net/spdy/spdy_stream_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/spdy_stream.h"
 
 #include <stdint.h>
 
@@ -23,13 +23,13 @@
 #include "net/log/test_net_log_util.h"
 #include "net/socket/socket_tag.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/buffered_spdy_framer.h"
-#include "net/spdy/chromium/http2_push_promise_index.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
-#include "net/spdy/chromium/spdy_stream_test_util.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/buffered_spdy_framer.h"
+#include "net/spdy/http2_push_promise_index.h"
+#include "net/spdy/spdy_http_utils.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_stream_test_util.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"
 #include "net/test/test_data_directory.h"

net/spdy/spdy_test_util_common.cc

diff --git a/net/spdy/chromium/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
similarity index 99%
rename from net/spdy/chromium/spdy_test_util_common.cc
rename to net/spdy/spdy_test_util_common.cc
index 14bfc12..2ad3774 100644
--- a/net/spdy/chromium/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_test_util_common.h"
 
 #include <cstddef>
 #include <utility>
@@ -27,10 +27,10 @@
 #include "net/socket/socket_tag.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/transport_client_socket_pool.h"
-#include "net/spdy/chromium/buffered_spdy_framer.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
-#include "net/spdy/chromium/spdy_session_pool.h"
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/buffered_spdy_framer.h"
+#include "net/spdy/spdy_http_utils.h"
+#include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_stream.h"
 #include "net/test/gtest_util.h"
 #include "net/third_party/spdy/core/spdy_alt_svc_wire_format.h"
 #include "net/third_party/spdy/core/spdy_framer.h"

net/spdy/spdy_test_util_common.h

diff --git a/net/spdy/chromium/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h
similarity index 98%
rename from net/spdy/chromium/spdy_test_util_common.h
rename to net/spdy/spdy_test_util_common.h
index a628a86..c59bfd9f 100644
--- a/net/spdy/chromium/spdy_test_util_common.h
+++ b/net/spdy/spdy_test_util_common.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 NET_SPDY_CHROMIUM_SPDY_TEST_UTIL_COMMON_H_
-#define NET_SPDY_CHROMIUM_SPDY_TEST_UTIL_COMMON_H_
+#ifndef NET_SPDY_SPDY_TEST_UTIL_COMMON_H_
+#define NET_SPDY_SPDY_TEST_UTIL_COMMON_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -31,7 +31,7 @@
 #include "net/http/transport_security_state.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/spdy_session.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/third_party/spdy/core/spdy_protocol.h"
 #include "net/third_party/spdy/platform/api/spdy_string.h"
@@ -531,4 +531,4 @@
 }  // namespace test
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_TEST_UTIL_COMMON_H_
+#endif  // NET_SPDY_SPDY_TEST_UTIL_COMMON_H_

net/spdy/spdy_write_queue.cc

diff --git a/net/spdy/chromium/spdy_write_queue.cc b/net/spdy/spdy_write_queue.cc
similarity index 96%
rename from net/spdy/chromium/spdy_write_queue.cc
rename to net/spdy/spdy_write_queue.cc
index 6afadf4a..b1dfd3f3 100644
--- a/net/spdy/chromium/spdy_write_queue.cc
+++ b/net/spdy/spdy_write_queue.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_write_queue.h"
+#include "net/spdy/spdy_write_queue.h"
 
 #include <cstddef>
 #include <utility>
@@ -10,9 +10,9 @@
 
 #include "base/containers/circular_deque.h"
 #include "base/logging.h"
-#include "net/spdy/chromium/spdy_buffer.h"
-#include "net/spdy/chromium/spdy_buffer_producer.h"
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/spdy_buffer.h"
+#include "net/spdy/spdy_buffer_producer.h"
+#include "net/spdy/spdy_stream.h"
 #include "net/third_party/spdy/platform/api/spdy_estimate_memory_usage.h"
 
 namespace net {

net/spdy/spdy_write_queue.h

diff --git a/net/spdy/chromium/spdy_write_queue.h b/net/spdy/spdy_write_queue.h
similarity index 95%
rename from net/spdy/chromium/spdy_write_queue.h
rename to net/spdy/spdy_write_queue.h
index 1a17b227..6215a87 100644
--- a/net/spdy/chromium/spdy_write_queue.h
+++ b/net/spdy/spdy_write_queue.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 NET_SPDY_CHROMIUM_SPDY_WRITE_QUEUE_H_
-#define NET_SPDY_CHROMIUM_SPDY_WRITE_QUEUE_H_
+#ifndef NET_SPDY_SPDY_WRITE_QUEUE_H_
+#define NET_SPDY_SPDY_WRITE_QUEUE_H_
 
 #include <memory>
 
@@ -100,4 +100,4 @@
 
 }  // namespace net
 
-#endif  // NET_SPDY_CHROMIUM_SPDY_WRITE_QUEUE_H_
+#endif  // NET_SPDY_SPDY_WRITE_QUEUE_H_

net/spdy/spdy_write_queue_unittest.cc

diff --git a/net/spdy/chromium/spdy_write_queue_unittest.cc b/net/spdy/spdy_write_queue_unittest.cc
similarity index 98%
rename from net/spdy/chromium/spdy_write_queue_unittest.cc
rename to net/spdy/spdy_write_queue_unittest.cc
index 45d9871..261c8e35 100644
--- a/net/spdy/chromium/spdy_write_queue_unittest.cc
+++ b/net/spdy/spdy_write_queue_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/spdy/chromium/spdy_write_queue.h"
+#include "net/spdy/spdy_write_queue.h"
 
 #include <cstddef>
 #include <cstring>
@@ -13,8 +13,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "net/base/request_priority.h"
 #include "net/log/net_log_with_source.h"
-#include "net/spdy/chromium/spdy_buffer_producer.h"
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/spdy_buffer_producer.h"
+#include "net/spdy/spdy_stream.h"
 #include "net/third_party/spdy/platform/api/spdy_string.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"

net/test/net_test_suite.cc

diff --git a/net/test/net_test_suite.cc b/net/test/net_test_suite.cc
index 1234609d..ff4a288 100644
--- a/net/test/net_test_suite.cc
+++ b/net/test/net_test_suite.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "net/base/network_change_notifier.h"
 #include "net/http/http_stream_factory.h"
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/spdy_session.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

net/third_party/quic/tools/quic_http_response_cache.cc

diff --git a/net/third_party/quic/tools/quic_http_response_cache.cc b/net/third_party/quic/tools/quic_http_response_cache.cc
index 4fc8857..dea56ab 100644
--- a/net/third_party/quic/tools/quic_http_response_cache.cc
+++ b/net/third_party/quic/tools/quic_http_response_cache.cc
@@ -9,7 +9,7 @@
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "net/http/http_util.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
+#include "net/spdy/spdy_http_utils.h"
 #include "net/third_party/quic/platform/api/quic_bug_tracker.h"
 #include "net/third_party/quic/platform/api/quic_logging.h"
 #include "net/third_party/quic/platform/api/quic_map_util.h"

net/third_party/spdy/core/spdy_test_utils.h

diff --git a/net/third_party/spdy/core/spdy_test_utils.h b/net/third_party/spdy/core/spdy_test_utils.h
index ebb6029..86f2b65 100644
--- a/net/third_party/spdy/core/spdy_test_utils.h
+++ b/net/third_party/spdy/core/spdy_test_utils.h
@@ -11,7 +11,7 @@
 #include <map>
 #include <memory>
 
-#include "net/spdy/chromium/server_push_delegate.h"
+#include "net/spdy/server_push_delegate.h"
 #include "net/test/gtest_util.h"
 #include "net/third_party/spdy/core/spdy_bug_tracker.h"
 #include "net/third_party/spdy/core/spdy_header_block.h"

net/tools/quic/quic_client_message_loop_network_helper.cc

diff --git a/net/tools/quic/quic_client_message_loop_network_helper.cc b/net/tools/quic/quic_client_message_loop_network_helper.cc
index a8596fd3..0075af62 100644
--- a/net/tools/quic/quic_client_message_loop_network_helper.cc
+++ b/net/tools/quic/quic_client_message_loop_network_helper.cc
@@ -19,7 +19,7 @@
 #include "net/quic/chromium/quic_chromium_packet_reader.h"
 #include "net/quic/chromium/quic_chromium_packet_writer.h"
 #include "net/socket/udp_client_socket.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
+#include "net/spdy/spdy_http_utils.h"
 #include "net/third_party/quic/core/crypto/quic_random.h"
 #include "net/third_party/quic/core/quic_connection.h"
 #include "net/third_party/quic/core/quic_packets.h"

net/tools/quic/quic_simple_client.cc

diff --git a/net/tools/quic/quic_simple_client.cc b/net/tools/quic/quic_simple_client.cc
index dbaf012d..dbd6fff 100644
--- a/net/tools/quic/quic_simple_client.cc
+++ b/net/tools/quic/quic_simple_client.cc
@@ -19,7 +19,7 @@
 #include "net/quic/chromium/quic_chromium_packet_reader.h"
 #include "net/quic/chromium/quic_chromium_packet_writer.h"
 #include "net/socket/udp_client_socket.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
+#include "net/spdy/spdy_http_utils.h"
 #include "net/third_party/quic/core/crypto/quic_random.h"
 #include "net/third_party/quic/core/quic_connection.h"
 #include "net/third_party/quic/core/quic_packets.h"

net/tools/quic/quic_simple_client_bin.cc

diff --git a/net/tools/quic/quic_simple_client_bin.cc b/net/tools/quic/quic_simple_client_bin.cc
index 60867cd..33d143dd 100644
--- a/net/tools/quic/quic_simple_client_bin.cc
+++ b/net/tools/quic/quic_simple_client_bin.cc
@@ -54,7 +54,7 @@
 #include "net/cert/multi_log_ct_verifier.h"
 #include "net/http/transport_security_state.h"
 #include "net/quic/chromium/crypto/proof_verifier_chromium.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
+#include "net/spdy/spdy_http_utils.h"
 #include "net/third_party/quic/core/quic_error_codes.h"
 #include "net/third_party/quic/core/quic_packets.h"
 #include "net/third_party/quic/core/quic_server_id.h"

net/websockets/websocket_basic_stream_adapters.cc

diff --git a/net/websockets/websocket_basic_stream_adapters.cc b/net/websockets/websocket_basic_stream_adapters.cc
index bbbe993..662c4f7 100644
--- a/net/websockets/websocket_basic_stream_adapters.cc
+++ b/net/websockets/websocket_basic_stream_adapters.cc
@@ -15,7 +15,7 @@
 #include "net/base/io_buffer.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/socket.h"
-#include "net/spdy/chromium/spdy_buffer.h"
+#include "net/spdy/spdy_buffer.h"
 
 namespace net {
 

net/websockets/websocket_basic_stream_adapters.h

diff --git a/net/websockets/websocket_basic_stream_adapters.h b/net/websockets/websocket_basic_stream_adapters.h
index fa24fa0..8dfcac3 100644
--- a/net/websockets/websocket_basic_stream_adapters.h
+++ b/net/websockets/websocket_basic_stream_adapters.h
@@ -10,8 +10,8 @@
 #include "base/memory/weak_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
-#include "net/spdy/chromium/spdy_read_queue.h"
-#include "net/spdy/chromium/spdy_stream.h"
+#include "net/spdy/spdy_read_queue.h"
+#include "net/spdy/spdy_stream.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/websockets/websocket_basic_stream.h"
 

net/websockets/websocket_basic_stream_adapters_test.cc

diff --git a/net/websockets/websocket_basic_stream_adapters_test.cc b/net/websockets/websocket_basic_stream_adapters_test.cc
index 8ad47435..a67987005 100644
--- a/net/websockets/websocket_basic_stream_adapters_test.cc
+++ b/net/websockets/websocket_basic_stream_adapters_test.cc
@@ -26,9 +26,9 @@
 #include "net/socket/ssl_client_socket_pool.h"
 #include "net/socket/transport_client_socket_pool.h"
 #include "net/socket/websocket_endpoint_lock_manager.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_session_key.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_key.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/ssl/ssl_config.h"
 #include "net/ssl/ssl_info.h"
 #include "net/test/cert_test_util.h"

net/websockets/websocket_handshake_stream_create_helper_test.cc

diff --git a/net/websockets/websocket_handshake_stream_create_helper_test.cc b/net/websockets/websocket_handshake_stream_create_helper_test.cc
index 878f468..301471f 100644
--- a/net/websockets/websocket_handshake_stream_create_helper_test.cc
+++ b/net/websockets/websocket_handshake_stream_create_helper_test.cc
@@ -24,9 +24,9 @@
 #include "net/socket/socket_tag.h"
 #include "net/socket/socket_test_util.h"
 #include "net/socket/websocket_endpoint_lock_manager.h"
-#include "net/spdy/chromium/spdy_session.h"
-#include "net/spdy/chromium/spdy_session_key.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_key.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/ssl/ssl_config.h"
 #include "net/ssl/ssl_info.h"
 #include "net/test/cert_test_util.h"

net/websockets/websocket_http2_handshake_stream.cc

diff --git a/net/websockets/websocket_http2_handshake_stream.cc b/net/websockets/websocket_http2_handshake_stream.cc
index a9b2c83..4aa3b2b 100644
--- a/net/websockets/websocket_http2_handshake_stream.cc
+++ b/net/websockets/websocket_http2_handshake_stream.cc
@@ -15,8 +15,8 @@
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
-#include "net/spdy/chromium/spdy_http_utils.h"
-#include "net/spdy/chromium/spdy_session.h"
+#include "net/spdy/spdy_http_utils.h"
+#include "net/spdy/spdy_session.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/websockets/websocket_basic_stream.h"
 #include "net/websockets/websocket_deflate_parameters.h"

net/websockets/websocket_stream_test.cc

diff --git a/net/websockets/websocket_stream_test.cc b/net/websockets/websocket_stream_test.cc
index d82086ac..0eef60a 100644
--- a/net/websockets/websocket_stream_test.cc
+++ b/net/websockets/websocket_stream_test.cc
@@ -27,7 +27,7 @@
 #include "net/proxy_resolution/proxy_resolution_service.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/socket_test_util.h"
-#include "net/spdy/chromium/spdy_test_util_common.h"
+#include "net/spdy/spdy_test_util_common.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.h"
 #include "net/test/test_data_directory.h"

tools/traffic_annotation/summary/annotations.xml

diff --git a/tools/traffic_annotation/summary/annotations.xml b/tools/traffic_annotation/summary/annotations.xml
index 86db15a..cdc67ff7 100644
--- a/tools/traffic_annotation/summary/annotations.xml
+++ b/tools/traffic_annotation/summary/annotations.xml
@@ -221,8 +221,8 @@
  <item id="sigined_exchange_cert_fetcher" hash_code="79442849" type="0" content_hash_code="8138156" os_list="linux,windows" file_path="content/browser/web_package/signed_exchange_cert_fetcher.cc"/>
  <item id="signed_in_profile_avatar" hash_code="108903331" type="0" content_hash_code="72850619" os_list="linux,windows" file_path="chrome/browser/profiles/profile_downloader.cc"/>
  <item id="socket_bio_adapter" hash_code="516551" type="0" content_hash_code="21643352" os_list="linux,windows" file_path="net/socket/socket_bio_adapter.cc"/>
- <item id="spdy_push_stream" hash_code="36915753" type="0" content_hash_code="69224629" os_list="linux,windows" file_path="net/spdy/chromium/spdy_session.cc"/>
- <item id="spdy_session_control" hash_code="57143548" type="0" content_hash_code="29815792" os_list="linux,windows" file_path="net/spdy/chromium/spdy_session.cc"/>
+ <item id="spdy_push_stream" hash_code="36915753" type="0" content_hash_code="69224629" os_list="linux,windows" file_path="net/spdy/spdy_session.cc"/>
+ <item id="spdy_session_control" hash_code="57143548" type="0" content_hash_code="29815792" os_list="linux,windows" file_path="net/spdy/spdy_session.cc"/>
  <item id="speech_recognition_downstream" hash_code="26096088" type="0" content_hash_code="120733233" os_list="linux,windows" file_path="content/browser/speech/speech_recognition_engine.cc"/>
  <item id="speech_recognition_upstream" hash_code="66846958" type="0" content_hash_code="7706219" os_list="linux,windows" file_path="content/browser/speech/speech_recognition_engine.cc"/>
  <item id="spellcheck_hunspell_dictionary" hash_code="117649486" type="0" content_hash_code="45660952" os_list="linux,windows" file_path="chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc"/>