28 files changed, 99 insertions, 99 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index b7989d1..b6cff8e 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -20,13 +20,13 @@
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/disk_cache.h"
-#include "net/flip/flip_session_pool.h"
 #include "net/http/http_cache_transaction.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
+#include "net/spdy/spdy_session_pool.h"
 
 namespace net {
 
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index c8022b7..6e5df6a 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -6,13 +6,13 @@
 
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "net/flip/flip_framer.h"
-#include "net/flip/flip_network_transaction.h"
-#include "net/flip/flip_session.h"
-#include "net/flip/flip_session_pool.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_network_transaction.h"
 #include "net/socket/client_socket_factory.h"
+#include "net/spdy/spdy_framer.h"
+#include "net/spdy/spdy_network_transaction.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_pool.h"
 
 namespace net {
 
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 9f4cba7..40f8416 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -5,7 +5,7 @@
 #include "net/http/http_network_session.h"
 
 #include "base/logging.h"
-#include "net/flip/flip_session_pool.h"
+#include "net/spdy/spdy_session_pool.h"
 
 namespace net {
 
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index d89a84a..1ad8b6a 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -20,9 +20,6 @@
 #include "net/base/net_util.h"
 #include "net/base/ssl_cert_request_info.h"
 #include "net/base/upload_data_stream.h"
-#include "net/flip/flip_session.h"
-#include "net/flip/flip_session_pool.h"
-#include "net/flip/flip_stream.h"
 #include "net/http/http_auth.h"
 #include "net/http/http_auth_handler.h"
 #include "net/http/http_basic_stream.h"
@@ -36,6 +33,9 @@
 #include "net/socket/socks5_client_socket.h"
 #include "net/socket/socks_client_socket.h"
 #include "net/socket/ssl_client_socket.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_pool.h"
+#include "net/spdy/spdy_stream.h"
 
 using base::Time;
 
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 3b977bd..f3991ce 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -15,7 +15,7 @@
 #include "net/base/ssl_info.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/upload_data.h"
-#include "net/flip/flip_session_pool.h"
+#include "net/spdy/spdy_session_pool.h"
 #include "net/http/http_auth_handler_ntlm.h"
 #include "net/http/http_basic_stream.h"
 #include "net/http/http_network_session.h"
diff --git a/net/net.gyp b/net/net.gyp
index 3f63d82..31e3dc4 100755
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -274,23 +274,6 @@
         'disk_cache/storage_block.h',
         'disk_cache/trace.cc',
         'disk_cache/trace.h',
-        'flip/flip_bitmasks.h',
-        'flip/flip_frame_builder.cc',
-        'flip/flip_frame_builder.h',
-        'flip/flip_framer.cc',
-        'flip/flip_framer.h',
-        'flip/flip_io_buffer.cc',
-        'flip/flip_io_buffer.h',
-        'flip/flip_network_transaction.cc',
-        'flip/flip_network_transaction.h',
-        'flip/flip_protocol.h',
-        'flip/flip_session.cc',
-        'flip/flip_session.h',
-        'flip/flip_session_pool.cc',
-        'flip/flip_session_pool.h',
-        'flip/flip_stream.cc',
-        'flip/flip_stream.h',
-        'flip/flip_transaction_factory.h',
         'ftp/ftp_auth_cache.cc',
         'ftp/ftp_auth_cache.h',
         'ftp/ftp_ctrl_response_buffer.cc',
@@ -455,6 +438,23 @@
         'socket_stream/socket_stream_metrics.h',
         'socket_stream/socket_stream_throttle.cc',
         'socket_stream/socket_stream_throttle.h',
+        'spdy/spdy_bitmasks.h',
+        'spdy/spdy_frame_builder.cc',
+        'spdy/spdy_frame_builder.h',
+        'spdy/spdy_framer.cc',
+        'spdy/spdy_framer.h',
+        'spdy/spdy_io_buffer.cc',
+        'spdy/spdy_io_buffer.h',
+        'spdy/spdy_network_transaction.cc',
+        'spdy/spdy_network_transaction.h',
+        'spdy/spdy_protocol.h',
+        'spdy/spdy_session.cc',
+        'spdy/spdy_session.h',
+        'spdy/spdy_session_pool.cc',
+        'spdy/spdy_session_pool.h',
+        'spdy/spdy_stream.cc',
+        'spdy/spdy_stream.h',
+        'spdy/spdy_transaction_factory.h',
         'url_request/request_tracker.h',
         'url_request/url_request.cc',
         'url_request/url_request.h',
@@ -633,11 +633,6 @@
         'ftp/ftp_network_transaction_unittest.cc',
         'ftp/ftp_util_unittest.cc',
         'http/des_unittest.cc',
-        'flip/flip_framer_test.cc',
-        'flip/flip_network_transaction_unittest.cc',
-        'flip/flip_protocol_test.cc',
-        'flip/flip_session_unittest.cc',
-        'flip/flip_stream_unittest.cc',
         'http/http_auth_cache_unittest.cc',
         'http/http_auth_handler_basic_unittest.cc',
         'http/http_auth_handler_digest_unittest.cc',
@@ -674,6 +669,11 @@
         'socket/tcp_pinger_unittest.cc',
         'socket_stream/socket_stream_metrics_unittest.cc',
         'socket_stream/socket_stream_unittest.cc',
+        'spdy/spdy_framer_test.cc',
+        'spdy/spdy_network_transaction_unittest.cc',
+        'spdy/spdy_protocol_test.cc',
+        'spdy/spdy_session_unittest.cc',
+        'spdy/spdy_stream_unittest.cc',
         'url_request/request_tracker_unittest.cc',
         'url_request/url_request_unittest.cc',
         'url_request/url_request_unittest.h',
diff --git a/net/flip/flip_bitmasks.h b/net/spdy/spdy_bitmasks.h
index f5ed3c2..076a24d 100644
--- a/net/flip/flip_bitmasks.h
+++ b/net/spdy/spdy_bitmasks.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_FLIP_FLIP_BITMASKS_H_
-#define NET_FLIP_FLIP_BITMASKS_H_
+#ifndef NET_SPDY_SPDY_BITMASKS_H_
+#define NET_SPDY_SPDY_BITMASKS_H_
 
 namespace flip {
 
@@ -21,4 +21,4 @@ const unsigned int kLengthMask = 0xffffff;
 
 }  // flip
 
-#endif  // NET_FLIP_FLIP_BITMASKS_H_
+#endif  // NET_SPDY_SPDY_BITMASKS_H_
diff --git a/net/flip/flip_frame_builder.cc b/net/spdy/spdy_frame_builder.cc
index 61851b5..7c6333d 100644
--- a/net/flip/flip_frame_builder.cc
+++ b/net/spdy/spdy_frame_builder.cc
@@ -4,8 +4,8 @@
 
 #include <limits>
 
-#include "flip_frame_builder.h"    // cross-google3 directory naming.
-#include "flip_protocol.h"
+#include "net/spdy/spdy_frame_builder.h"
+#include "net/spdy/spdy_protocol.h"
 
 namespace flip {
 
diff --git a/net/flip/flip_frame_builder.h b/net/spdy/spdy_frame_builder.h
index 32b6035..240aae1f 100644
--- a/net/flip/flip_frame_builder.h
+++ b/net/spdy/spdy_frame_builder.h
@@ -14,7 +14,7 @@
 #include <string>
 
 #include "base/logging.h"
-#include "flip_protocol.h"  // cross-google3 directory naming.
+#include "net/spdy/spdy_protocol.h"
 
 namespace flip {
 
diff --git a/net/flip/flip_framer.cc b/net/spdy/spdy_framer.cc
index f200ac6..e78b42c 100644
--- a/net/flip/flip_framer.cc
+++ b/net/spdy/spdy_framer.cc
@@ -5,9 +5,9 @@
 #include "base/scoped_ptr.h"
 #include "base/stats_counters.h"
 
-#include "flip_framer.h"  // cross-google3 directory naming.
-#include "flip_frame_builder.h"
-#include "flip_bitmasks.h"
+#include "net/spdy/spdy_framer.h"
+#include "net/spdy/spdy_frame_builder.h"
+#include "net/spdy/spdy_bitmasks.h"
 
 #if defined(USE_SYSTEM_ZLIB)
 #include <zlib.h>
diff --git a/net/flip/flip_framer.h b/net/spdy/spdy_framer.h
index b333176..668e1f3 100644
--- a/net/flip/flip_framer.h
+++ b/net/spdy/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_FLIP_FLIP_FRAMER_H_
-#define NET_FLIP_FLIP_FRAMER_H_
+#ifndef NET_SPDY_SPDY_FRAMER_H_
+#define NET_SPDY_SPDY_FRAMER_H_
 
 #ifdef _WIN32
 #include <winsock2.h>
@@ -16,8 +16,8 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
+#include "net/spdy/spdy_protocol.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
-#include "flip_protocol.h"    // cross-google3 directory naming.
 
 typedef struct z_stream_s z_stream;  // Forward declaration for zlib.
 
@@ -226,7 +226,7 @@ class FlipFramer {
   // Not used (yet)
   size_t BytesSafeToRead() const;
 
-  // Set the error code.
+  // Set the error code and moves the framer into the error state.
   void set_error(FlipError error);
 
   // Expands the control frame buffer to accomodate a particular payload size.
@@ -256,5 +256,5 @@ class FlipFramer {
 
 }  // namespace flip
 
-#endif  // NET_FLIP_FLIP_FRAMER_H_
+#endif  // NET_SPDY_SPDY_FRAMER_H_
 
diff --git a/net/flip/flip_framer_test.cc b/net/spdy/spdy_framer_test.cc
index c78854d..21f2e68 100644
--- a/net/flip/flip_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -6,9 +6,9 @@
 #include <iostream>
 
 #include "base/scoped_ptr.h"
-#include "flip_framer.h"  // cross-google3 directory naming.
-#include "flip_protocol.h"
-#include "flip_frame_builder.h"
+#include "net/spdy/spdy_framer.h"
+#include "net/spdy/spdy_protocol.h"
+#include "net/spdy/spdy_frame_builder.h"
 #include "testing/platform_test.h"
 
 namespace flip {
diff --git a/net/flip/flip_io_buffer.cc b/net/spdy/spdy_io_buffer.cc
index 87d8d21..d26e4c3 100644
--- a/net/flip/flip_io_buffer.cc
+++ b/net/spdy/spdy_io_buffer.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/flip/flip_io_buffer.h"
-#include "net/flip/flip_stream.h"
+#include "net/spdy/spdy_io_buffer.h"
+#include "net/spdy/spdy_stream.h"
 
 namespace net {
 
diff --git a/net/flip/flip_io_buffer.h b/net/spdy/spdy_io_buffer.h
index c16c39c..08e40bb 100644
--- a/net/flip/flip_io_buffer.h
+++ b/net/spdy/spdy_io_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_FLIP_FLIP_IO_BUFFER_H_
-#define NET_FLIP_FLIP_IO_BUFFER_H_
+#ifndef NET_SPDY_SPDY_IO_BUFFER_H_
+#define NET_SPDY_SPDY_IO_BUFFER_H_
 
 #include "base/ref_counted.h"
 #include "net/base/io_buffer.h"
@@ -52,4 +52,4 @@ class FlipIOBuffer {
 
 }  // namespace net
 
-#endif  // NET_FLIP_FLIP_IO_BUFFER_H_
+#endif  // NET_SPDY_SPDY_IO_BUFFER_H_
diff --git a/net/flip/flip_network_transaction.cc b/net/spdy/spdy_network_transaction.cc
index 440e666..b578d38 100644
--- a/net/flip/flip_network_transaction.cc
+++ b/net/spdy/spdy_network_transaction.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/flip/flip_network_transaction.h"
+#include "net/spdy/spdy_network_transaction.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ -14,10 +14,10 @@
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/upload_data_stream.h"
-#include "net/flip/flip_stream.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_info.h"
+#include "net/spdy/spdy_stream.h"
 
 using base::Time;
 
diff --git a/net/flip/flip_network_transaction.h b/net/spdy/spdy_network_transaction.h
index 26084c3..9379cfa 100644
--- a/net/flip/flip_network_transaction.h
+++ b/net/spdy/spdy_network_transaction.h
@@ -14,9 +14,9 @@
 #include "base/time.h"
 #include "net/base/completion_callback.h"
 #include "net/base/load_states.h"
-#include "net/flip/flip_session.h"
 #include "net/http/http_response_info.h"
 #include "net/http/http_transaction.h"
+#include "net/spdy/spdy_session.h"
 
 namespace net {
 
diff --git a/net/flip/flip_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index 3dc1b90..0c879f7 100644
--- a/net/flip/flip_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_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/flip/flip_network_transaction.h"
+#include "net/spdy/spdy_network_transaction.h"
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
@@ -12,11 +12,11 @@
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/upload_data.h"
-#include "net/flip/flip_protocol.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_transaction_unittest.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/socket/socket_test_util.h"
+#include "net/spdy/spdy_protocol.h"
 #include "testing/platform_test.h"
 
 //-----------------------------------------------------------------------------
diff --git a/net/flip/flip_protocol.h b/net/spdy/spdy_protocol.h
index fb82ba6..455e5aa 100644
--- a/net/flip/flip_protocol.h
+++ b/net/spdy/spdy_protocol.h
@@ -4,8 +4,8 @@
 
 // This file contains some protocol structures for use with Flip.
 
-#ifndef NET_FLIP_FLIP_PROTOCOL_H_
-#define NET_FLIP_FLIP_PROTOCOL_H_
+#ifndef NET_SPDY_SPDY_PROTOCOL_H_
+#define NET_SPDY_SPDY_PROTOCOL_H_
 
 #ifdef WIN32
 #include <winsock2.h>
@@ -15,7 +15,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "flip_bitmasks.h"  // cross-google3 directory naming.
+#include "spdy_bitmasks.h"  // cross-google3 directory naming.
 
 //  Data Frame Format
 //  +----------------------------------+
@@ -384,4 +384,4 @@ class FlipFinStreamControlFrame : public FlipControlFrame {
 
 }  // namespace flip
 
-#endif  // NET_FLIP_FLIP_PROTOCOL_H_
+#endif  // NET_SPDY_SPDY_PROTOCOL_H_
diff --git a/net/flip/flip_protocol_test.cc b/net/spdy/spdy_protocol_test.cc
index 9a29149..d6e51e3 100644
--- a/net/flip/flip_protocol_test.cc
+++ b/net/spdy/spdy_protocol_test.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flip_protocol.h"
+#include "net/spdy/spdy_protocol.h"
 
 #include "base/scoped_ptr.h"
-#include "net/flip/flip_bitmasks.h"
-#include "net/flip/flip_framer.h"
+#include "net/spdy/spdy_bitmasks.h"
+#include "net/spdy/spdy_framer.h"
 #include "testing/platform_test.h"
 
 using flip::FlipDataFrame;
diff --git a/net/flip/flip_session.cc b/net/spdy/spdy_session.cc
index 47528fa..4a837c5 100644
--- a/net/flip/flip_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/flip/flip_session.h"
+#include "net/spdy/spdy_session.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ -15,9 +15,6 @@
 #include "net/base/load_flags.h"
 #include "net/base/load_log.h"
 #include "net/base/net_util.h"
-#include "net/flip/flip_frame_builder.h"
-#include "net/flip/flip_protocol.h"
-#include "net/flip/flip_stream.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_headers.h"
@@ -25,6 +22,9 @@
 #include "net/socket/client_socket.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/ssl_client_socket.h"
+#include "net/spdy/spdy_frame_builder.h"
+#include "net/spdy/spdy_protocol.h"
+#include "net/spdy/spdy_stream.h"
 #include "net/tools/dump_cache/url_to_filename_encoder.h"
 
 namespace {
diff --git a/net/flip/flip_session.h b/net/spdy/spdy_session.h
index f0af900..e91753d 100644
--- a/net/flip/flip_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_FLIP_FLIP_SESSION_H_
-#define NET_FLIP_FLIP_SESSION_H_
+#ifndef NET_SPDY_SPDY_SESSION_H_
+#define NET_SPDY_SPDY_SESSION_H_
 
 #include <deque>
 #include <list>
@@ -18,13 +18,13 @@
 #include "net/base/request_priority.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/upload_data_stream.h"
-#include "net/flip/flip_framer.h"
-#include "net/flip/flip_io_buffer.h"
-#include "net/flip/flip_protocol.h"
-#include "net/flip/flip_session_pool.h"
 #include "net/socket/client_socket.h"
 #include "net/socket/client_socket_handle.h"
 #include "testing/platform_test.h"
+#include "net/spdy/spdy_framer.h"
+#include "net/spdy/spdy_io_buffer.h"
+#include "net/spdy/spdy_protocol.h"
+#include "net/spdy/spdy_session_pool.h"
 
 namespace net {
 
@@ -234,4 +234,4 @@ class FlipSession : public base::RefCounted<FlipSession>,
 
 }  // namespace net
 
-#endif  // NET_FLIP_FLIP_SESSION_H_
+#endif  // NET_SPDY_SPDY_SESSION_H_
diff --git a/net/flip/flip_session_pool.cc b/net/spdy/spdy_session_pool.cc
index c45788b..13d9942 100644
--- a/net/flip/flip_session_pool.cc
+++ b/net/spdy/spdy_session_pool.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/flip/flip_session_pool.h"
+#include "net/spdy/spdy_session_pool.h"
 
 #include "base/logging.h"
-#include "net/flip/flip_session.h"
+#include "net/spdy/spdy_session.h"
 
 namespace net {
 
diff --git a/net/flip/flip_session_pool.h b/net/spdy/spdy_session_pool.h
index ebfe251..98d78dd 100644
--- a/net/flip/flip_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_FLIP_FLIP_SESSION_POOL_H_
-#define NET_FLIP_FLIP_SESSION_POOL_H_
+#ifndef NET_SPDY_SPDY_SESSION_POOL_H_
+#define NET_SPDY_SPDY_SESSION_POOL_H_
 
 #include <map>
 #include <list>
@@ -73,4 +73,4 @@ class FlipSessionPool : public base::RefCounted<FlipSessionPool> {
 
 }  // namespace net
 
-#endif  // NET_FLIP_FLIP_SESSION_POOL_H_
+#endif  // NET_SPDY_SPDY_SESSION_POOL_H_
diff --git a/net/flip/flip_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index ca048ea..57d6c2d 100644
--- a/net/flip/flip_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.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/flip/flip_io_buffer.h"
+#include "net/spdy/spdy_io_buffer.h"
 
 #include "net/base/test_completion_callback.h"
-#include "net/flip/flip_session.h"
-#include "net/flip/flip_stream.h"
 #include "net/socket/socket_test_util.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_stream.h"
 #include "testing/platform_test.h"
 
 namespace net {
diff --git a/net/flip/flip_stream.cc b/net/spdy/spdy_stream.cc
index 08106f0..78d263d 100644
--- a/net/flip/flip_stream.cc
+++ b/net/spdy/spdy_stream.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/flip/flip_stream.h"
+#include "net/spdy/spdy_stream.h"
 
 #include "base/logging.h"
-#include "net/flip/flip_session.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_info.h"
+#include "net/spdy/spdy_session.h"
 
 namespace net {
 
diff --git a/net/flip/flip_stream.h b/net/spdy/spdy_stream.h
index 083235b..ab2659e 100644
--- a/net/flip/flip_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_FLIP_FLIP_STREAM_H_
-#define NET_FLIP_FLIP_STREAM_H_
+#ifndef NET_SPDY_SPDY_STREAM_H_
+#define NET_SPDY_SPDY_STREAM_H_
 
 #include <string>
 #include <list>
@@ -16,8 +16,8 @@
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_log.h"
-#include "net/flip/flip_framer.h"
-#include "net/flip/flip_protocol.h"
+#include "net/spdy/spdy_framer.h"
+#include "net/spdy/spdy_protocol.h"
 
 namespace net {
 
@@ -208,4 +208,4 @@ class FlipStream : public base::RefCounted<FlipStream> {
 
 }  // namespace net
 
-#endif  // NET_FLIP_FLIP_STREAM_H_
+#endif  // NET_SPDY_SPDY_STREAM_H_
diff --git a/net/flip/flip_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc
index 5b3064a..f019b5f 100644
--- a/net/flip/flip_stream_unittest.cc
+++ b/net/spdy/spdy_stream_unittest.cc
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/flip/flip_stream.h"
+#include "net/spdy/spdy_stream.h"
 #include "base/ref_counted.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/base/test_completion_callback.h"
-#include "net/flip/flip_session.h"
-#include "net/flip/flip_session_pool.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_info.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/socket_test_util.h"
+#include "net/spdy/spdy_session.h"
+#include "net/spdy/spdy_session_pool.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
diff --git a/net/flip/flip_transaction_factory.h b/net/spdy/spdy_transaction_factory.h
index ce50686..46571bf 100644
--- a/net/flip/flip_transaction_factory.h
+++ b/net/spdy/spdy_transaction_factory.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_FLIP_FLIP_TRANSACTION_FACTORY_H__
-#define NET_FLIP_FLIP_TRANSACTION_FACTORY_H__
+#ifndef NET_SPDY_SPDY_TRANSACTION_FACTORY_H__
+#define NET_SPDY_SPDY_TRANSACTION_FACTORY_H__
 
-#include "net/flip/flip_network_transaction.h"
 #include "net/http/http_transaction_factory.h"
+#include "net/spdy/spdy_network_transaction.h"
 
 namespace net {
 
@@ -33,4 +33,4 @@ class FlipTransactionFactory : public HttpTransactionFactory {
 
 }  // namespace net
 
-#endif  // NET_FLIP_FLIP_TRANSACTION_FACTORY_H__
+#endif  // NET_SPDY_SPDY_TRANSACTION_FACTORY_H__