Partial changes to enable net-internals in iOS.

chrome/browser/net/connection_tester.cc

Index: chrome/browser/net/connection_tester.cc
===================================================================
--- chrome/browser/net/connection_tester.cc	(revision 171354)
+++ chrome/browser/net/connection_tester.cc	(working copy)
@@ -36,7 +36,7 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_storage.h"
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "chrome/browser/importer/firefox_proxy_settings.h"
 #endif
 
@@ -96,6 +96,7 @@
       return rv;  // Failure.
     storage_.set_host_resolver(host_resolver_tmp.Pass());
 
+#if !defined(OS_IOS)

[stuartmorgan, 2012/12/10 12:56:03]

Is this necessary? We're already doing ifdef's in the implementation of
CreateProxyService, so couldn't we leave this code as-is?

[ramant (doing other things), 2012/12/11 05:34:16]

Done.

     // Create a custom ProxyService for this this experiment.
     scoped_ptr<net::ProxyService> experiment_proxy_service;
     rv = CreateProxyService(experiment.proxy_settings_experiment,
@@ -103,12 +104,15 @@
     if (rv != net::OK)
       return rv;  // Failure.

[stuartmorgan, 2012/12/10 12:56:03]

Is this right? If not being able to create the service is a fatal error, then
why is it okay for us not to have one on iOS?

[ramant (doing other things), 2012/12/11 05:34:16]

Removed the ifdef'ing out of net::CreateProxyServiceUsingV8ProxyResolver. Will
work on a separate CL to enable net/proxy/proxy_resolver_v8.cc and
net/proxy/proxy/proxy_service_v8.cc

[ramant (doing other things), 2012/12/11 19:41:40]

CreateProxyServiceUsingV8ProxyResolver is not built on IPhone because there is
no V8. Used  CreateUsingSystemProxyResolver instead for IOS

     storage_.set_proxy_service(experiment_proxy_service.release());
+#endif
 
     // The rest of the dependencies are standard, and don't depend on the
     // experiment being run.
     storage_.set_cert_verifier(net::CertVerifier::CreateDefault());
+#if !defined(OS_IOS)

[droger, 2012/12/10 10:23:06]

Use DISABLE_FTP_SUPPORT instead of OS_IOS.
I think iOS is the only platform that defines this variable.

[ramant (doing other things), 2012/12/11 05:34:16]

Done.

     storage_.set_ftp_transaction_factory(
         new net::FtpNetworkLayer(host_resolver()));
+#endif
     storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults);
     storage_.set_http_auth_handler_factory(
         net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
@@ -194,6 +198,7 @@
       dhcp_factory.set_enabled(false);
     }
 
+#if !defined(OS_IOS)
     experiment_proxy_service->reset(
         net::CreateProxyServiceUsingV8ProxyResolver(
             proxy_config_service->release(),
@@ -203,6 +208,7 @@
             host_resolver(),
             NULL,
             NULL));
+#endif
 
     return net::OK;
   }
@@ -224,7 +230,7 @@
 #endif
   }
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
   static int FirefoxProxySettingsTask(
       FirefoxProxySettings* firefox_settings) {
     if (!FirefoxProxySettings::GetSettings(firefox_settings))
@@ -259,7 +265,7 @@
   int CreateFirefoxProxyConfigService(
       scoped_ptr<net::ProxyConfigService>* config_service,
       base::Callback<void(int)> callback) {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_IOS)
     // Chrome on Android does not support Firefox settings.

[stuartmorgan, 2012/12/10 12:56:03]

Update comment.

[ramant (doing other things), 2012/12/11 05:34:16]

Done.

     return net::ERR_NOT_IMPLEMENTED;
 #else