Update to 63.0.3239.65

Author: kuoruan

.travis.yml

@@ -14,7 +14,7 @@ cache:
 env:
   global:
     - ANDROID_API=26
-    - ANDROID_BUILD_TOOLS=26.0.2
+    - ANDROID_BUILD_TOOLS=26.0.3
     - secure: "gCI6oCqJwEZe9B8S4I2qNOXG8Ujv3B/beFsbacMOZIA+8Q6OeR7kV7+VMcCvjGa5ZhcBhCcDfwFz13sDOExj1qE0rRaYmwsWc0sFomZqUE2QtvidB2OgZGX1JeTHNqObb36JxfXYn2QZJ8II8SE0ZiEsy30q5FlOqNo3uEqr3ETDYK/X44JgYWMeqqFiATycYu21jK7aJeHHt+Z3tlpda+bsAaMm909EhblkiJq/wyQuvl1fu/elVTcyERkbQcOnIjJ1zbYHr3Wm6gUz7FaipVrsYFlQ8xyCHyaub6DdNt2Yi6fF5LhCjl4hUwGGwNKxo5xu3d9jfNU8va5mxXzw6R4fNr85oI/1kwT8ofuDfzBJiAM3yfhyTpnuv5LL99HTILToJT7tAtoOsxGSH+Po3LMJJ8/JDNt/ade37qPyfmKK+SoVdh3nPhFcSe/u4uxNuFkOvbDSWRdsWLp1N8zDhajTNiZaS6/mhIRxAJqCyQ2689yk4lqEVQa8zXlibd/WmPIGzfQ5gJdFmSxj+RmZmMENtAi4i51jP8QMiaClGY0uxDkuCmehvC2yn0/O6eF9g7e2NmiV3BUb24UZeHBUu563p/ZfgGuJVMgkaB4t+ZMiX/hzw6URrs/y9Tg0i6b1oSv6F1+UQ2z3LszYdi9Uc/ZIFsDIfxQA3500AqB9JG0="
     - secure: "Zs7zBbaiKQAJrAh5MjU7/kGGh4vI9FdtblclWpuXspYtkaHlM1xmgzo+DlQ/VY+WIFaJLrW362skVbh7VE/6qwa4AE0+/MSMTaDdPPXkmOuaQ+0vesd9m2QqrmKuTX/RE5gioULg1tAWYgGbBVE7fLhSiv5fbt1PKhOkgDx+AnzJ/0J+JapOVWIKQ9dHMKRSNZIG4705XgXMoKeQJWSnV12ZPnId2Gp0a95zV2B8LwJPZs5javfi63ZYvHEttCdp1ri+0XqyMCnO472gxbJffvPCXF5oxj1CIl54I2EmdKWV5F2qHGqkf55gFrnCUUpKbwcHin1PQvSEKbwEyMNpQFGGyroqPiMNheyT3v/2/z6H4/ybSjPwuxfuaXibQPyVUMqHsysfAov4JRlwgpfpoWlPDZaWxBEKKoTAYuSY///cHCCw3BqJHIn+jgD0TFzmQaBzM6yWuRG9IQOmwh6boxe7ed24H2LQZV9++L82tnGaHD8kWwQ1A3y0BpQvPrUtLf/KdO1YNG2nMEbtIQvN3bPaEFdJmTKQvUdj/JYVkhu0MdjlC1T95LgZi43f0W88d65U7DjlN7M6StfF3jXdrTRQg6viq8KbKdRd11v/NkaElps6B4uBOYWfqnsf//ka4yKgR2ts52q293wK75PC0Y+yZsn2HUnOSsstNxBsEmQ="
 

app/build.gradle

