Refactor: Extract "InitProxyResolver" to "ProxyScriptDecider".

net/proxy/proxy_service.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 12 matching lines @@
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_server.h"
 
 class GURL;
 class MessageLoop;
 
 namespace net {
 
 class DhcpProxyScriptFetcher;
 class HostResolver;
-class InitProxyResolver;
 class NetworkDelegate;
 class ProxyResolver;
+class ProxyScriptDecider;
 class ProxyScriptFetcher;
 
 // This class can be used to resolve the proxy server to use when loading a
 // HTTP(S) URL.  It uses the given ProxyResolver to handle the actual proxy
 // resolution.  See ProxyResolverV8 for example.
 class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
                                 public ProxyConfigService::Observer,
                                 NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   // The instance takes ownership of |config_service| and |resolver|.
@@ skipping 14 matching lines @@
   // callback is run.  The callback is run on the thread that calls
   // ResolveProxy.
   //
   // The caller is responsible for ensuring that |results| and |callback|
   // remain valid until the callback is run or until |pac_request| is cancelled
   // via CancelPacRequest.  |pac_request| is only valid while the completion
   // callback is still pending. NULL can be passed for |pac_request| if
   // the caller will not need to cancel the request.
   //
   // We use the three possible proxy access types in the following order,
-  // doing fallback if one doesn't work.  See "init_proxy_resolver.h"
+  // doing fallback if one doesn't work.  See "pac_script_decider.h"
   // for the specifics.
   //   1.  WPAD auto-detection
   //   2.  PAC URL
   //   3.  named proxy
   //
   // Profiling information for the request is saved to |net_log| if non-NULL.
   int ResolveProxy(const GURL& url,
                    ProxyInfo* results,
                    OldCompletionCallback* callback,
                    PacRequest** pac_request,
@@ skipping 157 matching lines @@
 
   // This method should only be used by unit tests.
   void set_stall_proxy_auto_config_delay(base::TimeDelta delay) {
     stall_proxy_auto_config_delay_ = delay;
   }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ProxyServiceTest, UpdateConfigAfterFailedAutodetect);
   FRIEND_TEST_ALL_PREFIXES(ProxyServiceTest, UpdateConfigFromPACToDirect);
   friend class PacRequest;
+  class InitProxyResolver;
 
   // TODO(eroman): change this to a std::set. Note that this requires updating
   // some tests in proxy_service_unittest.cc such as:
   //   ProxyServiceTest.InitialPACScriptDownload
   // which expects requests to finish in the order they were added.
   typedef std::vector<scoped_refptr<PacRequest> > PendingRequests;
 
   enum State {
     STATE_NONE,
     STATE_WAITING_FOR_PROXY_CONFIG,
@@ skipping 146 matching lines @@
 
   base::WaitableEvent event_;
   OldCompletionCallbackImpl<SyncProxyServiceHelper> callback_;
   ProxyInfo proxy_info_;
   int result_;
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SERVICE_H_