Making command-line specified proxy settings more flexible - allowing for set...

net/proxy/proxy_script_fetcher_unittest.cc

 // Copyright (c) 2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/proxy_script_fetcher.h"
 
 #include "base/file_path.h"
 #include "base/compiler_specific.h"
 #include "base/path_service.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 // TODO(eroman):
 //   - Test canceling an outstanding request.
 //   - Test deleting ProxyScriptFetcher while a request is in progress.
 
 const wchar_t kDocRoot[] = L"net/data/proxy_script_fetcher_unittest";
 
 struct FetchResult {
   int code;
   std::string bytes;
 };
 
 // A non-mock URL request which can access http:// and file:// urls.
 class RequestContext : public URLRequestContext {
  public:
   RequestContext() {
-    net::ProxyInfo no_proxy;
+    net::ProxyConfig no_proxy;
     proxy_service_ = net::ProxyService::Create(&no_proxy);
     http_transaction_factory_ = net::HttpNetworkLayer::CreateFactory(
         proxy_service_);
   }
   ~RequestContext() {
     delete http_transaction_factory_;
     delete proxy_service_;
   }
 };
 
@@ skipping 257 matching lines @@
 
   { // Make sure we can still fetch regular URLs.
     GURL url = server->TestServerPage("files/pac.nsproxy");
     FetchResult result = pac_fetcher.Fetch(url);
     EXPECT_EQ(net::OK, result.code);
     EXPECT_EQ("-pac.nsproxy-\n", result.bytes);
   }
 }
 
 }  // namespace net