Replace url with uri to be consistent in the API.

Bug: 1024913
Change-Id: I29fa0411f7abe815bc51463c91763d64be54c00e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1924602
Commit-Queue: Darin Fisher <darin@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#717746}

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/DownloadCallbackTest.java

@@ -45,9 +45,9 @@ public class DownloadCallbackTest {
         public long mContentLength;
 
         @Override
-        public void onDownloadRequested(String url, String userAgent, String contentDisposition,
+        public void onDownloadRequested(Uri uri, String userAgent, String contentDisposition,
                 String mimetype, long contentLength) {
-            mUrl = url;
+            mUrl = uri.toString();
             mUserAgent = userAgent;
             mContentDisposition = contentDisposition;
             mMimetype = mimetype;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TabCallbackTest.java

@@ -60,11 +60,11 @@ public class TabCallbackTest {
             }
         }
 
-        public TabCallbackValueRecorder visibleUrlChangedCallback = new TabCallbackValueRecorder();
+        public TabCallbackValueRecorder visibleUriChangedCallback = new TabCallbackValueRecorder();
 
         @Override
-        public void onVisibleUrlChanged(Uri url) {
-            visibleUrlChangedCallback.recordValue(url.toString());
+        public void onVisibleUriChanged(Uri uri) {
+            visibleUriChangedCallback.recordValue(uri.toString());
         }
     }
 
@@ -82,7 +82,7 @@ public class TabCallbackTest {
         mActivityTestRule.navigateAndWait(url);
 
         /* Verify that the visible URL changes to the target. */
-        callback.visibleUrlChangedCallback.waitUntilValueObserved(url);
+        callback.visibleUriChangedCallback.waitUntilValueObserved(url);
     }
 
     @Test

weblayer/browser/java/org/chromium/weblayer_private/TabCallbackProxy.java

@@ -32,8 +32,8 @@ public final class TabCallbackProxy {
     }
 
     @CalledByNative
-    private void visibleUrlChanged(String string) throws RemoteException {
-        mClient.visibleUrlChanged(string);
+    private void visibleUriChanged(String string) throws RemoteException {
+        mClient.visibleUriChanged(string);
     }
 
     @CalledByNative

weblayer/browser/java/org/chromium/weblayer_private/interfaces/IDownloadCallbackClient.aidl

@@ -8,5 +8,5 @@ package org.chromium.weblayer_private.interfaces;
  * Used to forward download requests to the client.
  */
 interface IDownloadCallbackClient {
-  void downloadRequested(in String url, in String userAgent, in String contentDisposition, in String mimetype, long contentLength) = 0;
+  void downloadRequested(in String uriString, in String userAgent, in String contentDisposition, in String mimetype, long contentLength) = 0;
 }

weblayer/browser/java/org/chromium/weblayer_private/interfaces/ITabClient.aidl

@@ -9,7 +9,7 @@ package org.chromium.weblayer_private.interfaces;
  * TabCallback interface, but is a singleton to avoid unnecessary IPC.
  */
 interface ITabClient {
-  void visibleUrlChanged(in String url) = 0;
+  void visibleUriChanged(in String uriString) = 0;
 
   void onNewTab(in int tabId, in int mode) = 1;
 

weblayer/browser/java/org/chromium/weblayer_private/interfaces/WebLayerVersion.java

@@ -9,4 +9,4 @@ package org.chromium.weblayer_private.interfaces;
  *
  * Whenever any AIDL file is changed, sVersionNumber must be incremented.
  * */
-public final class WebLayerVersion { public static final int sVersionNumber = 15; }
+public final class WebLayerVersion { public static final int sVersionNumber = 16; }

weblayer/browser/tab_callback_proxy.cc

@@ -26,10 +26,11 @@ TabCallbackProxy::~TabCallbackProxy() {
 
 void TabCallbackProxy::DisplayedUrlChanged(const GURL& url) {
   JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jstring> jstring_url(
+  ScopedJavaLocalRef<jstring> jstring_uri_string(
       ConvertUTF8ToJavaString(env, url.spec()));
-  TRACE_EVENT0("weblayer", "Java_TabCallbackProxy_visibleUrlChanged");
-  Java_TabCallbackProxy_visibleUrlChanged(env, java_observer_, jstring_url);
+  TRACE_EVENT0("weblayer", "Java_TabCallbackProxy_visibleUriChanged");
+  Java_TabCallbackProxy_visibleUriChanged(env, java_observer_,
+                                          jstring_uri_string);
 }
 
 void TabCallbackProxy::OnRenderProcessGone() {

weblayer/public/java/org/chromium/weblayer/DownloadCallback.java

@@ -4,6 +4,8 @@
 
 package org.chromium.weblayer;
 
+import android.net.Uri;
+
 import androidx.annotation.NonNull;
 
 /**
@@ -13,12 +15,12 @@ public abstract class DownloadCallback {
     /**
      * A download of has been requested with the specified details.
      *
-     * @param url the target that should be downloaded
+     * @param uri the target that should be downloaded
      * @param userAgent the user agent to be used for the download
      * @param contentDisposition content-disposition http header, if present
      * @param mimetype the mimetype of the content reported by the server
      * @param contentLength the file size reported by the server
      */
-    public abstract void onDownloadRequested(@NonNull String url, @NonNull String userAgent,
+    public abstract void onDownloadRequested(@NonNull Uri uri, @NonNull String userAgent,
             @NonNull String contentDisposition, @NonNull String mimetype, long contentLength);
 }

weblayer/public/java/org/chromium/weblayer/Tab.java

@@ -224,11 +224,11 @@ public final class Tab {
 
     private final class TabClientImpl extends ITabClient.Stub {
         @Override
-        public void visibleUrlChanged(String url) {
+        public void visibleUriChanged(String uriString) {
             StrictModeWorkaround.apply();
-            Uri uri = Uri.parse(url);
+            Uri uri = Uri.parse(uriString);
             for (TabCallback callback : mCallbacks) {
-                callback.onVisibleUrlChanged(uri);
+                callback.onVisibleUriChanged(uri);
             }
         }
 
@@ -275,11 +275,11 @@ public final class Tab {
         }
 
         @Override
-        public void downloadRequested(String url, String userAgent, String contentDisposition,
+        public void downloadRequested(String uriString, String userAgent, String contentDisposition,
                 String mimetype, long contentLength) {
             StrictModeWorkaround.apply();
             mCallback.onDownloadRequested(
-                    url, userAgent, contentDisposition, mimetype, contentLength);
+                    Uri.parse(uriString), userAgent, contentDisposition, mimetype, contentLength);
         }
     }
 

weblayer/public/java/org/chromium/weblayer/TabCallback.java

@@ -13,11 +13,11 @@ import androidx.annotation.NonNull;
  */
 public abstract class TabCallback {
     /**
-     * The Uri that should be displayed in the url-bar has updated.
+     * The Uri that should be displayed in the location-bar has updated.
      *
-     * @param url The new user-visible url.
+     * @param uri The new user-visible uri.
      */
-    public void onVisibleUrlChanged(@NonNull Uri url) {}
+    public void onVisibleUriChanged(@NonNull Uri uri) {}
 
     /**
      * Triggered when the render process dies, either due to crash or killed by the system to

weblayer/shell/android/browsertests_apk/src/org/chromium/weblayer_browsertests_apk/WebLayerBrowserTestsActivity.java

@@ -90,7 +90,7 @@ public class WebLayerBrowserTestsActivity extends NativeBrowserTestActivity {
         mTab = mBrowser.getActiveTab();
         mTab.registerTabCallback(new TabCallback() {
             @Override
-            public void onVisibleUrlChanged(Uri uri) {
+            public void onVisibleUriChanged(Uri uri) {
                 mUrlView.setText(uri.toString());
             }
         });

weblayer/shell/android/shell_apk/src/org/chromium/weblayer/shell/InstrumentationActivity.java

@@ -149,7 +149,7 @@ public class InstrumentationActivity extends FragmentActivity {
         mTab = mBrowser.getActiveTab();
         mTab.registerTabCallback(new TabCallback() {
             @Override
-            public void onVisibleUrlChanged(Uri uri) {
+            public void onVisibleUriChanged(Uri uri) {
                 mUrlView.setText(uri.toString());
             }
         });

weblayer/shell/android/shell_apk/src/org/chromium/weblayer/shell/WebLayerShellActivity.java

@@ -174,7 +174,7 @@ public class WebLayerShellActivity extends FragmentActivity {
         loadUrl(startupUrl);
         mTab.registerTabCallback(new TabCallback() {
             @Override
-            public void onVisibleUrlChanged(Uri uri) {
+            public void onVisibleUriChanged(Uri uri) {
                 mUrlView.setText(uri.toString());
             }
         });
@@ -192,9 +192,9 @@ public class WebLayerShellActivity extends FragmentActivity {
         });
         mTab.setDownloadCallback(new DownloadCallback() {
             @Override
-            public void onDownloadRequested(String url, String userAgent, String contentDisposition,
+            public void onDownloadRequested(Uri uri, String userAgent, String contentDisposition,
                     String mimetype, long contentLength) {
-                DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
+                DownloadManager.Request request = new DownloadManager.Request(uri);
                 request.setNotificationVisibility(
                         DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
                 getSystemService(DownloadManager.class).enqueue(request);