Fix and enable the PAC fetcher NoCache test on Android

net/proxy/proxy_script_fetcher_impl_unittest.cc

 // 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/proxy/proxy_script_fetcher_impl.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/compiler_specific.h"
@@ skipping 301 matching lines @@
   // have no effect.
   GURL url(test_server_.GetURL("files/downloadable.pac"));
   string16 text;
   TestCompletionCallback callback;
   int result = pac_fetcher.Fetch(url, &text, callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, result);
   EXPECT_EQ(OK, callback.WaitForResult());
   EXPECT_EQ(ASCIIToUTF16("-downloadable.pac-\n"), text);
 }
 
+// Verifies that PAC scripts are not being cached.
 TEST_F(ProxyScriptFetcherImplTest, NoCache) {
   ASSERT_TRUE(test_server_.Start());
 
   ProxyScriptFetcherImpl pac_fetcher(&context_);
 
   // Fetch a PAC script whose HTTP headers make it cacheable for 1 hour.
   GURL url(test_server_.GetURL("files/cacheable_1hr.pac"));
   {
     string16 text;
     TestCompletionCallback callback;
     int result = pac_fetcher.Fetch(url, &text, callback.callback());
     EXPECT_EQ(ERR_IO_PENDING, result);
     EXPECT_EQ(OK, callback.WaitForResult());
     EXPECT_EQ(ASCIIToUTF16("-cacheable_1hr.pac-\n"), text);
   }
 
-  // Now kill the HTTP server.
+  // Kill the HTTP server.
   ASSERT_TRUE(test_server_.Stop());
 
-  // Try to fetch the file again -- if should fail, since the server is not
-  // running anymore. (If it were instead being loaded from cache, we would
-  // get a success.
+  // Try to fetch the file again. Since the server is not running anymore, the
+  // call should fail, thus indicating that the file was not fetched from the
+  // local cache.
   {
     string16 text;
     TestCompletionCallback callback;
     int result = pac_fetcher.Fetch(url, &text, callback.callback());
     EXPECT_EQ(ERR_IO_PENDING, result);
+
+#if defined(OS_ANDROID)
+    // On Android platform, the tests are run on the device while the server
+    // runs on the host machine. After killing the server, port forwarder
+    // running on the device is still active, which produces error message
+    // "Connection reset by peer" rather than "Connection refused".
+    EXPECT_EQ(ERR_CONNECTION_RESET, callback.WaitForResult());
+#else
     EXPECT_EQ(ERR_CONNECTION_REFUSED, callback.WaitForResult());
+#endif
   }
 }
 
 TEST_F(ProxyScriptFetcherImplTest, TooLarge) {
   ASSERT_TRUE(test_server_.Start());
 
   ProxyScriptFetcherImpl pac_fetcher(&context_);
 
   // Set the maximum response size to 50 bytes.
   int prev_size = pac_fetcher.SetSizeConstraint(50);
@@ skipping 128 matching lines @@
   {
     GURL url(kEncodedUrlBroken);
     string16 text;
     TestCompletionCallback callback;
     int result = pac_fetcher.Fetch(url, &text, callback.callback());
     EXPECT_EQ(ERR_FAILED, result);
   }
 }
 
 }  // namespace net