From 27c8a77c3f985297c92b90b264fb14df35dc068c Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Mon, 3 Aug 2020 14:27:01 -0700
Subject: [PATCH] For #4132: remove BrowserPerformanceTestActivity & usages.

---
 .../org/mozilla/fenix/engine/GeckoProvider.kt |  7 ----
 .../org/mozilla/fenix/engine/GeckoProvider.kt |  7 ----
 app/src/main/AndroidManifest.xml              |  5 ---
 .../browser/BrowserPerformanceTestActivity.kt | 33 -------------------
 .../PerformanceActivityLifecycleCallbacks.kt  |  4 +--
 5 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 app/src/main/java/org/mozilla/fenix/browser/BrowserPerformanceTestActivity.kt

diff --git a/app/src/geckoBeta/java/org/mozilla/fenix/engine/GeckoProvider.kt b/app/src/geckoBeta/java/org/mozilla/fenix/engine/GeckoProvider.kt
index b5171c98a..1bebe0c5c 100644
--- a/app/src/geckoBeta/java/org/mozilla/fenix/engine/GeckoProvider.kt
+++ b/app/src/geckoBeta/java/org/mozilla/fenix/engine/GeckoProvider.kt
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import android.content.Context
-import android.os.Bundle
 import mozilla.components.browser.engine.gecko.autofill.GeckoLoginDelegateWrapper
 import mozilla.components.browser.engine.gecko.ext.toContentBlockingSetting
 import mozilla.components.browser.engine.gecko.glean.GeckoAdapter
@@ -17,7 +16,6 @@ import org.mozilla.geckoview.GeckoRuntime
 import org.mozilla.geckoview.GeckoRuntimeSettings
 
 object GeckoProvider {
-    var testConfig: Bundle? = null
     private var runtime: GeckoRuntime? = null
 
     @Synchronized
@@ -40,11 +38,6 @@ object GeckoProvider {
     ): GeckoRuntime {
         val builder = GeckoRuntimeSettings.Builder()
 
-        testConfig?.let {
-            builder.extras(it)
-                .remoteDebuggingEnabled(true)
-        }
-
         val runtimeSettings = builder
             .crashHandler(CrashHandlerService::class.java)
             .telemetryDelegate(GeckoAdapter())
diff --git a/app/src/geckoNightly/java/org/mozilla/fenix/engine/GeckoProvider.kt b/app/src/geckoNightly/java/org/mozilla/fenix/engine/GeckoProvider.kt
index 43a2dd510..031c1c6c1 100644
--- a/app/src/geckoNightly/java/org/mozilla/fenix/engine/GeckoProvider.kt
+++ b/app/src/geckoNightly/java/org/mozilla/fenix/engine/GeckoProvider.kt
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import android.content.Context
-import android.os.Bundle
 import mozilla.components.browser.engine.gecko.autofill.GeckoLoginDelegateWrapper
 import mozilla.components.browser.engine.gecko.ext.toContentBlockingSetting
 import mozilla.components.browser.engine.gecko.glean.GeckoAdapter
@@ -17,7 +16,6 @@ import org.mozilla.geckoview.GeckoRuntime
 import org.mozilla.geckoview.GeckoRuntimeSettings
 
 object GeckoProvider {
-    var testConfig: Bundle? = null
     private var runtime: GeckoRuntime? = null
 
     @Synchronized
@@ -40,11 +38,6 @@ object GeckoProvider {
     ): GeckoRuntime {
         val builder = GeckoRuntimeSettings.Builder()
 
-        testConfig?.let {
-            builder.extras(it)
-                .remoteDebuggingEnabled(true)
-        }
-
         val runtimeSettings = builder
             .crashHandler(CrashHandlerService::class.java)
             .telemetryDelegate(GeckoAdapter())
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dedb00946..bb20352e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -217,11 +217,6 @@
 
         <activity android:name=".widget.VoiceSearchActivity" />
 
-        <activity
-            android:name=".browser.BrowserPerformanceTestActivity"
-            android:enabled="${isRaptorEnabled}"
-            android:exported="${isRaptorEnabled}" />
-
         <activity
             android:name=".settings.account.AuthCustomTabActivity"
             android:autoRemoveFromRecents="false"
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserPerformanceTestActivity.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserPerformanceTestActivity.kt
deleted file mode 100644
index a497ba971..000000000
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserPerformanceTestActivity.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-package org.mozilla.fenix.browser
-
-import GeckoProvider
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import mozilla.components.support.utils.SafeIntent
-import org.mozilla.fenix.IntentReceiverActivity
-
-/**
- * This activity is used for performance testing with Raptor/tp6:
- * https://wiki.mozilla.org/Performance_sheriffing/Raptor
- */
-class BrowserPerformanceTestActivity : Activity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        GeckoProvider.testConfig = SafeIntent(intent).extras
-
-        val intent = Intent(intent)
-
-        intent.setClassName(applicationContext, IntentReceiverActivity::class.java.name)
-
-        startActivity(intent)
-
-        finish()
-    }
-}
diff --git a/app/src/main/java/org/mozilla/fenix/session/PerformanceActivityLifecycleCallbacks.kt b/app/src/main/java/org/mozilla/fenix/session/PerformanceActivityLifecycleCallbacks.kt
index 793a222cb..2684b0388 100644
--- a/app/src/main/java/org/mozilla/fenix/session/PerformanceActivityLifecycleCallbacks.kt
+++ b/app/src/main/java/org/mozilla/fenix/session/PerformanceActivityLifecycleCallbacks.kt
@@ -10,7 +10,6 @@ import android.os.Bundle
 import mozilla.components.support.utils.RunWhenReadyQueue
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.IntentReceiverActivity
-import org.mozilla.fenix.browser.BrowserPerformanceTestActivity
 import org.mozilla.fenix.settings.account.AuthIntentReceiverActivity
 import org.mozilla.fenix.widget.VoiceSearchActivity
 
@@ -37,8 +36,7 @@ class PerformanceActivityLifecycleCallbacks(
         return isTransientActivityInMigrationVariant(activity) ||
                 (activity is IntentReceiverActivity) ||
                 (activity is VoiceSearchActivity) ||
-                (activity is AuthIntentReceiverActivity) ||
-                (activity is BrowserPerformanceTestActivity)
+                (activity is AuthIntentReceiverActivity)
     }
 
     /**