@@ -60,7 +60,7 @@ idea {
 }
 
 dependencies {
-     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
     implementation "com.android.support:design:$rootProject.ext.supportLibraryVersion"
     implementation "com.android.support:gridlayout-v7:$rootProject.ext.supportLibraryVersion"

app/src/main/AndroidManifest.xml

@@ -583,7 +583,7 @@ by a child template that "extends" this file.
         <!-- ChromeTabbedActivity related -->
         <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity"
             android:theme="@style/TabbedModeTheme"
-            android:exported="false"
+            android:exported="true"
             android:launchMode="singleTask"
             android:supportsPictureInPicture="true"
             android:resizeableActivity="true"
@@ -1711,7 +1711,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process0"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1721,7 +1721,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process1"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1731,7 +1731,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process2"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1741,7 +1741,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process3"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1751,7 +1751,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process4"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1761,7 +1761,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process5"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1771,7 +1771,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process6"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1781,7 +1781,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process7"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1791,7 +1791,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process8"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1801,7 +1801,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process9"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1811,7 +1811,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process10"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1821,7 +1821,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process11"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1831,7 +1831,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process12"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1841,7 +1841,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process13"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1851,7 +1851,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process14"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1861,7 +1861,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process15"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1871,7 +1871,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process16"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1881,7 +1881,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process17"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1891,7 +1891,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process18"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
         <!-- When use_order_profiling is set, the renderer processes need to be
              able to write profiling information and thus cannot be
@@ -1901,7 +1901,7 @@ by a child template that "extends" this file.
             android:process=":sandboxed_process19"
             android:permission="org.chromium.chrome.permission.CHILD_SERVICE"
             android:isolatedProcess="true"
-            android:exported="false"
+            android:exported="False"
              />
 
         <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"

app/src/main/assets/zh-CN.pak

@@ -2,11 +2,11 @@
 import org.chromium.base.annotations.SuppressFBWarnings;
 @SuppressFBWarnings
 public class NativeLibraries {
-    public static boolean sUseLinker = true;
+    public static boolean sUseLinker = false;
     public static boolean sUseLibraryInZipFile = false;
     public static boolean sEnableLinkerTests = false;
     public static final String[] LIBRARIES =
       {"chrome"};
     static String sVersionNumber =
-      "63.0.3239.40";
+      "63.0.3239.65";
 }

app/src/main/assets/zh-TW.pak

@@ -6,7 +6,6 @@
 
 import android.os.SystemClock;
 import android.util.LruCache;
-import android.webkit.URLUtil;
 
 import org.chromium.base.Callback;
 import org.chromium.base.SysUtils;
@@ -16,6 +15,7 @@
 import org.chromium.blink.mojom.document_metadata.WebPage;
 import org.chromium.chrome.browser.historyreport.AppIndexingReporter;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.util.UrlUtilities;
 import org.chromium.content_public.browser.RenderFrameHost;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.services.service_manager.InterfaceProvider;
@@ -47,7 +47,7 @@ public class AppIndexingUtil {
      */
     public void extractCopylessPasteMetadata(final Tab tab) {
         final String url = tab.getUrl();
-        boolean isHttpOrHttps = URLUtil.isHttpsUrl(url) || URLUtil.isHttpUrl(url);
+        boolean isHttpOrHttps = UrlUtilities.isHttpOrHttps(url);
         if (!isEnabledForDevice() || tab.isIncognito() || !isHttpOrHttps) {
             return;
         }

app/src/main/java/org/chromium/base/library_loader/NativeLibraries.java

@@ -165,7 +165,9 @@ public static boolean getFieldTrialParamByFeatureAsBoolean(
     public static final String CHROME_HOME_PERSONALIZED_OMNIBOX_SUGGESTIONS =
             "ChromeHomePersonalizedOmniboxSuggestions";
     public static final String CHROME_HOME_PROMO = "ChromeHomePromo";
+    public static final String CHROME_HOME_PROMO_ON_STARTUP = "ChromeHomePromoOnStartup";
     public static final String CHROME_MEMEX = "ChromeMemex";
+    public static final String CHROME_SMART_SELECTION = "ChromeSmartSelection";
     public static final String CONTENT_SUGGESTIONS_FAVICONS_FROM_NEW_SERVER =
             "ContentSuggestionsFaviconsFromNewServer";
     public static final String CONTENT_SUGGESTIONS_NOTIFICATIONS =

app/src/main/java/org/chromium/chrome/browser/AppIndexingUtil.java

@@ -966,7 +966,11 @@ private boolean maybeLaunchNtpOrResetBottomSheetFromMainIntent(Intent intent) {
             BottomSheet bottomSheet = getBottomSheet();
             assert bottomSheet != null;
 
-            if (bottomSheet.isSheetOpen()) return false;
+            if (bottomSheet.isSheetOpen()
+                    || (getTimeSinceLastBackgroundedMs()
+                               < TIME_SINCE_BACKGROUNDED_TO_SHOW_BOTTOM_SHEET_HALF_MS)) {
+                return false;
+            }
 
             if (mLayoutManager != null && mLayoutManager.overviewVisible()) {
                 if (reuseOrCreateNewNtp()) {

app/src/main/java/org/chromium/chrome/browser/ChromeFeatureList.java

@@ -39,6 +39,7 @@
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.document.ActivityDelegate;
 import org.chromium.chrome.browser.util.IntentUtils;
+import org.chromium.chrome.browser.util.UrlUtilities;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.common.ContentUrlConstants;
 import org.chromium.content_public.common.Referrer;
@@ -779,12 +780,19 @@ public boolean shouldIgnoreIntent(Intent intent) {
 
     @VisibleForTesting
     boolean intentHasValidUrl(Intent intent) {
-        String url = getUrlFromIntent(intent);
+        String url = extractUrlFromIntent(intent);
+
+        // Check if this is a valid googlechrome:// URL.
+        if (isGoogleChromeScheme(url)) {
+            url = getUrlFromGoogleChromeSchemeUrl(url);
+            if (url == null) return false;
+        }
 
         // Always drop insecure urls.
         if (url != null && isJavascriptSchemeOrInvalidUrl(url)) {
             return false;
         }
+
         return true;
     }
 
@@ -911,7 +919,7 @@ private boolean isInvalidScheme(String scheme) {
      * "j$a$r". See: http://crbug.com/248398
      * @return The sanitized URL scheme or null if no scheme is specified.
      */
-    private String getSanitizedUrlScheme(String url) {
+    private static String getSanitizedUrlScheme(String url) {
         if (url == null) {
             return null;
         }
@@ -948,22 +956,32 @@ private boolean isJavascriptSchemeOrInvalidUrl(String url) {
 
     /**
      * Retrieve the URL from the Intent, which may be in multiple locations.
+     * If the URL is googlechrome:// scheme, parse the actual navigation URL.
      * @param intent Intent to examine.
      * @return URL from the Intent, or null if a valid URL couldn't be found.
      */
     public static String getUrlFromIntent(Intent intent) {
-        if (intent == null) return null;
+        String url = extractUrlFromIntent(intent);
+        if (isGoogleChromeScheme(url)) {
+            url = getUrlFromGoogleChromeSchemeUrl(url);
+        }
+        return url;
+    }
 
+    /**
+     * Helper method to extract the raw URL from the intent, without further processing.
+     * The URL may be in multiple locations.
+     * @param intent Intent to examine.
+     * @return Raw URL from the intent, or null if raw URL could't be found.
+     */
+    private static String extractUrlFromIntent(Intent intent) {
+        if (intent == null) return null;
         String url = getUrlFromVoiceSearchResult(intent);
         if (url == null) url = ActivityDelegate.getInitialUrlForDocument(intent);
         if (url == null) url = getUrlForCustomTab(intent);
         if (url == null) url = intent.getDataString();
         if (url == null) return null;
-
         url = url.trim();
-        if (isGoogleChromeScheme(url)) {
-            url = getUrlFromGoogleChromeSchemeUrl(url);
-        }
         return TextUtils.isEmpty(url) ? null : url;
     }
 
@@ -976,14 +994,22 @@ private static String getUrlForCustomTab(Intent intent) {
 
     /**
      * Adjusts the URL to account for the googlechrome:// scheme.
-     * Currently, its only use is to handle navigations.
+     * Currently, its only use is to handle navigations, only http and https URL is allowed.
      * @param url URL to be processed
      * @return The string with the scheme and prefixes chopped off, if a valid prefix was used.
      *         Otherwise returns null.
      */
     public static String getUrlFromGoogleChromeSchemeUrl(String url) {
         if (url.toLowerCase(Locale.US).startsWith(GOOGLECHROME_NAVIGATE_PREFIX)) {
-            return url.substring(GOOGLECHROME_NAVIGATE_PREFIX.length());
+            String parsedUrl = url.substring(GOOGLECHROME_NAVIGATE_PREFIX.length());
+            if (!TextUtils.isEmpty(parsedUrl)) {
+                String scheme = getSanitizedUrlScheme(parsedUrl);
+                if (scheme == null) {
+                    // If no scheme, assuming this is an http url.
+                    parsedUrl = "http://" + parsedUrl;
+                }
+            }
+            if (UrlUtilities.isHttpOrHttps(parsedUrl)) return parsedUrl;
         }
 
         return null;