Bug 580341 - Remove unused deviceType from nsIHttpProtocolHandler. r=biesi

netwerk/protocol/http/nsHttpHandler.cpp

@@ -270,7 +270,6 @@ nsHttpHandler::Init()
     LOG(("> app-version = %s\n", mAppVersion.get()));
     LOG(("> platform = %s\n", mPlatform.get()));
     LOG(("> oscpu = %s\n", mOscpu.get()));
-    LOG(("> device = %s\n", mDeviceType.get()));
     LOG(("> language = %s\n", mLanguage.get()));
     LOG(("> misc = %s\n", mMisc.get()));
     LOG(("> vendor = %s\n", mVendor.get()));
@@ -612,7 +611,6 @@ nsHttpHandler::BuildUserAgent()
                            mAppVersion.Length() + 
                            mPlatform.Length() + 
                            mOscpu.Length() +
-                           mDeviceType.Length() +
                            mMisc.Length() +
                            mProduct.Length() +
                            mProductSub.Length() +
@@ -795,14 +793,6 @@ nsHttpHandler::InitUserAgentComponents()
     }
 #endif
 
-    nsCOMPtr<nsIPropertyBag2> infoService = do_GetService("@mozilla.org/system-info;1");
-    NS_ASSERTION(infoService, "Could not find a system info service");
-
-    nsCString deviceType;
-    nsresult rv = infoService->GetPropertyAsACString(NS_LITERAL_STRING("device"), deviceType);
-    if (NS_SUCCEEDED(rv))
-        mDeviceType = deviceType;
-
     mUserAgentIsDirty = PR_TRUE;
 }
 
@@ -1717,13 +1707,6 @@ nsHttpHandler::GetOscpu(nsACString &value)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsHttpHandler::GetDeviceType(nsACString &value)
-{
-    value = mDeviceType;
-    return NS_OK;
-}
-
 NS_IMETHODIMP
 nsHttpHandler::GetLanguage(nsACString &value)
 {

netwerk/protocol/http/nsHttpHandler.h

@@ -296,7 +296,6 @@ private:
     nsXPIDLCString mAppVersion;
     nsCString      mPlatform;
     nsCString      mOscpu;
-    nsCString      mDeviceType;
     nsCString      mLanguage;
     nsCString      mMisc;
     nsXPIDLCString mVendor;

netwerk/protocol/http/nsIHttpProtocolHandler.idl

@@ -39,7 +39,7 @@
 
 #include "nsIProxiedProtocolHandler.idl"
 
-[scriptable, uuid(a2479d10-9277-11df-981c-0800200c9a66)]
+[scriptable, uuid(cf549f80-9423-11df-981c-0800200c9a66)]
 interface nsIHttpProtocolHandler : nsIProxiedProtocolHandler
 {
     /**
@@ -118,14 +118,6 @@ interface nsIHttpProtocolHandler : nsIProxiedProtocolHandler
      */
     attribute ACString misc;
 
-    /**
-     * Get the current device type.
-     *
-     * @return The device type this application is running on.  Maybe
-     * be null.
-     */
-    readonly attribute ACString deviceType;
-
 };
 
 %{C++