From 18df01eb5498c954044f96c346026da0238d2e61 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Sun, 15 Nov 2020 16:24:47 +0000
Subject: Issue #1684 - Remove global UA override preference and supporting
 code.

Resolves #1684
---
 netwerk/protocol/http/nsHttpHandler.cpp | 12 ------------
 netwerk/protocol/http/nsHttpHandler.h   |  1 -
 2 files changed, 13 deletions(-)

(limited to 'netwerk/protocol/http')

diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index 7a29e041ba..0ae5891517 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -685,11 +685,6 @@ nsHttpHandler::BuildAppVersion()
 const nsAFlatCString &
 nsHttpHandler::UserAgent()
 {
-    if (mUserAgentOverride) {
-        LOG(("using general.useragent.override : %s\n", mUserAgentOverride.get()));
-        return mUserAgentOverride;
-    }
-
     if (mUserAgentIsDirty) {
         BuildUserAgent();
         mUserAgentIsDirty = false;
@@ -991,13 +986,6 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
         mUserAgentIsDirty = true;
     }
 
-    // general.useragent.override
-    if (PREF_CHANGED(UA_PREF("override"))) {
-        prefs->GetCharPref(UA_PREF("override"),
-                           getter_Copies(mUserAgentOverride));
-        mUserAgentIsDirty = true;
-    }
-
     //
     // HTTP options
     //
diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h
index 4f632e0784..549b822057 100644
--- a/netwerk/protocol/http/nsHttpHandler.h
+++ b/netwerk/protocol/http/nsHttpHandler.h
@@ -506,7 +506,6 @@ private:
     nsCString      mDeviceModelId;
 
     nsCString      mUserAgent;
-    nsXPIDLCString mUserAgentOverride;
     bool           mUserAgentIsDirty; // true if mUserAgent should be rebuilt
     bool           mAcceptLanguagesIsDirty;
 
-- 
cgit v1.2.3