NetLogEventParameter to Callback refactoring 7.

net/proxy/proxy_script_decider.h

 // Copyright (c) 2012 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_SCRIPT_DECIDER_H_
 #define NET_PROXY_PROXY_SCRIPT_DECIDER_H_
 #pragma once
 
+#include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
@@ skipping 63 matching lines @@
   struct PacSource {
     enum Type {
       WPAD_DHCP,
       WPAD_DNS,
       CUSTOM
     };
 
     PacSource(Type type, const GURL& url)
         : type(type), url(url) {}
 
+    // Returns a Value representing the PacSource.  |effective_pac_url| must
+    // be non-NULL and point to the URL derived from information contained in
+    // |this|, if Type is not WPAD_DHCP.
+    base::Value* NetLogCallback(const GURL* effective_pac_url,
+                                NetLog::LogLevel log_level) const;
+
     Type type;
     GURL url;  // Empty unless |type == PAC_SOURCE_CUSTOM|.
   };
 
   typedef std::vector<PacSource> PacSourceList;
 
   enum State {
     STATE_NONE,
     STATE_WAIT,
     STATE_WAIT_COMPLETE,
@@ skipping 22 matching lines @@
   // Tries restarting using the next fallback PAC URL:
   // |pac_sources_[++current_pac_source_index]|.
   // Returns OK and rewinds the state machine when there
   // is something to try, otherwise returns |error|.
   int TryToFallbackPacSource(int error);
 
   // Gets the initial state (we skip fetching when the
   // ProxyResolver doesn't |expect_pac_bytes()|.
   State GetStartState() const;
 
-  NetLogStringParameter* CreateNetLogParameterAndDetermineURL(
-      const PacSource& pac_source, GURL* effective_pac_url);
+  void DetermineURL(const PacSource& pac_source, GURL* effective_pac_url);
 
   // Returns the current PAC URL we are fetching/testing.
   const PacSource& current_pac_source() const;
 
   void OnWaitTimerFired();
   void DidComplete();
   void Cancel();
 
   ProxyResolver* resolver_;
   ProxyScriptFetcher* proxy_script_fetcher_;
@@ skipping 24 matching lines @@
   ProxyConfig effective_config_;
   scoped_refptr<ProxyResolverScriptData> script_data_;
 
 
   DISALLOW_COPY_AND_ASSIGN(ProxyScriptDecider);
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SCRIPT_DECIDER_H_