Backed out 2 changesets (bug 1605072) for causing reftest failures in…

… layout/reftests/selection/splitText-normalize-ref.html CLOSED TREE

Backed out changeset 973f1e5baebf (bug 1605072)
Backed out changeset 038b50303733 (bug 1605072)

docshell/base/CanonicalBrowsingContext.cpp

@@ -252,6 +252,26 @@ void CanonicalBrowsingContext::LoadURI(const nsAString& aURI,
   LoadURI(nullptr, loadState, true);
 }
 
+namespace {
+
+using NewOrUsedPromise = MozPromise<RefPtr<ContentParent>, nsresult, false>;
+
+// NOTE: This method is currently a dummy, and always actually spawns sync. It
+// mostly exists so I can test out the async API right now.
+RefPtr<NewOrUsedPromise> GetNewOrUsedBrowserProcessAsync(
+    const nsAString& aRemoteType) {
+  RefPtr<ContentParent> contentParent =
+      ContentParent::GetNewOrUsedBrowserProcess(
+          nullptr, aRemoteType, hal::PROCESS_PRIORITY_FOREGROUND, nullptr,
+          false);
+  if (!contentParent) {
+    return NewOrUsedPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
+  }
+  return NewOrUsedPromise::CreateAndResolve(contentParent, __func__);
+}
+
+}  // anonymous namespace
+
 void CanonicalBrowsingContext::PendingRemotenessChange::Complete(
     ContentParent* aContentParent) {
   if (!mPromise) {
@@ -463,19 +483,14 @@ CanonicalBrowsingContext::ChangeFrameRemoteness(const nsAString& aRemoteType,
       new PendingRemotenessChange(this, promise, aPendingSwitchId);
   mPendingRemotenessChange = change;
 
-  ContentParent::GetNewOrUsedBrowserProcessAsync(
-      /* aFrameElement = */ nullptr,
-      /* aRemoteType = */ aRemoteType,
-      /* aPriority = */ hal::PROCESS_PRIORITY_FOREGROUND,
-      /* aOpener = */ nullptr,
-      /* aPreferUsed = */ false)
+  GetNewOrUsedBrowserProcessAsync(aRemoteType)
       ->Then(
           GetMainThreadSerialEventTarget(), __func__,
           [change](ContentParent* aContentParent) {
             change->Complete(aContentParent);
           },
-          [change](LaunchError aError) { change->Cancel(NS_ERROR_FAILURE); });
-  return promise.forget();
+          [change](nsresult aRv) { change->Cancel(aRv); });
+  return promise;
 }
 
 already_AddRefed<Promise> CanonicalBrowsingContext::ChangeFrameRemoteness(