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

net/proxy/proxy_service.h

 // Copyright (c) 2006-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.
 
 #ifndef NET_PROXY_PROXY_SERVICE_H_
 #define NET_PROXY_PROXY_SERVICE_H_
 
 #include <deque>
 #include <string>
 
@@ skipping 68 matching lines @@
                                 PacRequest** pac_request);
 
   // Call this method with a non-null |pac_request| to cancel the PAC request.
   void CancelPacRequest(PacRequest* pac_request);
 
   // Sets the ProxyScriptFetcher dependency. This is needed if the ProxyResolver
   // is of type ProxyResolverWithoutFetch. ProxyService takes ownership of
   // |proxy_script_fetcher|.
   void SetProxyScriptFetcher(ProxyScriptFetcher* proxy_script_fetcher);
 
-  // Creates a proxy service using the specified settings. If |pi| is NULL then
+  // Creates a proxy service using the specified settings. If |pc| is NULL then
   // the system's default proxy settings will be used (on Windows this will
   // use IE's settings).
-  static ProxyService* Create(const ProxyInfo* pi);
+  static ProxyService* Create(const ProxyConfig* pc);
 
-  // Creates a proxy service using the specified settings. If |pi| is NULL then
+  // Creates a proxy service using the specified settings. If |pc| is NULL then
   // the system's default proxy settings will be used. This is basically the
-  // same as Create(const ProxyInfo*), however under the hood it uses a
+  // same as Create(const ProxyConfig*), however under the hood it uses a
   // different implementation (V8). |url_request_context| is the URL request
   // context that will be used if a PAC script needs to be fetched.
   // ##########################################################################
   // # See the warnings in net/proxy/proxy_resolver_v8.h describing the
   // # multi-threading model. In order for this to be safe to use, *ALL* the
   // # other V8's running in the process must use v8::Locker.
   // ##########################################################################
   static ProxyService* CreateUsingV8Resolver(
-      const ProxyInfo* pi,
+      const ProxyConfig* pc,
       URLRequestContext* url_request_context);
 
   // Creates a proxy service that always fails to fetch the proxy configuration,
   // so it falls back to direct connect.
   static ProxyService* CreateNull();
 
  private:
   friend class PacRequest;
 
   ProxyResolver* resolver() { return resolver_.get(); }
@@ skipping 132 matching lines @@
 
   base::WaitableEvent event_;
   CompletionCallbackImpl<SyncProxyServiceHelper> callback_;
   ProxyInfo proxy_info_;
   int result_;
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SERVICE_H_