| OLD | NEW |
| 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/strings/stringprintf.h" | 11 #include "base/strings/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/request_priority.h" |
| 14 #include "net/cookies/cookie_monster.h" | 15 #include "net/cookies/cookie_monster.h" |
| 15 #include "net/disk_cache/disk_cache.h" | 16 #include "net/disk_cache/disk_cache.h" |
| 16 #include "net/dns/host_resolver_proc.h" | 17 #include "net/dns/host_resolver_proc.h" |
| 17 #include "net/http/http_auth_handler_factory.h" | 18 #include "net/http/http_auth_handler_factory.h" |
| 18 #include "net/http/http_cache.h" | 19 #include "net/http/http_cache.h" |
| 19 #include "net/http/http_network_session.h" | 20 #include "net/http/http_network_session.h" |
| 20 #include "net/proxy/proxy_service.h" | 21 #include "net/proxy/proxy_service.h" |
| 21 #include "net/url_request/url_request.h" | 22 #include "net/url_request/url_request.h" |
| 22 #include "net/url_request/url_request_test_util.h" | 23 #include "net/url_request/url_request_test_util.h" |
| 23 #include "testing/gtest/include/gtest/gtest.h" | 24 #include "testing/gtest/include/gtest/gtest.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 return h_; | 58 return h_; |
| 58 } | 59 } |
| 59 | 60 |
| 60 protected: | 61 protected: |
| 61 HINTERNET h_; | 62 HINTERNET h_; |
| 62 }; | 63 }; |
| 63 | 64 |
| 64 class TestURLRequest : public net::URLRequest { | 65 class TestURLRequest : public net::URLRequest { |
| 65 public: | 66 public: |
| 66 TestURLRequest(const GURL& url, | 67 TestURLRequest(const GURL& url, |
| 68 net::RequestPriority priority, |
| 67 Delegate* delegate, | 69 Delegate* delegate, |
| 68 net::TestURLRequestContext* context) | 70 const net::TestURLRequestContext* context) |
| 69 : net::URLRequest(url, delegate, context) { | 71 : net::URLRequest(url, priority, delegate, context) {} |
| 70 } | |
| 71 }; | 72 }; |
| 72 | 73 |
| 73 class UrlTaskChain { | 74 class UrlTaskChain { |
| 74 public: | 75 public: |
| 75 UrlTaskChain(const std::string& url, UrlTaskChain* next) | 76 UrlTaskChain(const std::string& url, UrlTaskChain* next) |
| 76 : url_(url), next_(next) { | 77 : url_(url), next_(next) { |
| 77 } | 78 } |
| 78 | 79 |
| 79 void Run() { | 80 void Run() { |
| 80 EXPECT_EQ(0, delegate_.response_started_count()); | 81 EXPECT_EQ(0, delegate_.response_started_count()); |
| 81 | 82 |
| 82 base::MessageLoopForIO loop; | 83 base::MessageLoopForIO loop; |
| 83 | 84 |
| 84 net::TestURLRequestContext context; | 85 net::TestURLRequestContext context; |
| 85 TestURLRequest r(GURL(url_), &delegate_, &context); | 86 TestURLRequest r(GURL(url_), net::DEFAULT_PRIORITY, &delegate_, &context); |
| 86 r.Start(); | 87 r.Start(); |
| 87 EXPECT_TRUE(r.is_pending()); | 88 EXPECT_TRUE(r.is_pending()); |
| 88 | 89 |
| 89 base::MessageLoop::current()->Run(); | 90 base::MessageLoop::current()->Run(); |
| 90 | 91 |
| 91 EXPECT_EQ(1, delegate_.response_started_count()); | 92 EXPECT_EQ(1, delegate_.response_started_count()); |
| 92 EXPECT_FALSE(delegate_.received_data_before_response()); | 93 EXPECT_FALSE(delegate_.received_data_before_response()); |
| 93 EXPECT_NE(0, delegate_.bytes_received()); | 94 EXPECT_NE(0, delegate_.bytes_received()); |
| 94 } | 95 } |
| 95 | 96 |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 EXPECT_EQ(file.accessed(), 1); | 188 EXPECT_EQ(file.accessed(), 1); |
| 188 EXPECT_EQ(redir.accessed(), 1); | 189 EXPECT_EQ(redir.accessed(), 1); |
| 189 | 190 |
| 190 EXPECT_TRUE(person_task.response().find("Guthrie") != std::string::npos); | 191 EXPECT_TRUE(person_task.response().find("Guthrie") != std::string::npos); |
| 191 EXPECT_TRUE(file_task.response().find("function") != std::string::npos); | 192 EXPECT_TRUE(file_task.response().find("function") != std::string::npos); |
| 192 EXPECT_TRUE(redir_task.response().find("Destination") != std::string::npos); | 193 EXPECT_TRUE(redir_task.response().find("Destination") != std::string::npos); |
| 193 } else { | 194 } else { |
| 194 ::TerminateThread(worker, ~0); | 195 ::TerminateThread(worker, ~0); |
| 195 } | 196 } |
| 196 } | 197 } |
| OLD | NEW |