Reverted commit D3443980

Summary:
Currently, DevTools only work under ios (although this is undocumented!), because the JavaScriptEngine initialization process skips setupDevTools() on android.

DevTools work fine with Android, as tested on 0.26, 0.27, and 0.28 using Nuclide's inspector.

For reference, [the relevant issue on react-devtools](https://github.com/facebook/react-devtools/issues/229).
Closes https://github.com/facebook/react-native/pull/8095

Reviewed By: javache

Differential Revision: D3443980

Pulled By: bestander

fbshipit-source-id: ce0f7dd62ae0f7dfe6654380821660f8660318a6

Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js

@@ -220,7 +220,7 @@ function setUpCollections(): void {
 function setUpDevTools(): void {
   if (__DEV__) {
     // not when debugging in chrome
-    if (!window.document) {
+    if (!window.document && require('Platform').OS === 'ios') {
       const setupDevtools = require('setupDevtools');
       setupDevtools();
     }

ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeWebSocketModule.java

@@ -1,60 +0,0 @@
-/**
- * Copyright (c) 2014-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.testing;
-
-import javax.annotation.Nullable;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.BaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-
-/**
- * Dummy implementation of storage module, used for testing
- */
-public final class FakeWebSocketModule extends BaseJavaModule {
-
-  private static WritableMap errorMessage;
-  static {
-    errorMessage = Arguments.createMap();
-    errorMessage.putString("message", "Fake Fake Web Socke tModule");
-  }
-
-  @Override
-  public String getName() {
-    return "WebSocketModule";
-  }
-
-  @Override
-  public boolean canOverrideExistingModule() {
-    return true;
-  }
-
-  @ReactMethod
-  public void connect(
-    final String url,
-    @Nullable final ReadableArray protocols,
-    @Nullable final ReadableMap headers,
-    final int id) {
-  }
-
-  @ReactMethod
-  public void close(int code, String reason, int id) {
-  }
-
-  @ReactMethod
-  public void send(String message, int id) {
-  }
-
-  @ReactMethod
-  public void sendBinary(String base64String, int id) {
-  }
-}

ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java

@@ -9,7 +9,6 @@
 package com.facebook.react.testing;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import android.annotation.SuppressLint;
@@ -27,8 +26,7 @@ import com.facebook.react.ReactPackage;
 @SuppressLint("JavatestsIncorrectFolder")
 public class ReactInstanceSpecForTest {
 
-  private final List<NativeModule> mNativeModules =
-    new ArrayList<NativeModule>(Arrays.asList(new FakeWebSocketModule()));
+  private final List<NativeModule> mNativeModules = new ArrayList<>();
   private final List<Class<? extends JavaScriptModule>> mJSModuleSpecs = new ArrayList<>();
   private final List<ViewManager> mViewManagers = new ArrayList<>();
   private ReactPackage mReactPackage = null;

ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java

@@ -30,7 +30,6 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.modules.systeminfo.AndroidInfoModule;
-import com.facebook.react.testing.FakeWebSocketModule;
 import com.facebook.react.testing.ReactIntegrationTestCase;
 import com.facebook.react.testing.ReactTestHelper;
 import com.facebook.react.uimanager.UIImplementation;
@@ -38,6 +37,8 @@ import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.views.view.ReactViewManager;
 
+import org.junit.Ignore;
+
 /**
  * Integration test to verify passing various types of parameters from JS to Java works
  */
@@ -73,7 +74,7 @@ public class CatalystNativeJSToJavaParametersTestCase extends ReactIntegrationTe
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-
+    
     List<ViewManager> viewManagers = Arrays.<ViewManager>asList(
         new ReactViewManager());
     final UIManagerModule mUIManager = new UIManagerModule(
@@ -93,7 +94,6 @@ public class CatalystNativeJSToJavaParametersTestCase extends ReactIntegrationTe
     mCatalystInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(mRecordingTestModule)
         .addNativeModule(new AndroidInfoModule())
-        .addNativeModule(new FakeWebSocketModule())
         .addNativeModule(mUIManager)
         .addJSModule(TestJSToJavaParametersModule.class)
         .build();

ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java

@@ -20,7 +20,6 @@ import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.testing.AssertModule;
-import com.facebook.react.testing.FakeWebSocketModule;
 import com.facebook.react.testing.ReactIntegrationTestCase;
 import com.facebook.react.testing.ReactTestHelper;
 import com.facebook.react.uimanager.UIImplementation;
@@ -76,7 +75,6 @@ public class CatalystNativeJavaToJSArgumentsTestCase extends ReactIntegrationTes
 
     mInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(mAssertModule)
-        .addNativeModule(new FakeWebSocketModule())
         .addJSModule(TestJavaToJSArgumentsModule.class)
         .addNativeModule(mUIManager)
         .build();

ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java

@@ -12,7 +12,6 @@ import android.os.Bundle;
 import android.test.ActivityInstrumentationTestCase2;
 
 import com.facebook.react.bridge.BaseJavaModule;
-import com.facebook.react.testing.FakeWebSocketModule;
 import com.facebook.react.testing.ReactInstanceSpecForTest;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
@@ -71,7 +70,6 @@ public class InitialPropsTestCase extends
           @Override
           public void run() {
             ReactInstanceSpecForTest catalystInstanceSpec = new ReactInstanceSpecForTest();
-            catalystInstanceSpec.addNativeModule(new FakeWebSocketModule());
             catalystInstanceSpec.addNativeModule(mRecordingModule);
             Bundle props = new Bundle();
             props.putString("key1", "string");

ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java

@@ -11,7 +11,6 @@ package com.facebook.react.tests;
 import java.util.Arrays;
 import java.util.List;
 
-import com.facebook.react.testing.FakeWebSocketModule;
 import com.facebook.react.testing.ReactIntegrationTestCase;
 import com.facebook.react.testing.ReactTestHelper;
 import com.facebook.react.testing.StringRecordingModule;
@@ -60,9 +59,9 @@ public class JSLocaleTest extends ReactIntegrationTestCase {
     mInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(mStringRecordingModule)
         .addNativeModule(mUIManager)
-        .addNativeModule(new FakeWebSocketModule())
         .addJSModule(TestJSLocaleModule.class)
         .build();
+
   }
 
   public void testToUpper() {
@@ -101,4 +100,6 @@ public class JSLocaleTest extends ReactIntegrationTestCase {
     assertEquals("γαζίες καὶ μυρτιὲς δὲν θὰ βρῶ πιὰ στὸ χρυσαφὶ ξέφωτο", answers[3]);
     assertEquals("chinese: 幓 厏吪吙 鈊釿閍 碞碠粻 曮禷", answers[4]);
   }
+
+
 }

ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java

@@ -30,7 +30,6 @@ import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.views.progressbar.ReactProgressBarViewManager;
 import com.facebook.react.views.view.ReactViewManager;
-import com.facebook.react.testing.FakeWebSocketModule;
 import com.facebook.react.testing.ReactIntegrationTestCase;
 import com.facebook.react.testing.ReactTestHelper;
 
@@ -84,7 +83,6 @@ public class ProgressBarTestCase extends ReactIntegrationTestCase {
     mInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(mUIManager)
         .addNativeModule(new AndroidInfoModule())
-        .addNativeModule(new FakeWebSocketModule())
         .addJSModule(ProgressBarTestModule.class)
         .build();
 

ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java

@@ -26,7 +26,6 @@ import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.views.view.ReactViewGroup;
 import com.facebook.react.views.view.ReactViewManager;
-import com.facebook.react.testing.FakeWebSocketModule;
 import com.facebook.react.testing.ReactIntegrationTestCase;
 import com.facebook.react.testing.ReactTestHelper;
 
@@ -65,7 +64,6 @@ public class ViewRenderingTestCase extends ReactIntegrationTestCase {
     mCatalystInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(uiManager)
         .addNativeModule(new AndroidInfoModule())
-        .addNativeModule(new FakeWebSocketModule())
         .addJSModule(ViewRenderingTestModule.class)
         .build();