Bug 1231416 - fix Mulet UA string generation rule. r=fabrice.

MozReview-Commit-ID: 69fIxw0FO9l

--HG--
extra : rebase_source : c3720d20001096b1775cdade418de27983720c40

b2g/dev/confvars.sh

@@ -9,3 +9,4 @@ MOZ_MULET=1
 . ${srcdir}/browser/confvars.sh
 
 MOZ_BUNDLED_FONTS=1
+MOZ_UA_OS_AGNOSTIC=1

netwerk/protocol/http/nsHttpHandler.cpp

@@ -326,7 +326,7 @@ nsHttpHandler::Init()
     mSchedulingContextService =
         do_GetService("@mozilla.org/network/scheduling-context-service;1");
 
-#ifdef ANDROID
+#if defined(ANDROID) || defined(MOZ_MULET)
     mProductSub.AssignLiteral(MOZILLA_UAVERSION);
 #else
     mProductSub.AssignLiteral("20100101");
@@ -777,7 +777,7 @@ nsHttpHandler::InitUserAgentComponents()
     }
 #endif // ANDROID
 
-#ifdef FXOS_SIMULATOR
+#ifdef MOZ_MULET
     {
         // Add the `Mobile` or `Tablet` or `TV` token when running in the b2g
         // desktop simulator via preference.
@@ -789,7 +789,7 @@ nsHttpHandler::InitUserAgentComponents()
             mCompatDevice.AssignLiteral("Mobile");
         }
     }
-#endif // FXOS_SIMULATOR
+#endif // MOZ_MULET
 
 #if defined(MOZ_WIDGET_GONK)
     // Device model identifier should be a simple token, which can be composed