Issue #1391 - Remove the DOM battery API

3 files changed, 0 insertions, 51 deletions

diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
index a544f23c10..53ce2b30fb 100644
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -30,7 +30,6 @@
 #include "nsUnicharUtils.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Telemetry.h"
-#include "BatteryManager.h"
 #ifdef MOZ_GAMEPAD
 #include "mozilla/dom/GamepadServiceTest.h"
 #endif
@@ -197,8 +196,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Navigator)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPermissions)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGeolocation)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mNotification)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBatteryManager)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBatteryPromise)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPowerManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mConnection)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mStorageManager)
@@ -249,13 +246,6 @@ Navigator::Invalidate()
     mNotification = nullptr;
   }
 
-  if (mBatteryManager) {
-    mBatteryManager->Shutdown();
-    mBatteryManager = nullptr;
-  }
-
-  mBatteryPromise = nullptr;
-
   if (mPowerManager) {
     mPowerManager->Shutdown();
     mPowerManager = nullptr;
@@ -1321,39 +1311,6 @@ Navigator::GetMozNotification(ErrorResult& aRv)
   return mNotification;
 }
 
-//*****************************************************************************
-//    Navigator::nsINavigatorBattery
-//*****************************************************************************
-
-Promise*
-Navigator::GetBattery(ErrorResult& aRv)
-{
-  if (mBatteryPromise) {
-    return mBatteryPromise;
-  }
-
-  if (!mWindow || !mWindow->GetDocShell()) {
-    aRv.Throw(NS_ERROR_UNEXPECTED);
-    return nullptr;
-  }
-
-  nsCOMPtr<nsIGlobalObject> go = do_QueryInterface(mWindow);
-  RefPtr<Promise> batteryPromise = Promise::Create(go, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-  mBatteryPromise = batteryPromise;
-
-  if (!mBatteryManager) {
-    mBatteryManager = new battery::BatteryManager(mWindow);
-    mBatteryManager->Init();
-  }
-
-  mBatteryPromise->MaybeResolve(mBatteryManager);
-
-  return mBatteryPromise;
-}
-
 PowerManager*
 Navigator::GetMozPower(ErrorResult& aRv)
 {
diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h
index 4ddaaabab4..bcc67589e9 100644
--- a/dom/base/Navigator.h
+++ b/dom/base/Navigator.h
@@ -51,10 +51,6 @@ namespace dom {
 
 class Permissions;
 
-namespace battery {
-class BatteryManager;
-} // namespace battery
-
 class Promise;
 
 class DesktopNotificationCenter;
@@ -136,7 +132,6 @@ public:
   Permissions* GetPermissions(ErrorResult& aRv);
   // The XPCOM GetDoNotTrack is ok
   Geolocation* GetGeolocation(ErrorResult& aRv);
-  Promise* GetBattery(ErrorResult& aRv);
 
   static void AppName(nsAString& aAppName, bool aUsePrefOverriddenValue);
 
@@ -269,8 +264,6 @@ private:
   RefPtr<Permissions> mPermissions;
   RefPtr<Geolocation> mGeolocation;
   RefPtr<DesktopNotificationCenter> mNotification;
-  RefPtr<battery::BatteryManager> mBatteryManager;
-  RefPtr<Promise> mBatteryPromise;
   RefPtr<PowerManager> mPowerManager;
   RefPtr<network::Connection> mConnection;
 #ifdef MOZ_AUDIO_CHANNEL_MANAGER
diff --git a/dom/base/moz.build b/dom/base/moz.build
index ded203c505..fe65453fe9 100755
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -419,7 +419,6 @@ EXTRA_JS_MODULES += [
 ]
 
 LOCAL_INCLUDES += [
-    '../battery',
     '../events',
     '../media',
     '../network',