commit 4e180b6a0b4720a9b8e9e959a882386f690f08ff
author Torne (Richard Coles) <torne@google.com> Fri Oct 18 15:46:22 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Fri Oct 18 15:46:22 2013 +0100
tree 788435d09362885908ba5ba9ef868b852ca82c0b
parent 1179b92b08db0c652a0cf003ab4d89b31ce3610f

Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea

net/tools/flip_server/spdy_interface.h

diff --git a/net/tools/flip_server/spdy_interface.h b/net/tools/flip_server/spdy_interface.h
index 3ce1f3b..3b2e513 100644
--- a/net/tools/flip_server/spdy_interface.h
+++ b/net/tools/flip_server/spdy_interface.h
@@ -12,8 +12,8 @@
 #include "base/compiler_specific.h"
 #include "net/spdy/buffered_spdy_framer.h"
 #include "net/spdy/spdy_protocol.h"
-#include "net/tools/flip_server/balsa_headers.h"
-#include "net/tools/flip_server/balsa_visitor_interface.h"
+#include "net/tools/balsa/balsa_headers.h"
+#include "net/tools/balsa/balsa_visitor_interface.h"
 #include "net/tools/flip_server/output_ordering.h"
 #include "net/tools/flip_server/sm_connection.h"
 #include "net/tools/flip_server/sm_interface.h"