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

Side by Side Diff: chrome_frame/test/test_server_test.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <windows.h> 5 #include <windows.h>
6 #include <wininet.h> 6 #include <wininet.h>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
12 #include "base/win/scoped_handle.h" 12 #include "base/win/scoped_handle.h"
13 #include "chrome_frame/test/test_server.h" 13 #include "chrome_frame/test/test_server.h"
14 #include "net/base/host_resolver_proc.h"
15 #include "net/cookies/cookie_monster.h" 14 #include "net/cookies/cookie_monster.h"
16 #include "net/disk_cache/disk_cache.h" 15 #include "net/disk_cache/disk_cache.h"
16 #include "net/dns/host_resolver_proc.h"
17 #include "net/http/http_auth_handler_factory.h" 17 #include "net/http/http_auth_handler_factory.h"
18 #include "net/http/http_cache.h" 18 #include "net/http/http_cache.h"
19 #include "net/http/http_network_session.h" 19 #include "net/http/http_network_session.h"
20 #include "net/proxy/proxy_service.h" 20 #include "net/proxy/proxy_service.h"
21 #include "net/url_request/url_request.h" 21 #include "net/url_request/url_request.h"
22 #include "net/url_request/url_request_test_util.h" 22 #include "net/url_request/url_request_test_util.h"
23 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
24 24
25 class TestServerTest: public testing::Test { 25 class TestServerTest: public testing::Test {
26 protected: 26 protected:
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 EXPECT_EQ(file.accessed(), 1); 187 EXPECT_EQ(file.accessed(), 1);
188 EXPECT_EQ(redir.accessed(), 1); 188 EXPECT_EQ(redir.accessed(), 1);
189 189
190 EXPECT_TRUE(person_task.response().find("Guthrie") != std::string::npos); 190 EXPECT_TRUE(person_task.response().find("Guthrie") != std::string::npos);
191 EXPECT_TRUE(file_task.response().find("function") != std::string::npos); 191 EXPECT_TRUE(file_task.response().find("function") != std::string::npos);
192 EXPECT_TRUE(redir_task.response().find("Destination") != std::string::npos); 192 EXPECT_TRUE(redir_task.response().find("Destination") != std::string::npos);
193 } else { 193 } else {
194 ::TerminateThread(worker, ~0); 194 ::TerminateThread(worker, ~0);
195 } 195 }
196 } 196 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698