Remove ToS strings on Android.

The terms of service are now loaded from a URL instead of being packaged
in the APK.

BUG=416002

Review URL: https://codereview.chromium.org/619773002

Cr-Commit-Position: refs/heads/master@{#297554}

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

@@ -11,27 +11,12 @@ package org.chromium.chrome.browser;
 public class BrowserVersion {
     /**
      * Check if the browser was built as an "official" build.
+     *
+     * This function depends on the native library being loaded; calling it before then will crash.
      */
     public static boolean isOfficialBuild() {
         return nativeIsOfficialBuild();
     }
 
-    /**
-     * Only native code can see the OFFICIAL_BUILD flag; check it from there.  This function is
-     * not handled by initialize() and is not available early in startup (before the native
-     * library has loaded).  Calling it before that point will result in an exception.
-     */
     private static native boolean nativeIsOfficialBuild();
-
-    /**
-     * Get the HTML for the terms of service to be displayed at first run.
-     */
-    public static String getTermsOfServiceHtml() {
-        return nativeGetTermsOfServiceHtml();
-    }
-
-    /**
-     * The terms of service are a native resource.
-     */
-    private static native String nativeGetTermsOfServiceHtml();
 }

chrome/app/resources/locale_settings.grd

@@ -173,7 +173,7 @@
         <include name="IDS_TERMS_HTML" file="terms\terms_chromium.html" type="BINDATA" />
       </if>
 
-      <if expr="not chromeos and _google_chrome">
+      <if expr="not chromeos and not is_android and _google_chrome">
         <if expr="'am' == lang">    <include name="IDS_TERMS_HTML" file="terms\terms_am.html" type="BINDATA" /></if>
         <if expr="'ar' == lang">    <include name="IDS_TERMS_HTML" file="terms\terms_ar.html" type="BINDATA" /></if>
         <if expr="'bg' == lang">    <include name="IDS_TERMS_HTML" file="terms\terms_bg.html" type="BINDATA" /></if>
@@ -228,7 +228,7 @@
         <if expr="'zh-TW' == lang"> <include name="IDS_TERMS_HTML" file="terms\terms_zh-TW.html" type="BINDATA" /></if>
       </if>
 
-      <if expr="not chromeos and not _google_chrome">
+      <if expr="not chromeos and not is_android and not _google_chrome">
         <include name="IDS_TERMS_HTML" file="terms\terms_chromium.html" type="BINDATA" />
       </if>
     </includes>

chrome/browser/android/browser_version.cc

@@ -4,23 +4,13 @@
 
 #include "chrome/browser/android/browser_version.h"
 
-#include "base/android/jni_string.h"
 #include "chrome/common/chrome_version_info.h"
-#include "chrome/grit/locale_settings.h"
 #include "jni/BrowserVersion_jni.h"
-#include "ui/base/l10n/l10n_util.h"
-
-using base::android::ConvertUTF8ToJavaString;
 
 static jboolean IsOfficialBuild(JNIEnv* env, jclass /* clazz */) {
   return chrome::VersionInfo().IsOfficialBuild();
 }
 
-static jstring GetTermsOfServiceHtml(JNIEnv* env, jclass /* clazz */) {
-  return ConvertUTF8ToJavaString(env,
-      l10n_util::GetStringUTF8(IDS_TERMS_HTML)).Release();
-}
-
 bool RegisterBrowserVersion(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }

chrome/browser/ui/webui/about_ui.cc

@@ -1041,12 +1041,14 @@ void AboutUIHTMLSource::StartDataRequest(
 #endif
   } else if (source_name_ == chrome::kChromeUIStatsHost) {
     response = AboutStats(path);
+#if !defined(OS_ANDROID)
   } else if (source_name_ == chrome::kChromeUITermsHost) {
 #if defined(OS_CHROMEOS)
     ChromeOSTermsHandler::Start(path, callback);
     return;
 #else
     response = l10n_util::GetStringUTF8(IDS_TERMS_HTML);
+#endif
 #endif
   }
 

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -506,8 +506,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
       url.host() == chrome::kChromeUIDNSHost ||
       url.host() == chrome::kChromeUIMemoryHost ||
       url.host() == chrome::kChromeUIMemoryRedirectHost ||
-      url.host() == chrome::kChromeUIStatsHost ||
-      url.host() == chrome::kChromeUITermsHost
+      url.host() == chrome::kChromeUIStatsHost
+#if !defined(OS_ANDROID)
+      || url.host() == chrome::kChromeUITermsHost
+#endif
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
       || url.host() == chrome::kChromeUILinuxProxyConfigHost
       || url.host() == chrome::kChromeUISandboxHost