Bug 586325 - Maemo5/6 build bustage. qt includes. r=jones.chris.g

--HG--
extra : rebase_source : 8b4ba64d2b20ef250a490b1f1a21eec0dc28d04d

services/sync/tests/unit/test_engines_forms_store.js

@@ -1,81 +0,0 @@
-_("Make sure the form store follows the Store api and correctly accesses the backend form storage");
-Cu.import("resource://services-sync/engines/forms.js");
-Cu.import("resource://services-sync/type_records/forms.js");
-
-function run_test() {
-  let store = new FormEngine()._store;
-
-  _("Remove any existing entries");
-  store.wipe();
-  for (let id in store.getAllIDs()) {
-    do_throw("Shouldn't get any ids!");
-  }
-
-  _("Add a form entry");
-  store.create({
-    name: "name!!",
-    value: "value??"
-  });
-
-  _("Should have 1 entry now");
-  let id = "";
-  for (let _id in store.getAllIDs()) {
-    if (id == "")
-      id = _id;
-    else
-      do_throw("Should have only gotten one!");
-  }
-  do_check_true(store.itemExists(id));
-
-  let rec = store.createRecord(id);
-  _("Got record for id", id, rec);
-  do_check_eq(rec.name, "name!!");
-  do_check_eq(rec.value, "value??");
-
-  _("Create a non-existant id for delete");
-  do_check_true(store.createRecord("deleted!!").deleted);
-
-  _("Try updating.. doesn't do anything yet");
-  store.update({});
-
-  _("Remove all entries");
-  store.wipe();
-  for (let id in store.getAllIDs()) {
-    do_throw("Shouldn't get any ids!");
-  }
-
-  _("Add another entry");
-  store.create({
-    name: "another",
-    value: "entry"
-  });
-  id = "";
-  for (let _id in store.getAllIDs()) {
-    if (id == "")
-      id = _id;
-    else
-      do_throw("Should have only gotten one!");
-  }
-
-  _("Change the id of the new entry to something else");
-  store.changeItemID(id, "newid");
-
-  _("Make sure it's there");
-  do_check_true(store.itemExists("newid"));
-
-  _("Remove the entry");
-  store.remove({
-    id: "newid"
-  });
-  for (let id in store.getAllIDs()) {
-    do_throw("Shouldn't get any ids!");
-  }
-
-  _("Removing the entry again shouldn't matter");
-  store.remove({
-    id: "newid"
-  });
-  for (let id in store.getAllIDs()) {
-    do_throw("Shouldn't get any ids!");
-  }
-}

toolkit/xre/nsAppRunner.cpp

@@ -41,11 +41,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifdef MOZ_IPC
-#include "mozilla/dom/ContentParent.h"
-using mozilla::dom::ContentParent;
-#endif
-
 #if defined(XP_OS2) && defined(MOZ_OS2_HIGH_MEMORY)
 // os2safe.h has to be included before os2.h, needed for high mem
 #include <os2safe.h>
@@ -65,6 +60,11 @@ using mozilla::dom::ContentParent;
 #endif // MOZ_ENABLE_MEEGOTOUCH
 #endif // MOZ_WIDGET_QT
 
+#ifdef MOZ_IPC
+#include "mozilla/dom/ContentParent.h"
+using mozilla::dom::ContentParent;
+#endif
+
 #include "nsAppRunner.h"
 #include "nsUpdateDriver.h"