Revert 126559 - Broke XP Tests (2)

[net/dns] Serve requests from HOSTS file if possible.

If the DnsConfig is available, we can serve the requests synchronously in Resolve. However, we might not receive the DnsConfig until the Job is placed in the queue. In that case, we attempt to serve the jobs once DnsConfig is available.

BUG=114826
TEST=./net_unittests --gtest_filter=HostResolverImplTest.ServeFromHosts

Review URL: http://codereview.chromium.org/9667025

TBR=szym@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9701014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126573 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 1 insertions, 286 deletions

diff --git a/net/dns/dns_client.cc b/net/dns/dns_client.cc
deleted file mode 100644
index 5381452..0000000
--- a/net/dns/dns_client.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// 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.
-
-#include "net/dns/dns_client.h"
-
-#include "base/bind.h"
-#include "base/rand_util.h"
-#include "net/base/net_log.h"
-#include "net/dns/dns_config_service.h"
-#include "net/dns/dns_session.h"
-#include "net/dns/dns_transaction.h"
-#include "net/socket/client_socket_factory.h"
-
-namespace net {
-
-namespace {
-
-class DnsClientImpl : public DnsClient {
- public:
-  explicit DnsClientImpl(NetLog* net_log) : net_log_(net_log) {}
-
-  virtual void SetConfig(const DnsConfig& config) OVERRIDE {
-    factory_.reset();
-    session_.release();
-    if (config.IsValid()) {
-      session_ = new DnsSession(config,
-                                ClientSocketFactory::GetDefaultFactory(),
-                                base::Bind(&base::RandInt),
-                                net_log_);
-      factory_ = DnsTransactionFactory::CreateFactory(session_);
-    }
-  }
-
-  virtual const DnsConfig* GetConfig() const OVERRIDE {
-    return session_.get() ? &session_->config() : NULL;
-  }
-
-  virtual DnsTransactionFactory* GetTransactionFactory() OVERRIDE {
-    return session_.get() ? factory_.get() : NULL;
-  }
-
- private:
-  scoped_refptr<DnsSession> session_;
-  scoped_ptr<DnsTransactionFactory> factory_;
-
-  NetLog* net_log_;
-};
-
-}  // namespace
-
-// static
-scoped_ptr<DnsClient> DnsClient::CreateClient(NetLog* net_log) {
-  return scoped_ptr<DnsClient>(new DnsClientImpl(net_log));
-}
-
-}  // namespace net
-
diff --git a/net/dns/dns_client.h b/net/dns/dns_client.h
deleted file mode 100644
index c5461ec..0000000
--- a/net/dns/dns_client.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// 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_DNS_DNS_CLIENT_H_
-#define NET_DNS_DNS_CLIENT_H_
-#pragma once
-
-#include "base/memory/scoped_ptr.h"
-#include "net/base/net_export.h"
-
-namespace net {
-
-struct DnsConfig;
-class DnsTransactionFactory;
-class NetLog;
-
-// Convenience wrapper allows easy injection of DnsTransaction into
-// HostResolverImpl.
-class NET_EXPORT DnsClient {
- public:
-  virtual ~DnsClient() {}
-
-  // Creates a new DnsTransactionFactory according to the new |config|.
-  virtual void SetConfig(const DnsConfig& config) = 0;
-
-  // Returns NULL if the current config is not valid.
-  virtual const DnsConfig* GetConfig() const = 0;
-
-  // Returns NULL if the current config is not valid.
-  virtual DnsTransactionFactory* GetTransactionFactory() = 0;
-
-  // Creates default client.
-  static scoped_ptr<DnsClient> CreateClient(NetLog* net_log);
-};
-
-}  // namespace net
-
-#endif  // NET_DNS_DNS_CLIENT_H_
-
diff --git a/net/dns/dns_test_util.cc b/net/dns/dns_test_util.cc
deleted file mode 100644
index fa1bed1..0000000
--- a/net/dns/dns_test_util.cc
+++ /dev/null
@@ -1,166 +0,0 @@
-// 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.
-
-#include "net/dns/dns_test_util.h"
-
-#include <string>
-
-#include "base/bind.h"
-#include "base/memory/weak_ptr.h"
-#include "base/message_loop.h"
-#include "base/sys_byteorder.h"
-#include "net/base/big_endian.h"
-#include "net/base/dns_util.h"
-#include "net/base/io_buffer.h"
-#include "net/base/net_errors.h"
-#include "net/dns/dns_client.h"
-#include "net/dns/dns_config_service.h"
-#include "net/dns/dns_protocol.h"
-#include "net/dns/dns_query.h"
-#include "net/dns/dns_response.h"
-#include "net/dns/dns_transaction.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace net {
-namespace {
-
-// A DnsTransaction which responds with loopback to all queries starting with
-// "ok", fails synchronously on all queries starting with "er", and NXDOMAIN to
-// all others.
-class MockTransaction : public DnsTransaction,
-                        public base::SupportsWeakPtr<MockTransaction> {
- public:
-  MockTransaction(const std::string& hostname,
-                  uint16 qtype,
-                  const DnsTransactionFactory::CallbackType& callback)
-      : hostname_(hostname),
-        qtype_(qtype),
-        callback_(callback),
-        started_(false) {
-  }
-
-  virtual const std::string& GetHostname() const OVERRIDE {
-    return hostname_;
-  }
-
-  virtual uint16 GetType() const OVERRIDE {
-    return qtype_;
-  }
-
-  virtual int Start() OVERRIDE {
-    EXPECT_FALSE(started_);
-    started_ = true;
-    if (hostname_.substr(0, 2) == "er")
-      return ERR_NAME_NOT_RESOLVED;
-    // Using WeakPtr to cleanly cancel when transaction is destroyed.
-    MessageLoop::current()->PostTask(
-        FROM_HERE,
-        base::Bind(&MockTransaction::Finish, AsWeakPtr()));
-    return ERR_IO_PENDING;
-  }
-
- private:
-  void Finish() {
-    if (hostname_.substr(0, 2) == "ok") {
-      std::string qname;
-      DNSDomainFromDot(hostname_, &qname);
-      DnsQuery query(0, qname, qtype_);
-
-      DnsResponse response;
-      char* buffer = response.io_buffer()->data();
-      int nbytes = query.io_buffer()->size();
-      memcpy(buffer, query.io_buffer()->data(), nbytes);
-
-      const uint16 kPointerToQueryName =
-          static_cast<uint16>(0xc000 | sizeof(net::dns_protocol::Header));
-
-      const uint32 kTTL = 86400;  // One day.
-
-      // Size of RDATA which is a IPv4 or IPv6 address.
-      size_t rdata_size = qtype_ == net::dns_protocol::kTypeA ?
-                          net::kIPv4AddressSize : net::kIPv6AddressSize;
-
-      // 12 is the sum of sizes of the compressed name reference, TYPE,
-      // CLASS, TTL and RDLENGTH.
-      size_t answer_size = 12 + rdata_size;
-
-      // Write answer with loopback IP address.
-      reinterpret_cast<dns_protocol::Header*>(buffer)->ancount = htons(1);
-      BigEndianWriter writer(buffer + nbytes, answer_size);
-      writer.WriteU16(kPointerToQueryName);
-      writer.WriteU16(qtype_);
-      writer.WriteU16(net::dns_protocol::kClassIN);
-      writer.WriteU32(kTTL);
-      writer.WriteU16(rdata_size);
-      if (qtype_ == net::dns_protocol::kTypeA) {
-        char kIPv4Loopback[] = { 0x7f, 0, 0, 1 };
-        writer.WriteBytes(kIPv4Loopback, sizeof(kIPv4Loopback));
-      } else {
-        char kIPv6Loopback[] = { 0, 0, 0, 0, 0, 0, 0, 0,
-                                 0, 0, 0, 0, 0, 0, 0, 1 };
-        writer.WriteBytes(kIPv6Loopback, sizeof(kIPv6Loopback));
-      }
-
-      EXPECT_TRUE(response.InitParse(nbytes + answer_size, query));
-      callback_.Run(this, OK, &response);
-    } else {
-      callback_.Run(this, ERR_NAME_NOT_RESOLVED, NULL);
-    }
-  }
-
-  const std::string hostname_;
-  const uint16 qtype_;
-  DnsTransactionFactory::CallbackType callback_;
-  bool started_;
-};
-
-
-// A DnsTransactionFactory which creates MockTransaction.
-class MockTransactionFactory : public DnsTransactionFactory {
- public:
-  MockTransactionFactory() {}
-  virtual ~MockTransactionFactory() {}
-
-  virtual scoped_ptr<DnsTransaction> CreateTransaction(
-      const std::string& hostname,
-      uint16 qtype,
-      const DnsTransactionFactory::CallbackType& callback,
-      const BoundNetLog&) OVERRIDE {
-    return scoped_ptr<DnsTransaction>(
-        new MockTransaction(hostname, qtype, callback));
-  }
-};
-
-// MockDnsClient provides MockTransactionFactory.
-class MockDnsClient : public DnsClient {
- public:
-  explicit MockDnsClient(const DnsConfig& config) : config_(config) {}
-  virtual ~MockDnsClient() {}
-
-  virtual void SetConfig(const DnsConfig& config) OVERRIDE {
-    config_ = config;
-  }
-
-  virtual const DnsConfig* GetConfig() const OVERRIDE {
-    return config_.IsValid() ? &config_ : NULL;
-  }
-
-  virtual DnsTransactionFactory* GetTransactionFactory() OVERRIDE {
-    return config_.IsValid() ? &factory_ : NULL;
-  }
-
- private:
-  DnsConfig config_;
-  MockTransactionFactory factory_;
-};
-
-}  // namespace
-
-// static
-scoped_ptr<DnsClient> CreateMockDnsClient(const DnsConfig& config) {
-  return scoped_ptr<DnsClient>(new MockDnsClient(config));
-}
-
-}  // namespace net
-
diff --git a/net/dns/dns_test_util.h b/net/dns/dns_test_util.h
index e247be0..8d8c0a6 100644
--- a/net/dns/dns_test_util.h
+++ b/net/dns/dns_test_util.h
@@ -7,8 +7,6 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "net/dns/dns_config_service.h"
 #include "net/dns/dns_protocol.h"
 
 namespace net {
@@ -158,25 +156,6 @@ static const char* const kT3IpAddresses[] = {
 static const char kT3CanonName[] = "www.l.google.com";
 static const int kT3TTL = 0x00000015;
 
-class DnsClient;
-// Creates mock DnsClient for testing HostResolverImpl.
-scoped_ptr<DnsClient> CreateMockDnsClient(const DnsConfig& config);
-
-class MockDnsConfigService : public DnsConfigService {
- public:
-  virtual ~MockDnsConfigService() {}
-
-  // Expose the protected methods for tests.
-  void ChangeConfig(const DnsConfig& config) {
-    DnsConfigService::OnConfigRead(config);
-  }
-
-  void ChangeHosts(const DnsHosts& hosts) {
-    DnsConfigService::OnHostsRead(hosts);
-  }
-};
-
-
 }  // namespace net
 
 #endif  // NET_DNS_DNS_TEST_UTIL_H_
diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc
index 063c6ea..b865457 100644
--- a/net/dns/dns_transaction_unittest.cc
+++ b/net/dns/dns_transaction_unittest.cc
@@ -202,7 +202,7 @@ class DnsTransactionTest : public testing::Test {
     config_.nameservers.clear();
     IPAddressNumber dns_ip;
     {
-      bool rv = ParseIPLiteralToNumber("192.168.1.0", &dns_ip);
+      bool rv = ParseIPLiteralToNumber("192.128.1.0", &dns_ip);
       EXPECT_TRUE(rv);
     }
     for (unsigned i = 0; i < num_servers; ++i) {