Fix Intel Mac UA string, navigator.oscpu, navigator.platform values. The values in this patch match up with what Apple is using in their latest Intel build. b=297607 r=dbaron sr=darin

dom/src/base/nsGlobalWindow.cpp

@@ -7434,10 +7434,10 @@ nsNavigator::GetPlatform(nsAString& aPlatform)
     // here (bug 47080)
 #if defined(WIN32)
     aPlatform.AssignLiteral("Win32");
-#elif defined(XP_MAC) || defined(XP_MACOSX)
-    // XXX not sure what to do about Mac OS X on non-PPC, but since Comm 4.x
-    // doesn't know about it this will actually be backward compatible
+#elif defined(XP_MACOSX) && defined(__ppc__)
     aPlatform.AssignLiteral("MacPPC");
+#elif defined(XP_MACOSX) && defined(__i386__)
+    aPlatform.AssignLiteral("MacIntel");
 #elif defined(XP_OS2)
     aPlatform.AssignLiteral("OS/2");
 #else

netwerk/protocol/http/src/nsHttpHandler.cpp

@@ -29,6 +29,7 @@
  *   Gervase Markham <gerv@gerv.net>
  *   Bradley Baetz <bbaetz@netscape.com>
  *   Benjamin Smedberg <bsmedberg@covad.net>
+ *   Josh Aas <josh@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -80,10 +81,6 @@
 #include <windows.h>
 #endif
 
-#if defined(XP_MAC)
-#include <Gestalt.h>
-#endif
-
 #ifdef DEBUG
 // defined by the socket transport service while active
 extern PRThread *gSocketThread;
@@ -604,7 +601,7 @@ nsHttpHandler::InitUserAgentComponents()
     "OS/2"
 #elif defined(XP_WIN)
     "Windows"
-#elif defined(XP_MAC) || defined(XP_MACOSX)
+#elif defined(XP_MACOSX)
     "Macintosh"
 #elif defined(XP_BEOS)
     "BeOS"
@@ -675,14 +672,10 @@ nsHttpHandler::InitUserAgentComponents()
             }
         }
     }
-#elif defined (XP_MACOSX)
+#elif defined (XP_MACOSX) && defined(__ppc__)
     mOscpu.AssignLiteral("PPC Mac OS X Mach-O");
-#elif defined (XP_MAC)
-    long version;
-    if (::Gestalt(gestaltSystemVersion, &version) == noErr && version >= 0x00001000)
-        mOscpu.AssignLiteral("PPC Mac OS X");
-    else
-        mOscpu.AssignLiteral("PPC");
+#elif defined (XP_MACOSX) && defined(__i386__)
+    mOscpu.AssignLiteral("Intel Mac OS X");
 #elif defined (XP_UNIX) || defined (XP_BEOS)
     struct utsname name;