From fa5754f73b006de68fd517e6e8cdc0638345ae59 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Wed, 20 Jul 2016 21:43:34 -0400
Subject: [PATCH] Bug 1285572 - Remove LOAD_URI event; r=snorp

Remove the LOAD_URI event, which is now obsolete, from GeckoEvent.
---
 .../java/org/mozilla/gecko/GeckoEvent.java    | 15 ----------
 widget/android/AndroidJavaWrappers.cpp        |  6 ----
 widget/android/AndroidJavaWrappers.h          |  1 -
 widget/android/nsAppShell.cpp                 | 30 -------------------
 4 files changed, 52 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoEvent.java b/mobile/android/base/java/org/mozilla/gecko/GeckoEvent.java
index a384c781b1b2..a7f3f89c83de 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoEvent.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoEvent.java
@@ -66,7 +66,6 @@ public class GeckoEvent {
     public enum NativeGeckoEvent {
         NATIVE_POKE(0),
         MOTION_EVENT(2),
-        LOAD_URI(12),
         NOOP(15),
         VIEWPORT(20),
         NETWORK_CHANGED(22),
@@ -351,20 +350,6 @@ public class GeckoEvent {
         return event;
     }
 
-    public static GeckoEvent createURILoadEvent(String uri) {
-        GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.LOAD_URI);
-        event.mCharacters = uri;
-        event.mCharactersExtra = "";
-        return event;
-    }
-
-    public static GeckoEvent createBookmarkLoadEvent(String uri) {
-        GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.LOAD_URI);
-        event.mCharacters = uri;
-        event.mCharactersExtra = "-bookmark";
-        return event;
-    }
-
     public static GeckoEvent createNetworkEvent(int connectionType, boolean isWifi, int DHCPGateway, String status) {
         GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.NETWORK_CHANGED);
         event.mConnectionType = connectionType;
diff --git a/widget/android/AndroidJavaWrappers.cpp b/widget/android/AndroidJavaWrappers.cpp
index 3fe4cad8cf06..a437885e1ee9 100644
--- a/widget/android/AndroidJavaWrappers.cpp
+++ b/widget/android/AndroidJavaWrappers.cpp
@@ -314,12 +314,6 @@ AndroidGeckoEvent::Init(JNIEnv *jenv, jobject jobj)
 
             break;
 
-        case LOAD_URI: {
-            ReadCharactersField(jenv);
-            ReadCharactersExtraField(jenv);
-            break;
-        }
-
         case VIEWPORT: {
             ReadCharactersField(jenv);
             ReadCharactersExtraField(jenv);
diff --git a/widget/android/AndroidJavaWrappers.h b/widget/android/AndroidJavaWrappers.h
index 3134aef041d7..0e8af2c53793 100644
--- a/widget/android/AndroidJavaWrappers.h
+++ b/widget/android/AndroidJavaWrappers.h
@@ -604,7 +604,6 @@ public:
     enum {
         NATIVE_POKE = 0,
         MOTION_EVENT = 2,
-        LOAD_URI = 12,
         NOOP = 15,
         APZ_INPUT_EVENT = 17, // used internally in AndroidJNI/nsAppShell/nsWindow
         VIEWPORT = 20,
diff --git a/widget/android/nsAppShell.cpp b/widget/android/nsAppShell.cpp
index 02d8048f80aa..5e2c79334c01 100644
--- a/widget/android/nsAppShell.cpp
+++ b/widget/android/nsAppShell.cpp
@@ -802,36 +802,6 @@ nsAppShell::LegacyGeckoEvent::Run()
         break;
     }
 
-    case AndroidGeckoEvent::LOAD_URI: {
-        nsCOMPtr<nsICommandLineRunner> cmdline
-            (do_CreateInstance("@mozilla.org/toolkit/command-line;1"));
-        if (!cmdline)
-            break;
-
-        if (curEvent->Characters().Length() == 0)
-            break;
-
-        char *uri = ToNewUTF8String(curEvent->Characters());
-        if (!uri)
-            break;
-
-        char *flag = ToNewUTF8String(curEvent->CharactersExtra());
-
-        const char *argv[4] = {
-            "dummyappname",
-            "-url",
-            uri,
-            flag ? flag : ""
-        };
-        nsresult rv = cmdline->Init(4, argv, nullptr, nsICommandLine::STATE_REMOTE_AUTO);
-        if (NS_SUCCEEDED(rv))
-            cmdline->Run();
-        free(uri);
-        if (flag)
-            free(flag);
-        break;
-    }
-
     case AndroidGeckoEvent::NETWORK_CHANGED: {
         hal::NotifyNetworkChange(hal::NetworkInformation(curEvent->ConnectionType(),
                                                          curEvent->IsWifi(),