Bug 856163 - Part 4: Use gecko package for database classes. r=lucasr f=rnewman

--HG--
rename : mobile/android/base/db/BrowserContract.java.in => mobile/android/base/db/BrowserContract.java
rename : mobile/android/base/db/BrowserProvider.java.in => mobile/android/base/db/BrowserProvider.java
rename : mobile/android/base/db/FormHistoryProvider.java.in => mobile/android/base/db/FormHistoryProvider.java
rename : mobile/android/base/db/GeckoProvider.java.in => mobile/android/base/db/GeckoProvider.java
rename : mobile/android/base/db/PasswordsProvider.java.in => mobile/android/base/db/PasswordsProvider.java
rename : mobile/android/base/db/TabsProvider.java.in => mobile/android/base/db/TabsProvider.java

mobile/android/base/AndroidManifest.xml.in

@@ -229,7 +229,7 @@
                   android:configChanges="orientation|screenSize"
                   android:excludeFromRecents="true"/>
 
-        <provider android:name="@ANDROID_PACKAGE_NAME@.db.BrowserProvider"
+        <provider android:name="org.mozilla.gecko.db.BrowserProvider"
                   android:authorities="@ANDROID_PACKAGE_NAME@.db.browser"
                   android:permission="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER">
 
@@ -244,17 +244,17 @@
           Fennec versions into the same process. (Bug 749727.)
           Process name is a mangled version to avoid a Talos bug. (Bug 750548.)
           -->
-        <provider android:name="@ANDROID_PACKAGE_NAME@.db.PasswordsProvider"
+        <provider android:name="org.mozilla.gecko.db.PasswordsProvider"
                   android:authorities="@ANDROID_PACKAGE_NAME@.db.passwords"
                   android:permission="@ANDROID_PACKAGE_NAME@.permissions.PASSWORD_PROVIDER"
                   android:process="@MANGLED_ANDROID_PACKAGE_NAME@.PasswordsProvider"/>
 
-        <provider android:name="@ANDROID_PACKAGE_NAME@.db.FormHistoryProvider"
+        <provider android:name="org.mozilla.gecko.db.FormHistoryProvider"
                   android:authorities="@ANDROID_PACKAGE_NAME@.db.formhistory"
                   android:permission="@ANDROID_PACKAGE_NAME@.permissions.FORMHISTORY_PROVIDER"
                   android:protectionLevel="signature"/>
 
-        <provider android:name="@ANDROID_PACKAGE_NAME@.db.TabsProvider"
+        <provider android:name="org.mozilla.gecko.db.TabsProvider"
                   android:authorities="@ANDROID_PACKAGE_NAME@.db.tabs"
                   android:permission="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"/>
 

mobile/android/base/Makefile.in

@@ -163,6 +163,12 @@ FENNEC_JAVA_FILES = \
   VideoPlayer.java \
   WebAppAllocator.java \
   ZoomConstraints.java \
+  db/BrowserContract.java \
+  db/BrowserProvider.java \
+  db/FormHistoryProvider.java \
+  db/GeckoProvider.java \
+  db/PasswordsProvider.java \
+  db/TabsProvider.java \
   gfx/Axis.java \
   gfx/BitmapUtils.java \
   gfx/BufferedCairoImage.java \
@@ -252,15 +258,9 @@ FENNEC_PP_JAVA_VIEW_FILES = \
 
 FENNEC_PP_JAVA_FILES = \
   App.java \
+  AppConstants.java \
   WebApp.java \
   WebApps.java \
-  db/BrowserContract.java \
-  db/BrowserProvider.java \
-  db/PasswordsProvider.java \
-  db/FormHistoryProvider.java \
-  db/TabsProvider.java \
-  db/GeckoProvider.java \
-  AppConstants.java \
   $(NULL)
 
 FENNEC_PP_XML_FILES = \

mobile/android/base/db/BrowserContract.java

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#filter substitution
 package org.mozilla.gecko.db;
 
 import org.mozilla.gecko.AppConstants;

mobile/android/base/db/BrowserProvider.java

@@ -3,8 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.db;
+package org.mozilla.gecko.db;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

mobile/android/base/db/FormHistoryProvider.java

@@ -2,8 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.db;
+package org.mozilla.gecko.db;
 
 import java.lang.IllegalArgumentException;
 import java.util.HashMap;

mobile/android/base/db/GeckoProvider.java

@@ -2,8 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.db;
+package org.mozilla.gecko.db;
 
 import java.io.File;
 import java.util.HashMap;

mobile/android/base/db/PasswordsProvider.java

@@ -2,8 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.db;
+package org.mozilla.gecko.db;
 
 import java.lang.IllegalArgumentException;
 import java.util.HashMap;

mobile/android/base/db/TabsProvider.java

@@ -2,8 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.db;
+package org.mozilla.gecko.db;
 
 import java.io.File;
 import java.util.Collections;

mobile/android/base/tests/testBrowserProvider.java.in

@@ -324,7 +324,7 @@ public class testBrowserProvider extends ContentProviderTest {
 
     @Override
     public void setUp() throws Exception {
-        super.setUp("@ANDROID_PACKAGE_NAME@.db.BrowserProvider", "AUTHORITY");
+        super.setUp("org.mozilla.gecko.db.BrowserProvider", "AUTHORITY");
         loadContractInfo();
 
         mTests.add(new TestSpecialFolders());

mobile/android/base/tests/testBrowserProviderPerf.java.in

@@ -250,7 +250,7 @@ public class testBrowserProviderPerf extends ContentProviderTest {
 
     @Override
     public void setUp() throws Exception {
-        super.setUp("@ANDROID_PACKAGE_NAME@.db.BrowserProvider", "AUTHORITY");
+        super.setUp("org.mozilla.gecko.db.BrowserProvider", "AUTHORITY");
 
         mGenerator = new Random(19580427);
 

mobile/android/base/tests/testDistribution.java.in

@@ -288,7 +288,7 @@ public class testDistribution extends ContentProviderTest {
     @Override
     public void setUp() throws Exception {
         // TODO: Set up the content provider after setting the distribution.
-        super.setUp("@ANDROID_PACKAGE_NAME@.db.BrowserProvider", "AUTHORITY");
+        super.setUp("org.mozilla.gecko.db.BrowserProvider", "AUTHORITY");
     }
 
     private void delete(File file) throws Exception {

mobile/android/base/tests/testMigration.java.in

@@ -332,7 +332,7 @@ public class testMigration extends ContentProviderTest {
 
     @Override
     public void setUp() throws Exception {
-        super.setUp("@ANDROID_PACKAGE_NAME@.db.BrowserProvider", "AUTHORITY");
+        super.setUp("org.mozilla.gecko.db.BrowserProvider", "AUTHORITY");
     }
 
     @Override