From bf79f87895de13123bc0aa59854616b35f931284 Mon Sep 17 00:00:00 2001
From: Chris Hopman <cjhopman@fb.com>
Date: Fri, 1 Jul 2016 14:41:34 -0700
Subject: [PATCH] Make the new bridge the default

Reviewed By: astreet

Differential Revision: D3507482

fbshipit-source-id: b62f3bf0fe1dd4f49594e441f4e00b9e20ec972b
---
 .../facebook/react/ReactInstanceManager.java  | 12 +++++-----
 .../facebook/react/XReactInstanceManager.java | 22 -------------------
 2 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManager.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index ccfd3fa14..71818459b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -195,7 +195,7 @@ public abstract class ReactInstanceManager {
     protected @Nullable Activity mCurrentActivity;
     protected @Nullable DefaultHardwareBackBtnHandler mDefaultHardwareBackBtnHandler;
     protected @Nullable RedBoxHandler mRedBoxHandler;
-    protected boolean mUseNewBridge;
+    protected boolean mUseOldBridge;
 
     protected Builder() {
     }
@@ -310,8 +310,8 @@ public abstract class ReactInstanceManager {
       return this;
     }
 
-    public Builder setUseNewBridge() {
-      mUseNewBridge = true;
+    public Builder setUseOldBridge(boolean enable) {
+      mUseOldBridge = enable;
       return this;
     }
 
@@ -339,8 +339,8 @@ public abstract class ReactInstanceManager {
         mUIImplementationProvider = new UIImplementationProvider();
       }
 
-      if (mUseNewBridge) {
-        return new XReactInstanceManagerImpl(
+      if (mUseOldBridge) {
+        return new ReactInstanceManagerImpl(
             Assertions.assertNotNull(
                 mApplication,
                 "Application property has not been set with this builder"),
@@ -357,7 +357,7 @@ public abstract class ReactInstanceManager {
             mJSCConfig,
             mRedBoxHandler);
       } else {
-        return new ReactInstanceManagerImpl(
+        return new XReactInstanceManagerImpl(
             Assertions.assertNotNull(
                 mApplication,
                 "Application property has not been set with this builder"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManager.java
deleted file mode 100644
index 548343fc6..000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManager.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-package com.facebook.react;
-
-import com.facebook.infer.annotation.Assertions;
-import com.facebook.react.uimanager.UIImplementationProvider;
-
-public abstract class XReactInstanceManager {
-  /**
-   * Creates a builder that is defaulted to using the new bridge.
-   */
-  public static ReactInstanceManager.Builder builder() {
-    return new ReactInstanceManager.Builder().setUseNewBridge();
-  }
-}