Adds support for the DHCP portion of the WPAD (proxy auto-discovery) protocol.

net/proxy/proxy_service_unittest.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 "net/proxy/proxy_service.h"
 
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.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/mock_proxy_resolver.h"
+#include "net/proxy/mock_proxy_script_fetcher.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_resolver.h"
 #include "net/proxy/proxy_script_fetcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // TODO(eroman): Write a test which exercises
 //              ProxyService::SuspendAllPendingRequests().
 namespace net {
 namespace {
 
@@ skipping 31 matching lines @@
   }
 
  private:
   ConfigAvailability availability_;
   ProxyConfig config_;
   ObserverList<Observer, true> observers_;
 };
 
 }  // namespace
 
-// A mock ProxyScriptFetcher. No result will be returned to the fetch client
-// until we call NotifyFetchCompletion() to set the results.
-class MockProxyScriptFetcher : public ProxyScriptFetcher {
- public:
-  MockProxyScriptFetcher()
-      : pending_request_callback_(NULL), pending_request_text_(NULL) {
-  }
-
-  // ProxyScriptFetcher implementation.
-  virtual int Fetch(const GURL& url,
-                    string16* text,
-                    CompletionCallback* callback) {
-    DCHECK(!has_pending_request());
-
-    // Save the caller's information, and have them wait.
-    pending_request_url_ = url;
-    pending_request_callback_ = callback;
-    pending_request_text_ = text;
-    return ERR_IO_PENDING;
-  }
-
-  void NotifyFetchCompletion(int result, const std::string& ascii_text) {
-    DCHECK(has_pending_request());
-    *pending_request_text_ = ASCIIToUTF16(ascii_text);
-    CompletionCallback* callback = pending_request_callback_;
-    pending_request_callback_ = NULL;
-    callback->Run(result);
-  }
-
-  virtual void Cancel() {}
-
-  virtual URLRequestContext* GetRequestContext() { return NULL; }
-
-  const GURL& pending_request_url() const {
-    return pending_request_url_;
-  }
-
-  bool has_pending_request() const {
-    return pending_request_callback_ != NULL;
-  }
-
- private:
-  GURL pending_request_url_;
-  CompletionCallback* pending_request_callback_;
-  string16* pending_request_text_;
-};
-
 TEST(ProxyServiceTest, Direct) {
   MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
   scoped_refptr<ProxyService> service(
       new ProxyService(new MockProxyConfigService(
           ProxyConfig::CreateDirect()), resolver, NULL));
 
   GURL url("http://www.google.com/");
 
   ProxyInfo info;
   TestCompletionCallback callback;
@@ skipping 1567 matching lines @@
   log.GetEntries(&entries);
 
   EXPECT_TRUE(LogContainsEntryWithType(entries, 0,
                                        NetLog::TYPE_PROXY_CONFIG_CHANGED));
   ASSERT_EQ(13u, entries.size());
   for (size_t i = 1; i < entries.size(); ++i)
     EXPECT_NE(NetLog::TYPE_PROXY_CONFIG_CHANGED, entries[i].type);
 }
 
 }  // namespace net