base::Bind: Convert net/proxy.

net/proxy/proxy_resolver_perftest.cc

 // 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.
 
 #include "base/base_paths.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/perftimer.h"
 #include "base/string_util.h"
@@ skipping 101 matching lines @@
   }
 
  private:
   void RunTest(const std::string& script_name,
                const PacQuery* queries,
                int queries_len) {
     if (!resolver_->expects_pac_bytes()) {
       GURL pac_url =
           test_server_.GetURL(std::string("files/") + script_name);
       int rv = resolver_->SetPacScript(
-          net::ProxyResolverScriptData::FromURL(pac_url), NULL);
+          net::ProxyResolverScriptData::FromURL(pac_url),
+          net::CompletionCallback());
       EXPECT_EQ(net::OK, rv);
     } 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"), &proxy_info, NULL, NULL,
-          net::BoundNetLog());
+          GURL("http://www.warmup.com"), &proxy_info, net::CompletionCallback(),
+          NULL, net::BoundNetLog());
       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),
-                                             &proxy_info, NULL, NULL,
-                                             net::BoundNetLog());
+      int result = resolver_->GetProxyForURL(
+          GURL(query.query_url), &proxy_info, net::CompletionCallback(), NULL,
+          net::BoundNetLog());
 
       // 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();
   }
@@ skipping 10 matching lines @@
     // 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.
     int rv = resolver_->SetPacScript(
-        net::ProxyResolverScriptData::FromUTF8(file_contents), NULL);
+        net::ProxyResolverScriptData::FromUTF8(file_contents),
+        net::CompletionCallback());
     EXPECT_EQ(net::OK, rv);
   }
 
   net::ProxyResolver* resolver_;
   std::string resolver_name_;
   net::TestServer test_server_;
 };
 
 #if defined(OS_WIN)
 TEST(ProxyResolverPerfTest, ProxyResolverWinHttp) {
@@ skipping 12 matching lines @@
 TEST(ProxyResolverPerfTest, ProxyResolverV8) {
   net::ProxyResolverJSBindings* js_bindings =
       net::ProxyResolverJSBindings::CreateDefault(
           new MockSyncHostResolver, NULL, NULL);
 
   net::ProxyResolverV8 resolver(js_bindings);
   PacPerfSuiteRunner runner(&resolver, "ProxyResolverV8");
   runner.RunAllTests();
 }