NOT FOR REVIEW: Aura on Android

chrome/app/chromium_strings.grd

Index: chrome/app/chromium_strings.grd
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index d72b5ea9b89428af4c2b05d450b0b7e3d45ae27f..10928c292233e52f575e7cbcb16d28799a79af57 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -898,7 +898,6 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o
       </if>
 
       <!-- Enterprise sign-in profile linking -->
-      <if expr="not is_android">
         <message name="IDS_ENTERPRISE_SIGNIN_TITLE" desc="The title of the dialog to confirm linking the browser profile with the signed-in enterprise account">
           Important information regarding your Chromium data
         </message>
@@ -911,7 +910,6 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o
         <message name="IDS_ENTERPRISE_SIGNIN_CONTINUE" desc="Text of the button to link the current profile with the signed-in enterprise account">
           Link my Chromium data to this account
         </message>
-      </if>
 
       <!-- Enterprise sign-in dialog (new-style) -->
       <!-- TODO(dconnelly): remove "new-style" once the old dialog is gone. -->
@@ -1138,7 +1136,7 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o
       </message>
 
       <!-- ProcessSingleton -->
-      <if expr="is_linux or is_macosx">
+      <if expr="is_linux or is_macosx or (is_android and use_aura)">
         <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
           The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
         </message>
@@ -1152,14 +1150,12 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o
       </if>
 
       <!-- chrome://settings. Android uses native UI for settings -->
-      <if expr="not is_android">
         <message name="IDS_AUTOLAUNCH_TEXT" desc="The text displayed in settings to explain whether Chromium is set to auto-launch on startup or not.">
           Launch Chromium automatically when your computer starts
         </message>
         <message name="IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT" desc="The label of the 'Use Chromium as default' browser button">
           Make Chromium the default browser
         </message>
-      </if>
 
       <!-- Toast experiment. -->
       <if expr="is_win">
@@ -1239,14 +1235,12 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o
         </message>
       </if>
 
-      <if expr="not is_android">
         <message name="IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT" desc="The text of a bubble that confirms users allows integrating the spelling service of Google to Chrome.">
           Chromium can provide smarter spell-checking by sending what you type in the browser to Google servers, allowing you to use the same spell-checking technology used by Google search.
         </message>
         <message name="IDS_RESET_PROFILE_SETTINGS_FEEDBACK" desc="Feedback label in the Reset Profile Settings dialog">
           Help make Chromium better by reporting the current settings
         </message>
-      </if>
 
       <!-- Contextual Search -->
       <message name="IDS_CONTEXTUAL_SEARCH_HEADER" desc="Header shown at the top of the first run experience, to describe the Contextual Search feature.">