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

Unified Diff: chrome_frame/test/test_with_web_server.cc

Issue 13812005: net: move socket files from net/base to net/socket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort gyp Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/test_server.cc ('k') | content/browser/devtools/devtools_http_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/test_with_web_server.cc
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index ecb01a7737655cf0e320d43bb81a93e09fcc4178..905be343c6467d5d19a64a82f2eaaa7e9a73bb19 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -15,18 +15,18 @@
#include "base/utf_string_conversions.h"
#include "base/win/windows_version.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/installer/util/product.h"
-#include "chrome/installer/util/install_util.h"
#include "chrome/installer/util/helper.h"
+#include "chrome/installer/util/install_util.h"
+#include "chrome/installer/util/product.h"
#include "chrome_frame/html_utils.h"
-#include "chrome_frame/utils.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "chrome_frame/test/mock_ie_event_sink_actions.h"
#include "chrome_frame/test/mock_ie_event_sink_test.h"
#include "chrome_frame/test/test_scrubber.h"
+#include "chrome_frame/utils.h"
#include "net/base/mime_util.h"
-#include "net/base/stream_listen_socket.h"
#include "net/http/http_util.h"
+#include "net/socket/stream_listen_socket.h"
using chrome_frame_test::kChromeFrameLongNavigationTimeout;
using chrome_frame_test::kChromeFrameVeryLongNavigationTimeout;
« no previous file with comments | « chrome_frame/test/test_server.cc ('k') | content/browser/devtools/devtools_http_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698