Upstream FirstRunActivity and friends.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java
index 4ece3e328055cd0fb845f0380cb269af9337ad0e..7394299c5e96e25327a5d1da77b660b0d6308f4e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java
@@ -13,7 +13,8 @@ import android.util.Log;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.library_loader.LibraryProcessType;;
+import org.chromium.base.TraceEvent;
+import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
 import org.chromium.chrome.browser.preferences.LocationSettings;
@@ -24,6 +25,7 @@ import org.chromium.chrome.browser.preferences.autofill.AutofillPreferences;
 import org.chromium.chrome.browser.preferences.password.ManageSavedPasswordsPreferences;
 import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferences;
 import org.chromium.chrome.browser.preferences.website.SingleWebsitePreferences;
+import org.chromium.chrome.browser.services.AndroidEduOwnerCheckCallback;
 import org.chromium.content.app.ContentApplication;
 import org.chromium.content.browser.BrowserStartupController;
 
@@ -43,11 +45,23 @@ public abstract class ChromiumApplication extends ContentApplication {
     }
 
     /**
+     * Initiate AndroidEdu device check.
+     * @param callback Callback that should receive the results of the AndroidEdu device check.
+     */
+    public void checkIsAndroidEduDevice(AndroidEduOwnerCheckCallback callback) {
+    }
+
+    /**
      * Returns the class name of the Settings activity.
      */
     public abstract String getSettingsActivityName();
 
     /**
+     * Returns the class name of the FirstRun activity.
+     */
+    public abstract String getFirstRunActivityName();

[newt (away), 2015/03/04 03:47:08]

I think it's also fine to make this non-abstract. Then you don't have to
override it in ChromeShellApplication, and it can simplify later upstreaming a
bit.

[aurimas (slooooooooow), 2015/03/10 22:16:51]

Done

+
+    /**
      * Opens a protected content settings page, if available.
      */
     @CalledByNative
@@ -154,5 +168,20 @@ public abstract class ChromiumApplication extends ContentApplication {
         return nativeGetBrowserUserAgent();
     }
 
+    /**
+     * The host activity should call this during its onPause() handler to ensure
+     * all state is saved when the app is suspended.  Calling ChromiumApplication.onStop() does
+     * this for you.
+     */
+    public static void flushPersistentData() {
+        try {
+            TraceEvent.begin("ChromiumApplication.flushPersistentData");
+            nativeFlushPersistentData();
+        } finally {
+            TraceEvent.end("ChromiumApplication.flushPersistentData");
+        }
+    }
+
     private static native String nativeGetBrowserUserAgent();
+    private static native void nativeFlushPersistentData();
 }