1 files changed, 4 insertions, 62 deletions

diff --git a/src/mscorlib/src/System/Security/Policy/Zone.cs b/src/mscorlib/src/System/Security/Policy/Zone.cs
index c999abe340..a9f5d84aeb 100644
--- a/src/mscorlib/src/System/Security/Policy/Zone.cs
+++ b/src/mscorlib/src/System/Security/Policy/Zone.cs
@@ -9,23 +9,21 @@
 //  Zone is an IIdentity representing Internet/Intranet/MyComputer etc.
 //
 
-namespace System.Security.Policy {
+namespace System.Security.Policy
+{
     using System.Security.Util;
     using ZoneIdentityPermission = System.Security.Permissions.ZoneIdentityPermission;
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
     using System.Runtime.Versioning;
     using System.Runtime.Serialization;
+    using System.Diagnostics;
     using System.Diagnostics.Contracts;
 
     [Serializable]
     [System.Runtime.InteropServices.ComVisible(true)]
     public sealed class Zone : EvidenceBase, IIdentityPermissionFactory
     {
-#if FEATURE_CAS_POLICY
-        [OptionalField(VersionAdded = 2)]
-        private String m_url;
-#endif // FEATURE_CAS_POLICY
         private SecurityZone m_zone;
 
         private static readonly String[] s_names =
@@ -42,36 +40,10 @@ namespace System.Security.Policy {
 
         private Zone(Zone zone)
         {
-            Contract.Assert(zone != null);
-
-#if FEATURE_CAS_POLICY
-            m_url = zone.m_url;
-#endif // FEATURE_CAS_POLICY
+            Debug.Assert(zone != null);
             m_zone = zone.m_zone;
         }
 
-#if FEATURE_CAS_POLICY
-        private Zone(String url)
-        {
-            m_url = url;
-            m_zone = SecurityZone.NoZone;
-        }
-
-        public static Zone CreateFromUrl( String url )
-        {
-            if (url == null)
-                throw new ArgumentNullException( "url" );
-            Contract.EndContractBlock();
-
-            return new Zone( url );
-        }
-
-        [System.Security.SecurityCritical]  // auto-generated
-        [DllImport(JitHelpers.QCall, CharSet = CharSet.Unicode)]
-        [SuppressUnmanagedCodeSecurity]
-        private extern static SecurityZone _CreateFromUrl( String url );
-#endif // FEATURE_CAS_POLICY
-
         public IPermission CreateIdentityPermission( Evidence evidence )
         {
             return new ZoneIdentityPermission( SecurityZone );
@@ -79,14 +51,8 @@ namespace System.Security.Policy {
 
         public SecurityZone SecurityZone
         {
-            [System.Security.SecuritySafeCritical]  // auto-generated
             get
             {
-#if FEATURE_CAS_POLICY
-                if (m_url != null)
-                    m_zone = _CreateFromUrl( m_url );
-#endif // FEATURE_CAS_POLICY
-
                 return m_zone;
             }
         }
@@ -117,30 +83,6 @@ namespace System.Security.Policy {
             return Clone();
         }
 
-#if FEATURE_CAS_POLICY
-        internal SecurityElement ToXml()
-        {
-            SecurityElement elem = new SecurityElement( "System.Security.Policy.Zone" );
-            // If you hit this assert then most likely you are trying to change the name of this class. 
-            // This is ok as long as you change the hard coded string above and change the assert below.
-            Contract.Assert( this.GetType().FullName.Equals( "System.Security.Policy.Zone" ), "Class name changed!" );
-
-            elem.AddAttribute( "version", "1" );
-            if (SecurityZone != SecurityZone.NoZone)
-                elem.AddChild( new SecurityElement( "Zone", s_names[(int)SecurityZone] ) );
-            else
-                elem.AddChild( new SecurityElement( "Zone", s_names[s_names.Length-1] ) );
-            return elem;
-        }
-#endif // FEATURE_CAS_POLICY
-
-#if FEATURE_CAS_POLICY
-        public override String ToString()
-        {
-            return ToXml().ToString();
-        }
-#endif // FEATURE_CAS_POLICY
-
         // INormalizeForIsolatedStorage is not implemented for startup perf
         // equivalent to INormalizeForIsolatedStorage.Normalize()
         internal Object Normalize()