Backed out 2 changesets (bug 1351831, bug 1351820) for Windows build bustage

CLOSED TREE

Backed out changeset 91c2f1592df1 (bug 1351831)
Backed out changeset f825bdbb2ece (bug 1351820)

js/xpconnect/loader/moz.build

@@ -4,7 +4,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+# These files cannot be built in unified mode because they rely on plarena.h
+SOURCES += [
     'ChromeScriptLoader.cpp',
     'mozJSComponentLoader.cpp',
     'mozJSLoaderUtils.cpp',

js/xpconnect/src/XPCJSContext.cpp

@@ -3546,7 +3546,7 @@ XPCJSContext::Initialize()
     // isRunOnce mode and compiled function bodies (from
     // JS::CompileFunction). In practice, this means content scripts and event
     // handlers.
-    mozilla::UniquePtr<XPCJSSourceHook> hook(new XPCJSSourceHook);
+    UniquePtr<XPCJSSourceHook> hook(new XPCJSSourceHook);
     js::SetSourceHook(cx, Move(hook));
 
     // Set up locale information and callbacks for the newly-created context so

js/xpconnect/src/XPCShellImpl.cpp

@@ -1303,8 +1303,8 @@ XRE_XPCShellMain(int argc, char** argv, char** envp,
 
     // A initializer to initialize histogram collection
     // used by telemetry.
-    auto telStats =
-       mozilla::MakeUnique<base::StatisticsRecorder>();
+    UniquePtr<base::StatisticsRecorder> telStats =
+       MakeUnique<base::StatisticsRecorder>();
 
     char aLocal;
     profiler_init(&aLocal);

js/xpconnect/src/moz.build

@@ -17,7 +17,6 @@ UNIFIED_SOURCES += [
     'nsXPConnect.cpp',
     'Sandbox.cpp',
     'XPCCallContext.cpp',
-    'XPCComponents.cpp',
     'XPCConvert.cpp',
     'XPCDebug.cpp',
     'XPCException.cpp',
@@ -43,6 +42,11 @@ UNIFIED_SOURCES += [
     'XPCWrapper.cpp',
 ]
 
+# XPCComponents.cpp cannot be built in unified mode because it uses plarena.h.
+SOURCES += [
+    'XPCComponents.cpp',
+]
+
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

netwerk/cache2/moz.build

@@ -25,7 +25,6 @@ EXPORTS += [
 ]
 
 UNIFIED_SOURCES += [
-    'AppCacheStorage.cpp',
     'CacheEntry.cpp',
     'CacheFile.cpp',
     'CacheFileChunk.cpp',
@@ -47,6 +46,11 @@ UNIFIED_SOURCES += [
     'OldWrappers.cpp',
 ]
 
+# AppCacheStorage.cpp cannot be built in unified mode because it uses plarena.h.
+SOURCES += [
+    'AppCacheStorage.cpp',
+]
+
 LOCAL_INCLUDES += [
     '/netwerk/base',
     '/netwerk/cache',

netwerk/protocol/http/HttpChannelChild.cpp

@@ -63,6 +63,9 @@ using namespace mozilla::ipc;
 namespace mozilla {
 namespace net {
 
+extern bool
+WillRedirect(nsHttpResponseHead * response);
+
 namespace {
 
 const uint32_t kMaxFileDescriptorsPerMessage = 250;
@@ -3176,14 +3179,14 @@ HttpChannelChild::OverrideWithSynthesizedResponse(nsAutoPtr<nsHttpResponseHead>&
 
   // Intercepted responses should already be decoded.  If its a redirect,
   // however, we want to respect the encoding of the final result instead.
-  if (!nsHttpChannel::WillRedirect(aResponseHead)) {
+  if (!WillRedirect(aResponseHead)) {
     SetApplyConversion(false);
   }
 
   mResponseHead = aResponseHead;
   mSynthesizedResponse = true;
 
-  if (nsHttpChannel::WillRedirect(mResponseHead)) {
+  if (WillRedirect(mResponseHead)) {
     mShouldInterceptSubsequentRedirect = true;
     // Continue with the original cross-process request
     nsresult rv = ContinueAsyncOpen();

netwerk/protocol/http/InterceptedChannel.cpp

@@ -21,6 +21,9 @@
 namespace mozilla {
 namespace net {
 
+extern bool
+WillRedirect(const nsHttpResponseHead * response);
+
 extern nsresult
 DoUpdateExpirationTime(nsHttpChannel* aSelf,
                        nsICacheEntry* aCacheEntry,
@@ -243,7 +246,7 @@ InterceptedChannelChrome::FinishSynthesizedResponse(const nsACString& aFinalURLS
 
   // If the synthesized response is a redirect, then we want to respect
   // the encoding of whatever is loaded as a result.
-  if (nsHttpChannel::WillRedirect(mSynthesizedResponseHead.ref())) {
+  if (WillRedirect(mSynthesizedResponseHead.ref())) {
     nsresult rv = mChannel->SetApplyConversion(mOldApplyConversion);
     NS_ENSURE_SUCCESS(rv, rv);
   }

netwerk/protocol/http/moz.build

@@ -49,15 +49,18 @@ EXPORTS.mozilla.net += [
     'TimingStruct.h',
 ]
 
+# ASpdySession.cpp and nsHttpAuthCache cannot be built in unified mode because
+# they use plarena.h.
 SOURCES += [
+    'AlternateServices.cpp',
+    'ASpdySession.cpp',
+    'nsHttpAuthCache.cpp',
     'nsHttpChannelAuthProvider.cpp', # redefines GetAuthType
 ]
 
 UNIFIED_SOURCES += [
     'AltDataOutputStreamChild.cpp',
     'AltDataOutputStreamParent.cpp',
-    'AlternateServices.cpp',
-    'ASpdySession.cpp',
     'CacheControlParser.cpp',
     'ConnectionDiagnostics.cpp',
     'HSTSPrimerListener.cpp',
@@ -75,7 +78,6 @@ UNIFIED_SOURCES += [
     'nsCORSListenerProxy.cpp',
     'nsHttp.cpp',
     'nsHttpActivityDistributor.cpp',
-    'nsHttpAuthCache.cpp',
     'nsHttpAuthManager.cpp',
     'nsHttpBasicAuth.cpp',
     'nsHttpChannel.cpp',

netwerk/protocol/http/nsHttpChannel.cpp

@@ -192,9 +192,9 @@ Hash(const char *buf, nsACString &hash)
 // We only treat 3xx responses as redirects if they have a Location header and
 // the status code is in a whitelist.
 bool
-nsHttpChannel::WillRedirect(nsHttpResponseHead * response)
+WillRedirect(nsHttpResponseHead * response)
 {
-    return IsRedirectStatus(response->Status()) &&
+    return nsHttpChannel::IsRedirectStatus(response->Status()) &&
            response->HasHeader(nsHttp::Location);
 }
 

netwerk/protocol/http/nsHttpChannel.h

@@ -138,7 +138,6 @@ public:
                                  Http2PushedStream *pushedStream);
 
     static bool IsRedirectStatus(uint32_t status);
-    static bool WillRedirect(nsHttpResponseHead * response);
 
 
     // Methods HttpBaseChannel didn't implement for us or that we override.

netwerk/protocol/http/nsHttpDigestAuth.cpp

@@ -8,7 +8,6 @@
 #include "HttpLog.h"
 
 #include "mozilla/Sprintf.h"
-#include "mozilla/Unused.h"
 
 #include "nsHttp.h"
 #include "nsHttpDigestAuth.h"