Rename BookmarkActivityBase -> SynchronousInitializationActivity

Needed for downloads UI.

BUG=616324

Review-Url: https://codereview.chromium.org/2039413003
Cr-Commit-Position: refs/heads/master@{#398183}

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivityBase.java → chrome/android/java/src/org/chromium/chrome/browser/SynchronousInitializationActivity.java

-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 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.bookmarks;
+package org.chromium.chrome.browser;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 
+import org.chromium.base.Log;
 import org.chromium.base.library_loader.ProcessInitException;
-import org.chromium.chrome.browser.ChromeApplication;
+import org.chromium.chrome.browser.bookmarks.BookmarkActivity;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
 
 /**
- * Activity base class that all the bookmark activities inherit. Currently it's responsible
- * for ensuring native library initialization.
+ * Ensures that the native library is loaded by synchronously initializing it on creation.
+ *
+ * This is needed for Activities that can be started without going through the regular asynchronous
+ * browser startup pathway, which could happen if the user restarted Chrome after it died in the
+ * background with the Activity visible.  One example is {@link BookmarkActivity} and its kin.
  */
-abstract class BookmarkActivityBase extends AppCompatActivity {
-    private static final String TAG = "BookmarkActivityBase";
+public abstract class SynchronousInitializationActivity extends AppCompatActivity {
+    private static final String TAG = "SyncInitActivity";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java

@@ -10,6 +10,7 @@ import android.text.TextUtils;
 import android.view.WindowManager;
 
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.SynchronousInitializationActivity;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
@@ -20,7 +21,8 @@ import org.chromium.components.bookmarks.BookmarkId;
  * inside of it and creates a snackbar manager. This activity should only be shown on phones; on
  * tablet the bookmark UI is shown inside of a tab (see {@link BookmarkPage}).
  */
-public class BookmarkActivity extends BookmarkActivityBase implements SnackbarManageable {
+public class BookmarkActivity extends SynchronousInitializationActivity
+        implements SnackbarManageable {
 
     private BookmarkManager mBookmarkManager;
     private SnackbarManager mSnackbarManager;

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddEditFolderActivity.java

@@ -15,6 +15,7 @@ import android.view.View.OnClickListener;
 import android.widget.TextView;
 
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.SynchronousInitializationActivity;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver;
 import org.chromium.chrome.browser.widget.EmptyAlertEditText;
@@ -29,7 +30,7 @@ import java.util.List;
  * mode and editing mode. Depending on different modes, it should be started via two static creator
  * functions.
  */
-public class BookmarkAddEditFolderActivity extends BookmarkActivityBase
+public class BookmarkAddEditFolderActivity extends SynchronousInitializationActivity
         implements OnClickListener {
     static final String INTENT_IS_ADD_MODE = "BookmarkAddEditFolderActivity.isAddMode";
     static final String INTENT_BOOKMARK_ID = "BookmarkAddEditFolderActivity.BookmarkId";

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java

@@ -14,6 +14,7 @@ import android.widget.TextView;
 
 import org.chromium.base.Log;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.SynchronousInitializationActivity;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver;
 import org.chromium.chrome.browser.util.UrlUtilities;
@@ -24,7 +25,7 @@ import org.chromium.components.bookmarks.BookmarkId;
 /**
  * The activity that enables the user to modify the title, url and parent folder of a bookmark.
  */
-public class BookmarkEditActivity extends BookmarkActivityBase {
+public class BookmarkEditActivity extends SynchronousInitializationActivity {
     /** The intent extra specifying the ID of the bookmark to be edited. */
     public static final String INTENT_BOOKMARK_ID = "BookmarkEditActivity.BookmarkId";
 

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderSelectActivity.java

@@ -20,6 +20,7 @@ import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.SynchronousInitializationActivity;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver;
 import org.chromium.chrome.browser.widget.TintedDrawable;
@@ -38,7 +39,7 @@ import java.util.List;
  * Note this fragment will not be restarted by OS. It will be dismissed if chrome is killed in
  * background.
  */
-public class BookmarkFolderSelectActivity extends BookmarkActivityBase implements
+public class BookmarkFolderSelectActivity extends SynchronousInitializationActivity implements
         AdapterView.OnItemClickListener {
     static final String
             INTENT_SELECTED_FOLDER = "BookmarkFolderSelectActivity.selectedFolder";

chrome/android/java_sources.gni

@@ -50,6 +50,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java",
   "java/src/org/chromium/chrome/browser/ShortcutHelper.java",
   "java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java",
+  "java/src/org/chromium/chrome/browser/SynchronousInitializationActivity.java",
   "java/src/org/chromium/chrome/browser/TabState.java",
   "java/src/org/chromium/chrome/browser/TtsPlatformImpl.java",
   "java/src/org/chromium/chrome/browser/UrlConstants.java",
@@ -82,7 +83,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java",
-  "java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivityBase.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddActivity.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkAddEditFolderActivity.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java",