diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in
index 605b2d6cc05..a94a4f6dd2d 100644
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -52,13 +52,6 @@ public class AppConstants {
null;
#endif
- public static final boolean MOZ_PROFILING =
-#ifdef MOZ_PROFILING
- true;
-#else
- false;
-#endif
-
public static final boolean MOZ_TELEMETRY_ON_BY_DEFAULT =
#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
true;
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 447f3823d32..5bfd5eedccd 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -1513,10 +1513,6 @@ abstract public class BrowserApp extends GeckoApp
// In ICS+, it's easy to kill an app through the task switcher.
aMenu.findItem(R.id.quit).setVisible(Build.VERSION.SDK_INT < 14 || HardwareUtils.isTelevision());
- if (AppConstants.MOZ_PROFILING) {
- aMenu.findItem(R.id.toggle_profiling).setVisible(true);
- }
-
if (tab == null || tab.getURL() == null) {
bookmark.setEnabled(false);
forward.setEnabled(false);
@@ -1561,11 +1557,6 @@ abstract public class BrowserApp extends GeckoApp
@Override
public boolean onOptionsItemSelected(MenuItem item) {
- if (item.getItemId() == R.id.toggle_profiling) {
- GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("ToggleProfiling", null));
- return true;
- }
-
Tab tab = null;
Intent intent = null;
switch (item.getItemId()) {
diff --git a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
index 55c6bee973a..7c125e3aeda 100644
--- a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
@@ -71,8 +71,4 @@
-
-
diff --git a/mobile/android/base/resources/menu-v11/browser_app_menu.xml b/mobile/android/base/resources/menu-v11/browser_app_menu.xml
index 6253e9ca1a7..b6a174d31a1 100644
--- a/mobile/android/base/resources/menu-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-v11/browser_app_menu.xml
@@ -72,8 +72,4 @@
-
-
diff --git a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
index e673c097fe7..a53b7d27c61 100644
--- a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
@@ -72,8 +72,4 @@
-
-
diff --git a/mobile/android/base/resources/menu/browser_app_menu.xml b/mobile/android/base/resources/menu/browser_app_menu.xml
index d76442cd605..681f60c0fc9 100644
--- a/mobile/android/base/resources/menu/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu/browser_app_menu.xml
@@ -53,8 +53,4 @@
-
-
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index c349145c71c..71a6d8936a4 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -145,9 +145,6 @@
&tabs_normal;
&tabs_private;
&tabs_synced;
-
- Toggle Profiling
&site_settings_title2;
&site_settings_cancel;
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 91ea4675928..c67c324c46b 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -252,7 +252,6 @@ var BrowserApp = {
Services.obs.addObserver(this, "Viewport:FixedMarginsChanged", false);
Services.obs.addObserver(this, "Passwords:Init", false);
Services.obs.addObserver(this, "FormHistory:Init", false);
- Services.obs.addObserver(this, "ToggleProfiling", false);
Services.obs.addObserver(this, "gather-telemetry", false);
Services.obs.addObserver(this, "keyword-search", false);
@@ -1321,17 +1320,6 @@ var BrowserApp = {
sendMessageToJava({ type: "Session:StatePurged" });
break;
- case "ToggleProfiling": {
- let profiler = Cc["@mozilla.org/tools/profiler;1"].
- getService(Ci.nsIProfiler);
- if (profiler.IsActive()) {
- profiler.StopProfiler();
- } else {
- profiler.StartProfiler(100000, 25, ["stackwalk"], 1);
- }
- break;
- }
-
case "gather-telemetry":
sendMessageToJava({ type: "Telemetry:Gather" });
break;