Merge m-c to m-i

mobile/android/base/java/org/mozilla/gecko/BrowserApp.java

@@ -3325,14 +3325,7 @@ public class BrowserApp extends GeckoApp
                 if (shareIntent == null) {
                     shareIntent = new Intent(Intent.ACTION_SEND);
                     shareIntent.setType("text/plain");
-
+                    provider.setIntent(shareIntent);
-                    final Intent intentToSet = shareIntent;
-                    ThreadUtils.postToBackgroundThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            provider.setIntent(intentToSet);
-                        }
-                    });
                 }
 
                 // Replace the existing intent's extras

mobile/android/base/java/org/mozilla/gecko/db/AbstractPerProfileDatabaseProvider.java

@@ -4,9 +4,7 @@
 
 package org.mozilla.gecko.db;
 
-import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.annotation.RobocopTarget;
-import org.mozilla.gecko.util.ThreadUtils;
 
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
@@ -37,10 +35,6 @@ public abstract class AbstractPerProfileDatabaseProvider extends AbstractTransac
      */
     @Override
     protected SQLiteDatabase getReadableDatabase(Uri uri) {
-        if (!AppConstants.MOZILLA_OFFICIAL) {
-            ThreadUtils.assertNotOnUiThread();
-        }
-
         String profile = null;
         if (uri != null) {
             profile = uri.getQueryParameter(BrowserContract.PARAM_PROFILE);
@@ -59,10 +53,6 @@ public abstract class AbstractPerProfileDatabaseProvider extends AbstractTransac
      */
     @Override
     protected SQLiteDatabase getWritableDatabase(Uri uri) {
-        if (!AppConstants.MOZILLA_OFFICIAL) {
-            ThreadUtils.assertNotOnUiThread();
-        }
-
         String profile = null;
         if (uri != null) {
             profile = uri.getQueryParameter(BrowserContract.PARAM_PROFILE);

mobile/android/base/java/org/mozilla/gecko/widget/GeckoActionProvider.java

@@ -195,12 +195,6 @@ public class GeckoActionProvider {
         return dataModel.getIntent();
     }
 
-    /**
-     * Must be run on a background thread due to DB access.
-     *
-     * DB access happens in ActivityChosseModel when it retrieves the list of sync clients
-     * if sync is enabled.
-     */
     public void setIntent(Intent intent) {
         ActivityChooserModel dataModel = ActivityChooserModel.get(mContext, mHistoryFileName);
         dataModel.setIntent(intent);