From 1724baf9e82fea910203c2377307e1e3ba9421f6 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 12 Feb 2015 18:39:26 -0500
Subject: [PATCH] Bug 975699.  Remove mozIndexedDB.  r=khuey

---
 dom/base/nsGlobalWindow.cpp          | 6 ------
 dom/base/nsGlobalWindow.h            | 5 -----
 dom/interfaces/base/nsIDOMWindow.idl | 3 +--
 dom/webidl/IDBEnvironment.webidl     | 6 ------
 4 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 4e5e69ef67b..20b83ec9fe4 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -10646,12 +10646,6 @@ nsGlobalWindow::GetIndexedDB(nsISupports** _retval)
   return rv.ErrorCode();
 }
 
-NS_IMETHODIMP
-nsGlobalWindow::GetMozIndexedDB(nsISupports** _retval)
-{
-  return GetIndexedDB(_retval);
-}
-
 //*****************************************************************************
 // nsGlobalWindow::nsIInterfaceRequestor
 //*****************************************************************************
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index f415eaa96af..2ca048f0b50 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -977,11 +977,6 @@ public:
     GetDefaultComputedStyle(mozilla::dom::Element& aElt,
                             const nsAString& aPseudoElt,
                             mozilla::ErrorResult& aError);
-  mozilla::dom::indexedDB::IDBFactory*
-    GetMozIndexedDB(mozilla::ErrorResult& aError)
-  {
-    return GetIndexedDB(aError);
-  }
   int32_t MozRequestAnimationFrame(nsIFrameRequestCallback* aRequestCallback,
                                    mozilla::ErrorResult& aError);
   void MozCancelAnimationFrame(int32_t aHandle, mozilla::ErrorResult& aError)
diff --git a/dom/interfaces/base/nsIDOMWindow.idl b/dom/interfaces/base/nsIDOMWindow.idl
index 5d8134e8350..5ef2336c2cf 100644
--- a/dom/interfaces/base/nsIDOMWindow.idl
+++ b/dom/interfaces/base/nsIDOMWindow.idl
@@ -23,7 +23,7 @@ interface nsIVariant;
  * @see <http://www.whatwg.org/html/#window>
  */
 
-[scriptable, uuid(3addc629-754d-4a2a-99a3-449ed1a2e4bd)]
+[scriptable, uuid(8146f3fc-9fc1-47c5-85ef-95d686e4ca6d)]
 interface nsIDOMWindow : nsISupports
 {
   // the current browsing context
@@ -257,7 +257,6 @@ interface nsIDOMWindow : nsISupports
   // https://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#requests
   // IDBEnvironment
   readonly attribute nsISupports indexedDB;
-  readonly attribute nsISupports mozIndexedDB;
 
 
   // DOM Range
diff --git a/dom/webidl/IDBEnvironment.webidl b/dom/webidl/IDBEnvironment.webidl
index b53ce67e9a1..6ae8be97c79 100644
--- a/dom/webidl/IDBEnvironment.webidl
+++ b/dom/webidl/IDBEnvironment.webidl
@@ -12,9 +12,3 @@ interface IDBEnvironment {
     //[Throws] readonly    attribute IDBFactory indexedDB;
     [Throws] readonly    attribute IDBFactory? indexedDB;
 };
-
-// Mozilla-specific stuff
-partial interface IDBEnvironment {
-    [Exposed=Window, Throws]
-    readonly    attribute IDBFactory? mozIndexedDB;
-};