Improve whitespace matching for encoding Android page info popup URLs.

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Color;
@@ skipping 147 matching lines @@
             if (maxLines != mCurrentMaxLines) {
                 setMaxLines(maxLines);
                 return true;
             }
             return false;
         }
     }
 
     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;
 
     // A pointer to the C++ object for this UI.
     private final long mNativeWebsiteSettingsPopup;
 
     // The outer container, filled with the layout from website_settings.xml.
     private final LinearLayout mContainer;
 
@@ skipping 124 matching lines @@
     }
 
     /**
      * Percent-encodes suspicious Unicode whitespace characters in a URL so that it can be safely
      * displayed.
      */
     public static String prepareUrlForDisplay(String urlStr) {
         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);
             }
         }
         return urlBuilder.toString();
     }
 
     /**
      * Sets the visibility of the lower area of the dialog (containing the permissions and 'Site
@@ skipping 232 matching lines @@
         new WebsiteSettingsPopup(context, profile, webContents);
     }
 
     private static native long nativeInit(WebsiteSettingsPopup popup, WebContents webContents);
 
     private native void nativeDestroy(long nativeWebsiteSettingsPopupAndroid);
 
     private native void nativeOnPermissionSettingChanged(long nativeWebsiteSettingsPopupAndroid,
             int type, int setting);
 }