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

Side by Side Diff: net/proxy/proxy_script_fetcher_unittest.cc

Issue 113043: Fix gconf for the linux proxy config service.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 years, 7 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
« no previous file with comments | « net/proxy/proxy_config_service_linux_unittest.cc ('k') | net/proxy/proxy_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2008 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 "net/proxy/proxy_script_fetcher.h" 5 #include "net/proxy/proxy_script_fetcher.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "net/base/net_util.h" 10 #include "net/base/net_util.h"
(...skipping 10 matching lines...) Expand all
21 struct FetchResult { 21 struct FetchResult {
22 int code; 22 int code;
23 std::string bytes; 23 std::string bytes;
24 }; 24 };
25 25
26 // A non-mock URL request which can access http:// and file:// urls. 26 // A non-mock URL request which can access http:// and file:// urls.
27 class RequestContext : public URLRequestContext { 27 class RequestContext : public URLRequestContext {
28 public: 28 public:
29 RequestContext() { 29 RequestContext() {
30 net::ProxyConfig no_proxy; 30 net::ProxyConfig no_proxy;
31 proxy_service_ = net::ProxyService::Create(&no_proxy); 31 proxy_service_ = net::ProxyService::CreateFixed(no_proxy);
32 http_transaction_factory_ = net::HttpNetworkLayer::CreateFactory( 32 http_transaction_factory_ = net::HttpNetworkLayer::CreateFactory(
33 proxy_service_); 33 proxy_service_);
34 } 34 }
35 ~RequestContext() { 35 ~RequestContext() {
36 delete http_transaction_factory_; 36 delete http_transaction_factory_;
37 delete proxy_service_; 37 delete proxy_service_;
38 } 38 }
39 }; 39 };
40 40
41 // Helper for doing synch fetches. This object lives in SynchFetcher's 41 // Helper for doing synch fetches. This object lives in SynchFetcher's
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 298
299 { // Make sure we can still fetch regular URLs. 299 { // Make sure we can still fetch regular URLs.
300 GURL url = server->TestServerPage("files/pac.nsproxy"); 300 GURL url = server->TestServerPage("files/pac.nsproxy");
301 FetchResult result = pac_fetcher.Fetch(url); 301 FetchResult result = pac_fetcher.Fetch(url);
302 EXPECT_EQ(net::OK, result.code); 302 EXPECT_EQ(net::OK, result.code);
303 EXPECT_EQ("-pac.nsproxy-\n", result.bytes); 303 EXPECT_EQ("-pac.nsproxy-\n", result.bytes);
304 } 304 }
305 } 305 }
306 306
307 } // namespace net 307 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_config_service_linux_unittest.cc ('k') | net/proxy/proxy_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698