Remove the concept of threading from ProxyService, and move it into the Proxy...

net/proxy/proxy_resolver_perftest.cc

 // Copyright (c) 2009 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 "base/perftimer.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/proxy/proxy_resolver_v8.h"
 #include "net/url_request/url_request_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 74 matching lines @@
       RunTest(test_data.pac_name,
               test_data.queries,
               test_data.NumQueries());
     }
   }
 
  private:
   void RunTest(const std::string& script_name,
                const PacQuery* queries,
                int queries_len) {
-    GURL pac_url;
-
-    if (resolver_->does_fetch()) {
+    if (!resolver_->expects_pac_bytes()) {
       InitHttpServer();
-      pac_url = server_->TestServerPage(std::string("files/") + script_name);
+      GURL pac_url =
+          server_->TestServerPage(std::string("files/") + script_name);
+      resolver_->SetPacScriptByUrl(pac_url);
     } else {
       LoadPacScriptIntoResolver(script_name);
     }
 
     // Do a query to warm things up. In the case of internal-fetch proxy
     // resolvers, the first resolve will be slow since it has to download
     // the PAC script.
     {
       net::ProxyInfo proxy_info;
       int result = resolver_->GetProxyForURL(
-          GURL("http://www.warmup.com"), pac_url, &proxy_info);
+          GURL("http://www.warmup.com"), &proxy_info, NULL, NULL);
       ASSERT_EQ(net::OK, result);
     }
 
     // Start the perf timer.
     std::string perf_test_name = resolver_name_ + "_" + script_name;
     PerfTimeLogger timer(perf_test_name.c_str());
 
     for (int i = 0; i < kNumIterations; ++i) {
       // Round-robin between URLs to resolve.
       const PacQuery& query = queries[i % queries_len];
 
       // Resolve.
       net::ProxyInfo proxy_info;
       int result = resolver_->GetProxyForURL(GURL(query.query_url),
-                                             pac_url,
-                                             &proxy_info);
+                                             &proxy_info, NULL, NULL);
 
       // Check that the result was correct. Note that ToPacString() and
       // ASSERT_EQ() are fast, so they won't skew the results.
       ASSERT_EQ(net::OK, result);
       ASSERT_EQ(query.expected_result, proxy_info.ToPacString());
     }
 
     // Print how long the test ran for.
     timer.Done();
   }
 
   // Lazily startup an HTTP server (to serve the PAC script).
   void InitHttpServer() {
-    DCHECK(resolver_->does_fetch());
+    DCHECK(!resolver_->expects_pac_bytes());
     if (!server_) {
       server_ = HTTPTestServer::CreateServer(
           L"net/data/proxy_resolver_perftest", NULL);
     }
     ASSERT_TRUE(server_.get() != NULL);
   }
 
   // Read the PAC script from disk and initialize the proxy resolver with it.
   void LoadPacScriptIntoResolver(const std::string& script_name) {
     FilePath path;
     PathService::Get(base::DIR_SOURCE_ROOT, &path);
     path = path.AppendASCII("net");
     path = path.AppendASCII("data");
     path = path.AppendASCII("proxy_resolver_perftest");
     path = path.AppendASCII(script_name);
 
     // Try to read the file from disk.
     std::string file_contents;
     bool ok = file_util::ReadFileToString(path, &file_contents);
 
     // If we can't load the file from disk, something is misconfigured.
     LOG_IF(ERROR, !ok) << "Failed to read file: " << path.value();
     ASSERT_TRUE(ok);
 
     // Load the PAC script into the ProxyResolver.
-    resolver_->SetPacScript(file_contents);
+    resolver_->SetPacScriptByData(file_contents);
   }
 
   net::ProxyResolver* resolver_;
   std::string resolver_name_;
   scoped_refptr<HTTPTestServer> server_;
 };
 
 #if defined(OS_WIN)
 TEST(ProxyResolverPerfTest, ProxyResolverWinHttp) {
   net::ProxyResolverWinHttp resolver;
@@ skipping 10 matching lines @@
 
 TEST(ProxyResolverPerfTest, ProxyResolverV8) {
   net::ProxyResolverV8::JSBindings* js_bindings =
       net::ProxyResolverV8::CreateDefaultBindings(
           new net::MockHostResolver, NULL);
 
   net::ProxyResolverV8 resolver(js_bindings);
   PacPerfSuiteRunner runner(&resolver, "ProxyResolverV8");
   runner.RunAllTests();
 }