Bringing up the net target on iOS.

This builds a small subset of net containing only the dependencies needed to build the ui target.

BUG=None


Review URL: https://chromiumcodereview.appspot.com/10834051

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

build/all.gyp

@@ -11,6 +11,7 @@
       'dependencies': [
         'some.gyp:*',
         '../base/base.gyp:*',
+        '../net/net.gyp:*',
         '../sql/sql.gyp:*',
         '../testing/gtest.gyp:*',
         '../third_party/bzip2/bzip2.gyp:*',
@@ -37,7 +38,6 @@
             '../ipc/ipc.gyp:*',
             '../jingle/jingle.gyp:*',
             '../media/media.gyp:*',
-            '../net/net.gyp:*',
             '../ppapi/ppapi.gyp:*',
             '../ppapi/ppapi_internal.gyp:*',
             '../printing/printing.gyp:*',

net/base/platform_mime_util_mac.mm

@@ -4,7 +4,6 @@
 
 #include "net/base/platform_mime_util.h"
 
-#include <CoreServices/CoreServices.h>
 #import <Foundation/Foundation.h>
 
 #include <string>
@@ -14,6 +13,12 @@
 #import "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 
+#if defined(OS_IOS)
+#include <MobileCoreServices/MobileCoreServices.h>
+#else
+#include <CoreServices/CoreServices.h>
+#endif  // defined(OS_IOS)
+
 // SPI declaration; see the commentary in GetPlatformExtensionsForMimeType.
 
 @interface NSURLFileTypeMappings : NSObject

net/base/x509_cert_types.h

@@ -15,7 +15,7 @@
 #include "build/build_config.h"
 #include "net/base/net_export.h"
 
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && !defined(OS_IOS)
 #include <Security/x509defs.h>
 #endif
 
@@ -63,7 +63,7 @@ struct NET_EXPORT CertPrincipal {
   explicit CertPrincipal(const std::string& name);
   ~CertPrincipal();
 
-#if defined(OS_MACOSX) || defined(OS_WIN)
+#if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN)
   // Parses a BER-format DistinguishedName.
   bool ParseDistinguishedName(const void* ber_name_data, size_t length);
 #endif
@@ -136,7 +136,7 @@ class NET_EXPORT CertPolicy {
   std::set<SHA1Fingerprint, SHA1FingerprintLessThan> denied_;
 };
 
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && !defined(OS_IOS)
 // Compares two OIDs by value.
 inline bool CSSMOIDEqual(const CSSM_OID* oid1, const CSSM_OID* oid2) {
   return oid1->Length == oid2->Length &&