Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivityBase.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivityBase.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivityBase.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivityBase.java
deleted file mode 100644
index 04a7b36f4446c390aebc0e361d25f870ccd399af..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivityBase.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015 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.enhancedbookmarks;
-
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-
-import org.chromium.base.library_loader.ProcessInitException;
-import org.chromium.chrome.browser.ChromiumApplication;
-
-/**
- * Activity base class that all the EnhnacedBookmark activities inherit. Currently it's responsible
- * for ensuring native library initialization.
- */
-abstract class EnhancedBookmarkActivityBase extends AppCompatActivity {
-    private static final String TAG = "EnhancedBookmarkActivityBase";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // Ensure that native library is loaded.
-        try {
-            ((ChromiumApplication) getApplication())
-                    .startBrowserProcessesAndLoadLibrariesSync(true);
-        } catch (ProcessInitException e) {
-            Log.e(TAG, "Failed to start browser process.", e);
-            ChromiumApplication.reportStartupErrorAndExit(e);
-        }
-    }
-}