Improve whitespace matching for encoding Android page info popup URLs.

chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

Index: chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java
index 8f456d0018dc72fab814a2c6b5d4f78cd2b4339d..b4bcfc66cdce03b0a797267faa19e612f00d6051 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java
@@ -165,10 +165,6 @@ public class WebsiteSettingsPopup implements OnClickListener, OnItemSelectedList
 
     private static final int MAX_TABLET_DIALOG_WIDTH_DP = 400;
 
-    private static final char FIRST_UNICODE_WHITESPACE = '\u2000';
-    private static final char FINAL_UNICODE_WHITESPACE = '\u200F';
-    private static final char UNICODE_NBSP = '\u00A0';
-
     private final Context mContext;
     private final Profile mProfile;
     private final WebContents mWebContents;
@@ -313,10 +309,7 @@ public class WebsiteSettingsPopup implements OnClickListener, OnItemSelectedList
         StringBuilder urlBuilder = new StringBuilder();
         for (int i = 0; i < urlStr.length(); i++) {
             char c = urlStr.charAt(i);
-            if ((c >= FIRST_UNICODE_WHITESPACE
-                        && c <= FINAL_UNICODE_WHITESPACE)
-                    || c == ' '
-                    || c == UNICODE_NBSP) {
+            if (Character.isSpaceChar(c)) {
                 urlBuilder.append(Uri.encode(Character.toString(c)));
             } else {
                 urlBuilder.append(c);