Use data reduction proxy when managed proxy config returns direct

net/proxy/proxy_service_unittest.cc

Index: net/proxy/proxy_service_unittest.cc
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index a2dcf3fd8101a18985741d9af990ea4b26ac4877..fcfabdc0cfe1ff3e90c561981e756aa2e3e8d4b3 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -161,11 +161,14 @@ class TestResolveProxyNetworkDelegate : public NetworkDelegate {
   TestResolveProxyNetworkDelegate()
       : on_resolve_proxy_called_(false),
         add_proxy_(false),
-        remove_proxy_(false) {
+        remove_proxy_(false),
+        proxy_service_(NULL) {
   }
 
-  virtual void OnResolveProxy(
-      const GURL& url, int load_flags, ProxyInfo* result) OVERRIDE {
+  virtual void OnResolveProxy(const GURL& url,
+                              int load_flags,
+                              const ProxyService& proxy_service,
+                              ProxyInfo* result) OVERRIDE {
     on_resolve_proxy_called_ = true;
     DCHECK(!add_proxy_ || !remove_proxy_);
     if (add_proxy_) {
@@ -187,10 +190,15 @@ class TestResolveProxyNetworkDelegate : public NetworkDelegate {
     remove_proxy_ = remove_proxy;
   }
 
+  const ProxyService* proxy_service() {
+    return proxy_service_;

[mef, 2014/08/12 17:56:35]

I don't see |proxy_service_| being set to anything but NULL.

[bengr, 2014/08/12 20:09:39]

Done.

+  }
+
  private:
   bool on_resolve_proxy_called_;
   bool add_proxy_;
   bool remove_proxy_;
+  ProxyService* proxy_service_;
 };
 
 // A test network delegate that exercises the OnProxyFallback callback.
@@ -299,6 +307,7 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackAddProxy) {
       url, net::LOAD_NORMAL, &info, callback.callback(), NULL, &delegate,
       log.bound());
   EXPECT_TRUE(delegate.on_resolve_proxy_called());
+  EXPECT_EQ(&service, delegate.proxy_service());

[mef, 2014/08/12 17:56:35]

How does it work?

[bengr, 2014/08/12 20:09:39]

Done.

 
   // Verify that the NetworkDelegate's behavior is stateless across
   // invocations of ResolveProxy. Start by having the callback add a proxy