Refactor: Extract "InitProxyResolver" to "ProxyScriptDecider".

net/proxy/init_proxy_resolver_unittest.cc

Index: net/proxy/init_proxy_resolver_unittest.cc
===================================================================
--- net/proxy/init_proxy_resolver_unittest.cc	(revision 113525)
+++ net/proxy/init_proxy_resolver_unittest.cc	(working copy)
@@ -1,715 +0,0 @@
-// 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 <vector>
-
-#include "base/message_loop.h"
-#include "base/string_util.h"
-#include "base/time.h"
-#include "base/utf_string_conversions.h"
-#include "net/base/net_errors.h"
-#include "net/base/net_log.h"
-#include "net/base/net_log_unittest.h"
-#include "net/base/test_completion_callback.h"
-#include "net/proxy/init_proxy_resolver.h"
-#include "net/proxy/dhcp_proxy_script_fetcher.h"
-#include "net/proxy/proxy_config.h"
-#include "net/proxy/proxy_resolver.h"
-#include "net/proxy/proxy_script_fetcher.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace net {
-namespace {
-
-enum Error {
-  kFailedDownloading = -100,
-  kFailedParsing = -200,
-};
-
-class Rules {
- public:
-  struct Rule {
-    Rule(const GURL& url,
-         int fetch_error,
-         int set_pac_error)
-        : url(url),
-          fetch_error(fetch_error),
-          set_pac_error(set_pac_error) {
-    }
-
-    string16 text() const {
-      if (set_pac_error == OK)
-        return UTF8ToUTF16(url.spec() + "!valid-script");
-      if (fetch_error == OK)
-        return UTF8ToUTF16(url.spec() + "!invalid-script");
-      return string16();
-    }
-
-    GURL url;
-    int fetch_error;
-    int set_pac_error;
-  };
-
-  Rule AddSuccessRule(const char* url) {
-    Rule rule(GURL(url), OK /*fetch_error*/, OK /*set_pac_error*/);
-    rules_.push_back(rule);
-    return rule;
-  }
-
-  void AddFailDownloadRule(const char* url) {
-    rules_.push_back(Rule(GURL(url), kFailedDownloading /*fetch_error*/,
-        ERR_UNEXPECTED /*set_pac_error*/));
-  }
-
-  void AddFailParsingRule(const char* url) {
-    rules_.push_back(Rule(GURL(url), OK /*fetch_error*/,
-        kFailedParsing /*set_pac_error*/));
-  }
-
-  const Rule& GetRuleByUrl(const GURL& url) const {
-    for (RuleList::const_iterator it = rules_.begin(); it != rules_.end();
-         ++it) {
-      if (it->url == url)
-        return *it;
-    }
-    LOG(FATAL) << "Rule not found for " << url;
-    return rules_[0];
-  }
-
-  const Rule& GetRuleByText(const string16& text) const {
-    for (RuleList::const_iterator it = rules_.begin(); it != rules_.end();
-         ++it) {
-      if (it->text() == text)
-        return *it;
-    }
-    LOG(FATAL) << "Rule not found for " << text;
-    return rules_[0];
-  }
-
- private:
-  typedef std::vector<Rule> RuleList;
-  RuleList rules_;
-};
-
-class RuleBasedProxyScriptFetcher : public ProxyScriptFetcher {
- public:
-  explicit RuleBasedProxyScriptFetcher(const Rules* rules) : rules_(rules) {}
-
-  // ProxyScriptFetcher implementation.
-  virtual int Fetch(const GURL& url,
-                    string16* text,
-                    OldCompletionCallback* callback) {
-    const Rules::Rule& rule = rules_->GetRuleByUrl(url);
-    int rv = rule.fetch_error;
-    EXPECT_NE(ERR_UNEXPECTED, rv);
-    if (rv == OK)
-      *text = rule.text();
-    return rv;
-  }
-
-  virtual void Cancel() {}
-
-  virtual URLRequestContext* GetRequestContext() const { return NULL; }
-
- private:
-  const Rules* rules_;
-};
-
-class RuleBasedProxyResolver : public ProxyResolver {
- public:
-  RuleBasedProxyResolver(const Rules* rules, bool expects_pac_bytes)
-      : ProxyResolver(expects_pac_bytes), rules_(rules) {}
-
-  // ProxyResolver implementation:
-  virtual int GetProxyForURL(const GURL& /*url*/,
-                             ProxyInfo* /*results*/,
-                             OldCompletionCallback* /*callback*/,
-                             RequestHandle* /*request_handle*/,
-                             const BoundNetLog& /*net_log*/) {
-    NOTREACHED();
-    return ERR_UNEXPECTED;
-  }
-
-  virtual void CancelRequest(RequestHandle request_handle) {
-    NOTREACHED();
-  }
-
-  virtual LoadState GetLoadState(RequestHandle request_handle) const {
-    NOTREACHED();
-    return LOAD_STATE_IDLE;
-  }
-
-  virtual LoadState GetLoadStateThreadSafe(
-      RequestHandle request) const OVERRIDE {
-    NOTREACHED();
-    return LOAD_STATE_IDLE;
-  }
-
-  virtual void CancelSetPacScript() {
-    NOTREACHED();
-  }
-
-  virtual int SetPacScript(
-      const scoped_refptr<ProxyResolverScriptData>& script_data,
-      OldCompletionCallback* callback) {
-
-   const GURL url =
-      script_data->type() == ProxyResolverScriptData::TYPE_SCRIPT_URL ?
-          script_data->url() : GURL();
-
-    const Rules::Rule& rule = expects_pac_bytes() ?
-        rules_->GetRuleByText(script_data->utf16()) :
-        rules_->GetRuleByUrl(url);
-
-    int rv = rule.set_pac_error;
-    EXPECT_NE(ERR_UNEXPECTED, rv);
-
-    if (expects_pac_bytes()) {
-      EXPECT_EQ(rule.text(), script_data->utf16());
-    } else {
-      EXPECT_EQ(rule.url, url);
-    }
-
-    if (rv == OK)
-      script_data_ = script_data;
-    return rv;
-  }
-
-  const ProxyResolverScriptData* script_data() const { return script_data_; }
-
- private:
-  const Rules* rules_;
-  scoped_refptr<ProxyResolverScriptData> script_data_;
-};
-
-// Succeed using custom PAC script.
-TEST(InitProxyResolverTest, CustomPacSucceeds) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-  DoNothingDhcpProxyScriptFetcher dhcp_fetcher;
-
-  ProxyConfig config;
-  config.set_pac_url(GURL("http://custom/proxy.pac"));
-
-  Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac");
-
-  TestOldCompletionCallback callback;
-  CapturingNetLog log(CapturingNetLog::kUnbounded);
-  ProxyConfig effective_config;
-  InitProxyResolver init(&resolver, &fetcher, &dhcp_fetcher, &log);
-  EXPECT_EQ(OK, init.Init(
-      config, base::TimeDelta(), &effective_config, &callback));
-  EXPECT_EQ(rule.text(), resolver.script_data()->utf16());
-
-  // Check the NetLog was filled correctly.
-  CapturingNetLog::EntryList entries;
-  log.GetEntries(&entries);
-
-  EXPECT_EQ(6u, entries.size());
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 0, NetLog::TYPE_INIT_PROXY_RESOLVER));
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 1, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 2, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 3, NetLog::TYPE_INIT_PROXY_RESOLVER_SET_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 4, NetLog::TYPE_INIT_PROXY_RESOLVER_SET_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 5, NetLog::TYPE_INIT_PROXY_RESOLVER));
-
-  EXPECT_TRUE(effective_config.has_pac_url());
-  EXPECT_EQ(config.pac_url(), effective_config.pac_url());
-}
-
-// Fail downloading the custom PAC script.
-TEST(InitProxyResolverTest, CustomPacFails1) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-  DoNothingDhcpProxyScriptFetcher dhcp_fetcher;
-
-  ProxyConfig config;
-  config.set_pac_url(GURL("http://custom/proxy.pac"));
-
-  rules.AddFailDownloadRule("http://custom/proxy.pac");
-
-  TestOldCompletionCallback callback;
-  CapturingNetLog log(CapturingNetLog::kUnbounded);
-  ProxyConfig effective_config;
-  InitProxyResolver init(&resolver, &fetcher, &dhcp_fetcher, &log);
-  EXPECT_EQ(kFailedDownloading,
-            init.Init(config, base::TimeDelta(), &effective_config, &callback));
-  EXPECT_EQ(NULL, resolver.script_data());
-
-  // Check the NetLog was filled correctly.
-  CapturingNetLog::EntryList entries;
-  log.GetEntries(&entries);
-
-  EXPECT_EQ(4u, entries.size());
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 0, NetLog::TYPE_INIT_PROXY_RESOLVER));
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 1, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 2, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 3, NetLog::TYPE_INIT_PROXY_RESOLVER));
-
-  EXPECT_FALSE(effective_config.has_pac_url());
-}
-
-// Fail parsing the custom PAC script.
-TEST(InitProxyResolverTest, CustomPacFails2) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-  DoNothingDhcpProxyScriptFetcher dhcp_fetcher;
-
-  ProxyConfig config;
-  config.set_pac_url(GURL("http://custom/proxy.pac"));
-
-  rules.AddFailParsingRule("http://custom/proxy.pac");
-
-  TestOldCompletionCallback callback;
-  InitProxyResolver init(&resolver, &fetcher, &dhcp_fetcher, NULL);
-  EXPECT_EQ(kFailedParsing,
-            init.Init(config, base::TimeDelta(), NULL, &callback));
-  EXPECT_EQ(NULL, resolver.script_data());
-}
-
-// Fail downloading the custom PAC script, because the fetcher was NULL.
-TEST(InitProxyResolverTest, HasNullProxyScriptFetcher) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  DoNothingDhcpProxyScriptFetcher dhcp_fetcher;
-
-  ProxyConfig config;
-  config.set_pac_url(GURL("http://custom/proxy.pac"));
-
-  TestOldCompletionCallback callback;
-  InitProxyResolver init(&resolver, NULL, &dhcp_fetcher, NULL);
-  EXPECT_EQ(ERR_UNEXPECTED,
-            init.Init(config, base::TimeDelta(), NULL, &callback));
-  EXPECT_EQ(NULL, resolver.script_data());
-}
-
-// Succeeds in choosing autodetect (WPAD DNS).
-TEST(InitProxyResolverTest, AutodetectSuccess) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-  DoNothingDhcpProxyScriptFetcher dhcp_fetcher;
-
-  ProxyConfig config;
-  config.set_auto_detect(true);
-
-  Rules::Rule rule = rules.AddSuccessRule("http://wpad/wpad.dat");
-
-  TestOldCompletionCallback callback;
-  ProxyConfig effective_config;
-  InitProxyResolver init(&resolver, &fetcher, &dhcp_fetcher, NULL);
-  EXPECT_EQ(OK, init.Init(
-      config, base::TimeDelta(), &effective_config, &callback));
-  EXPECT_EQ(rule.text(), resolver.script_data()->utf16());
-
-  EXPECT_TRUE(effective_config.has_pac_url());
-  EXPECT_EQ(rule.url, effective_config.pac_url());
-}
-
-// Fails at WPAD (downloading), but succeeds in choosing the custom PAC.
-TEST(InitProxyResolverTest, AutodetectFailCustomSuccess1) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-  DoNothingDhcpProxyScriptFetcher dhcp_fetcher;
-
-  ProxyConfig config;
-  config.set_auto_detect(true);
-  config.set_pac_url(GURL("http://custom/proxy.pac"));
-
-  rules.AddFailDownloadRule("http://wpad/wpad.dat");
-  Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac");
-
-  TestOldCompletionCallback callback;
-  ProxyConfig effective_config;
-  InitProxyResolver init(&resolver, &fetcher, &dhcp_fetcher, NULL);
-  EXPECT_EQ(OK, init.Init(
-      config, base::TimeDelta(), &effective_config, &callback));
-  EXPECT_EQ(rule.text(), resolver.script_data()->utf16());
-
-  EXPECT_TRUE(effective_config.has_pac_url());
-  EXPECT_EQ(rule.url, effective_config.pac_url());
-}
-
-// Fails at WPAD (no DHCP config, DNS PAC fails parsing), but succeeds in
-// choosing the custom PAC.
-TEST(InitProxyResolverTest, AutodetectFailCustomSuccess2) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-  DoNothingDhcpProxyScriptFetcher dhcp_fetcher;
-
-  ProxyConfig config;
-  config.set_auto_detect(true);
-  config.set_pac_url(GURL("http://custom/proxy.pac"));
-  config.proxy_rules().ParseFromString("unused-manual-proxy:99");
-
-  rules.AddFailParsingRule("http://wpad/wpad.dat");
-  Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac");
-
-  TestOldCompletionCallback callback;
-  CapturingNetLog log(CapturingNetLog::kUnbounded);
-
-  ProxyConfig effective_config;
-  InitProxyResolver init(&resolver, &fetcher, &dhcp_fetcher, &log);
-  EXPECT_EQ(OK, init.Init(config, base::TimeDelta(),
-                          &effective_config, &callback));
-  EXPECT_EQ(rule.text(), resolver.script_data()->utf16());
-
-  // Verify that the effective configuration no longer contains auto detect or
-  // any of the manual settings.
-  EXPECT_TRUE(effective_config.Equals(
-      ProxyConfig::CreateFromCustomPacURL(GURL("http://custom/proxy.pac"))));
-
-  // Check the NetLog was filled correctly.
-  // (Note that various states are repeated since both WPAD and custom
-  // PAC scripts are tried).
-  CapturingNetLog::EntryList entries;
-  log.GetEntries(&entries);
-
-  EXPECT_EQ(14u, entries.size());
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 0, NetLog::TYPE_INIT_PROXY_RESOLVER));
-  // This is the DHCP phase, which fails fetching rather than parsing, so
-  // there is no pair of SET_PAC_SCRIPT events.
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 1, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 2, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEvent(
-      entries, 3,
-      NetLog::TYPE_INIT_PROXY_RESOLVER_FALLING_BACK_TO_NEXT_PAC_SOURCE,
-      NetLog::PHASE_NONE));
-  // This is the DNS phase, which attempts a fetch but fails.
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 4, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 5, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 6, NetLog::TYPE_INIT_PROXY_RESOLVER_SET_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 7, NetLog::TYPE_INIT_PROXY_RESOLVER_SET_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEvent(
-      entries, 8,
-      NetLog::TYPE_INIT_PROXY_RESOLVER_FALLING_BACK_TO_NEXT_PAC_SOURCE,
-      NetLog::PHASE_NONE));
-  // Finally, the custom PAC URL phase.
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 9, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 10, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 11, NetLog::TYPE_INIT_PROXY_RESOLVER_SET_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 12, NetLog::TYPE_INIT_PROXY_RESOLVER_SET_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 13, NetLog::TYPE_INIT_PROXY_RESOLVER));
-}
-
-// Fails at WPAD (downloading), and fails at custom PAC (downloading).
-TEST(InitProxyResolverTest, AutodetectFailCustomFails1) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-  DoNothingDhcpProxyScriptFetcher dhcp_fetcher;
-
-  ProxyConfig config;
-  config.set_auto_detect(true);
-  config.set_pac_url(GURL("http://custom/proxy.pac"));
-
-  rules.AddFailDownloadRule("http://wpad/wpad.dat");
-  rules.AddFailDownloadRule("http://custom/proxy.pac");
-
-  TestOldCompletionCallback callback;
-  InitProxyResolver init(&resolver, &fetcher, &dhcp_fetcher, NULL);
-  EXPECT_EQ(kFailedDownloading,
-            init.Init(config, base::TimeDelta(), NULL, &callback));
-  EXPECT_EQ(NULL, resolver.script_data());
-}
-
-// Fails at WPAD (downloading), and fails at custom PAC (parsing).
-TEST(InitProxyResolverTest, AutodetectFailCustomFails2) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-  DoNothingDhcpProxyScriptFetcher dhcp_fetcher;
-
-  ProxyConfig config;
-  config.set_auto_detect(true);
-  config.set_pac_url(GURL("http://custom/proxy.pac"));
-
-  rules.AddFailDownloadRule("http://wpad/wpad.dat");
-  rules.AddFailParsingRule("http://custom/proxy.pac");
-
-  TestOldCompletionCallback callback;
-  InitProxyResolver init(&resolver, &fetcher, &dhcp_fetcher, NULL);
-  EXPECT_EQ(kFailedParsing,
-            init.Init(config, base::TimeDelta(), NULL, &callback));
-  EXPECT_EQ(NULL, resolver.script_data());
-}
-
-// Fails at WPAD (parsing), but succeeds in choosing the custom PAC.
-// This is the same as AutodetectFailCustomSuccess2, but using a ProxyResolver
-// that doesn't |expects_pac_bytes|.
-TEST(InitProxyResolverTest, AutodetectFailCustomSuccess2_NoFetch) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, false /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-  DoNothingDhcpProxyScriptFetcher dhcp_fetcher;
-
-  ProxyConfig config;
-  config.set_auto_detect(true);
-  config.set_pac_url(GURL("http://custom/proxy.pac"));
-
-  rules.AddFailParsingRule("");  // Autodetect.
-  Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac");
-
-  TestOldCompletionCallback callback;
-  InitProxyResolver init(&resolver, &fetcher, &dhcp_fetcher, NULL);
-  EXPECT_EQ(OK, init.Init(config, base::TimeDelta(), NULL, &callback));
-  EXPECT_EQ(rule.url, resolver.script_data()->url());
-}
-
-// This is a copy-paste of CustomPacFails1, with the exception that we give it
-// a 1 millisecond delay. This means it will now complete asynchronously.
-// Moreover, we test the NetLog to make sure it logged the pause.
-TEST(InitProxyResolverTest, CustomPacFails1_WithPositiveDelay) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-  DoNothingDhcpProxyScriptFetcher dhcp_fetcher;
-
-  ProxyConfig config;
-  config.set_pac_url(GURL("http://custom/proxy.pac"));
-
-  rules.AddFailDownloadRule("http://custom/proxy.pac");
-
-  TestOldCompletionCallback callback;
-  CapturingNetLog log(CapturingNetLog::kUnbounded);
-  InitProxyResolver init(&resolver, &fetcher, &dhcp_fetcher, &log);
-  EXPECT_EQ(ERR_IO_PENDING,
-            init.Init(config, base::TimeDelta::FromMilliseconds(1),
-                      NULL, &callback));
-
-  EXPECT_EQ(kFailedDownloading, callback.WaitForResult());
-  EXPECT_EQ(NULL, resolver.script_data());
-
-  // Check the NetLog was filled correctly.
-  CapturingNetLog::EntryList entries;
-  log.GetEntries(&entries);
-
-  EXPECT_EQ(6u, entries.size());
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 0, NetLog::TYPE_INIT_PROXY_RESOLVER));
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 1, NetLog::TYPE_INIT_PROXY_RESOLVER_WAIT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 2, NetLog::TYPE_INIT_PROXY_RESOLVER_WAIT));
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 3, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 4, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 5, NetLog::TYPE_INIT_PROXY_RESOLVER));
-}
-
-// This is a copy-paste of CustomPacFails1, with the exception that we give it
-// a -5 second delay instead of a 0 ms delay. This change should have no effect
-// so the rest of the test is unchanged.
-TEST(InitProxyResolverTest, CustomPacFails1_WithNegativeDelay) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-  DoNothingDhcpProxyScriptFetcher dhcp_fetcher;
-
-  ProxyConfig config;
-  config.set_pac_url(GURL("http://custom/proxy.pac"));
-
-  rules.AddFailDownloadRule("http://custom/proxy.pac");
-
-  TestOldCompletionCallback callback;
-  CapturingNetLog log(CapturingNetLog::kUnbounded);
-  InitProxyResolver init(&resolver, &fetcher, &dhcp_fetcher, &log);
-  EXPECT_EQ(kFailedDownloading,
-            init.Init(config, base::TimeDelta::FromSeconds(-5),
-                      NULL, &callback));
-  EXPECT_EQ(NULL, resolver.script_data());
-
-  // Check the NetLog was filled correctly.
-  CapturingNetLog::EntryList entries;
-  log.GetEntries(&entries);
-
-  EXPECT_EQ(4u, entries.size());
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 0, NetLog::TYPE_INIT_PROXY_RESOLVER));
-  EXPECT_TRUE(LogContainsBeginEvent(
-      entries, 1, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 2, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
-  EXPECT_TRUE(LogContainsEndEvent(
-      entries, 3, NetLog::TYPE_INIT_PROXY_RESOLVER));
-}
-
-class SynchronousSuccessDhcpFetcher : public DhcpProxyScriptFetcher {
- public:
-  explicit SynchronousSuccessDhcpFetcher(const string16& expected_text)
-      : gurl_("http://dhcppac/"), expected_text_(expected_text) {
-  }
-
-  int Fetch(string16* utf16_text, OldCompletionCallback* callback) OVERRIDE {
-    *utf16_text = expected_text_;
-    return OK;
-  }
-
-  void Cancel() OVERRIDE {
-  }
-
-  const GURL& GetPacURL() const OVERRIDE {
-    return gurl_;
-  }
-
-  const string16& expected_text() const {
-    return expected_text_;
-  }
-
- private:
-  GURL gurl_;
-  string16 expected_text_;
-
-  DISALLOW_COPY_AND_ASSIGN(SynchronousSuccessDhcpFetcher);
-};
-
-// All of the tests above that use InitProxyResolver have tested
-// failure to fetch a PAC file via DHCP configuration, so we now test
-// success at downloading and parsing, and then success at downloading,
-// failure at parsing.
-
-TEST(InitProxyResolverTest, AutodetectDhcpSuccess) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-  SynchronousSuccessDhcpFetcher dhcp_fetcher(
-      WideToUTF16(L"http://bingo/!valid-script"));
-
-  ProxyConfig config;
-  config.set_auto_detect(true);
-
-  rules.AddSuccessRule("http://bingo/");
-  rules.AddFailDownloadRule("http://wpad/wpad.dat");
-
-  TestOldCompletionCallback callback;
-  ProxyConfig effective_config;
-  InitProxyResolver init(&resolver, &fetcher, &dhcp_fetcher, NULL);
-  EXPECT_EQ(OK, init.Init(
-      config, base::TimeDelta(), &effective_config, &callback));
-  EXPECT_EQ(dhcp_fetcher.expected_text(),
-            resolver.script_data()->utf16());
-
-  EXPECT_TRUE(effective_config.has_pac_url());
-  EXPECT_EQ(GURL("http://dhcppac/"), effective_config.pac_url());
-}
-
-TEST(InitProxyResolverTest, AutodetectDhcpFailParse) {
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-  SynchronousSuccessDhcpFetcher dhcp_fetcher(
-      WideToUTF16(L"http://bingo/!invalid-script"));
-
-  ProxyConfig config;
-  config.set_auto_detect(true);
-
-  rules.AddFailParsingRule("http://bingo/");
-  rules.AddFailDownloadRule("http://wpad/wpad.dat");
-
-  TestOldCompletionCallback callback;
-  ProxyConfig effective_config;
-  InitProxyResolver init(&resolver, &fetcher, &dhcp_fetcher, NULL);
-  // Since there is fallback to DNS-based WPAD, the final error will be that
-  // it failed downloading, not that it failed parsing.
-  EXPECT_EQ(kFailedDownloading,
-      init.Init(config, base::TimeDelta(), &effective_config, &callback));
-  EXPECT_EQ(NULL, resolver.script_data());
-
-  EXPECT_FALSE(effective_config.has_pac_url());
-}
-
-class AsyncFailDhcpFetcher
-    : public DhcpProxyScriptFetcher,
-      public base::RefCountedThreadSafe<AsyncFailDhcpFetcher> {
- public:
-  AsyncFailDhcpFetcher() : callback_(NULL) {
-  }
-
-  int Fetch(string16* utf16_text, OldCompletionCallback* callback) OVERRIDE {
-    callback_ = callback;
-    MessageLoop::current()->PostTask(
-        FROM_HERE,
-        NewRunnableMethod(this, &AsyncFailDhcpFetcher::CallbackWithFailure));
-    return ERR_IO_PENDING;
-  }
-
-  void Cancel() OVERRIDE {
-    callback_ = NULL;
-  }
-
-  const GURL& GetPacURL() const OVERRIDE {
-    return dummy_gurl_;
-  }
-
-  void CallbackWithFailure() {
-    if (callback_)
-      callback_->Run(ERR_PAC_NOT_IN_DHCP);
-  }
-
- private:
-  GURL dummy_gurl_;
-  OldCompletionCallback* callback_;
-};
-
-TEST(InitProxyResolverTest, DhcpCancelledByDestructor) {
-  // This regression test would crash before
-  // http://codereview.chromium.org/7044058/
-  // Thus, we don't care much about actual results (hence no EXPECT or ASSERT
-  // macros below), just that it doesn't crash.
-  Rules rules;
-  RuleBasedProxyResolver resolver(&rules, true /*expects_pac_bytes*/);
-  RuleBasedProxyScriptFetcher fetcher(&rules);
-
-  scoped_refptr<AsyncFailDhcpFetcher> dhcp_fetcher(new AsyncFailDhcpFetcher());
-
-  ProxyConfig config;
-  config.set_auto_detect(true);
-  rules.AddFailDownloadRule("http://wpad/wpad.dat");
-
-  TestOldCompletionCallback callback;
-
-  // Scope so InitProxyResolver gets destroyed early.
-  {
-    InitProxyResolver init(&resolver, &fetcher, dhcp_fetcher.get(), NULL);
-    init.Init(config, base::TimeDelta(), NULL, &callback);
-  }
-
-  // Run the message loop to let the DHCP fetch complete and post the results
-  // back. Before the fix linked to above, this would try to invoke on
-  // the callback object provided by InitProxyResolver after it was
-  // no longer valid.
-  MessageLoop::current()->RunAllPending();
-}
-
-}  // namespace
-}  // namespace net