Back out 0fc318454f2b (bug 790393) for bustage on a CLOSED TREE
authorPhil Ringnalda <philringnalda@gmail.com>
Tue, 16 Oct 2012 20:10:40 -0700
changeset 110637 c2e44ae3a09d09546256094ecb80c31cf030f62e
parent 110636 7a8f277d19dfb6a98980f7698beb412a0078c6ae
child 110638 ecad7b037795054a7dc3c0537d7b7631d6fdd3c0
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
bugs790393
milestone19.0a1
backs out0fc318454f2b41430eb7194c1d56239822b34453
Back out 0fc318454f2b (bug 790393) for bustage on a CLOSED TREE
dom/power/PowerManager.cpp
dom/power/nsIDOMPowerManager.idl
toolkit/toolkit-tiers.mk
--- a/dom/power/PowerManager.cpp
+++ b/dom/power/PowerManager.cpp
@@ -11,20 +11,16 @@
 #include "nsIDocument.h"
 #include "nsIPermissionManager.h"
 #include "nsIPowerManagerService.h"
 #include "nsIPrincipal.h"
 #include "nsPIDOMWindow.h"
 #include "nsServiceManagerUtils.h"
 #include "nsError.h"
 
-#ifdef MOZ_WIDGET_GONK
-#include "b2g.h"
-#endif
-
 DOMCI_DATA(MozPowerManager, mozilla::dom::power::PowerManager)
 
 namespace mozilla {
 namespace dom {
 namespace power {
 
 NS_INTERFACE_MAP_BEGIN(PowerManager)
   NS_INTERFACE_MAP_ENTRY(nsIDOMMozPowerManager)
@@ -70,31 +66,16 @@ PowerManager::Reboot()
   NS_ENSURE_STATE(pmService);
 
   pmService->Reboot();
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-PowerManager::FactoryReset()
-{
-#ifdef MOZ_WIDGET_GONK
-  nsCOMPtr<nsIRecoveryService> recoveryService =
-    do_GetService("@mozilla.org/recovery-service;1");
-  NS_ENSURE_STATE(recoveryService);
-
-  recoveryService->FactoryReset();
-  return NS_OK;
-#else
-  return NS_ERROR_NOT_IMPLEMENTED;
-#endif
-}
-
-NS_IMETHODIMP
 PowerManager::PowerOff()
 {
   nsCOMPtr<nsIPowerManagerService> pmService =
     do_GetService(POWERMANAGERSERVICE_CONTRACTID);
   NS_ENSURE_STATE(pmService);
 
   pmService->PowerOff();
 
--- a/dom/power/nsIDOMPowerManager.idl
+++ b/dom/power/nsIDOMPowerManager.idl
@@ -5,22 +5,21 @@
 
 #include "nsISupports.idl"
 
 interface nsIDOMMozWakeLockListener;
 
 /**
  * This interface implements navigator.mozPower
  */
-[scriptable, uuid(7b181fef-2757-4198-89a0-8c426b8439ea)]
+[scriptable, uuid(256a3287-f528-45b5-9ba8-2b3650c056e6)]
 interface nsIDOMMozPowerManager : nsISupports
 {
     void    powerOff();
     void    reboot();
-    void    factoryReset();
 
     /**
      * The listeners are notified when a resource changes its lock state to:
      *  - unlocked
      *  - locked but not visible
      *  - locked and visible
      */
     void    addWakeLockListener(in nsIDOMMozWakeLockListener aListener);
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -168,21 +168,16 @@ endif
 ifndef MOZ_NATIVE_PNG
 tier_platform_dirs += media/libpng
 endif
 
 ifdef ENABLE_TESTS
 tier_platform_dirs += testing/specialpowers
 endif
 
-# b2g headers need to be built before dom headers
-ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-tier_platform_dirs += b2g
-endif
-
 tier_platform_dirs	+= \
 		uriloader \
 		caps \
 		parser \
 		gfx \
 		image \
 		dom \
 		view \