From ffdbcf48236415ca894023a4bce495c95c3c3aef Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Fri, 6 Sep 2013 08:43:16 +0200
Subject: [PATCH] Bug 909003 - Part d: Remove some includes from nsHistory.h;
 r=bz

---
 dom/base/nsHistory.cpp | 13 +++++++++++++
 dom/base/nsHistory.h   | 20 ++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/dom/base/nsHistory.cpp b/dom/base/nsHistory.cpp
index 0e5ca9f04a3..4ae8aceccf2 100644
--- a/dom/base/nsHistory.cpp
+++ b/dom/base/nsHistory.cpp
@@ -5,6 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsHistory.h"
+
+#include "jsapi.h"
 #include "mozilla/dom/HistoryBinding.h"
 #include "nsCOMPtr.h"
 #include "nsPIDOMWindow.h"
@@ -17,6 +19,7 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsReadableUtils.h"
 #include "nsContentUtils.h"
+#include "nsISHistory.h"
 #include "nsISHistoryInternal.h"
 #include "mozilla/Preferences.h"
 
@@ -293,6 +296,16 @@ nsHistory::PushOrReplaceState(JSContext* aCx, JS::Handle<JS::Value> aData,
   aRv = docShell->AddState(aData, aTitle, aUrl, aReplace, aCx);
 }
 
+nsIDocShell*
+nsHistory::GetDocShell() const
+{
+  nsCOMPtr<nsPIDOMWindow> win = do_QueryReferent(mInnerWindow);
+  if (!win) {
+    return nullptr;
+  }
+  return win->GetDocShell();
+}
+
 already_AddRefed<nsISHistory>
 nsHistory::GetSessionHistory() const
 {
diff --git a/dom/base/nsHistory.h b/dom/base/nsHistory.h
index 7653ef8fd67..6fd7a89f3d2 100644
--- a/dom/base/nsHistory.h
+++ b/dom/base/nsHistory.h
@@ -8,16 +8,17 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
-#include "mozilla/dom/BindingUtils.h"
+#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsWrapperCache.h"
 #include "nsIDOMHistory.h"
-#include "nsString.h"
-#include "nsISHistory.h"
-#include "nsIWeakReference.h"
-#include "nsPIDOMWindow.h"
+#include "nsPIDOMWindow.h" // for GetParentObject
+#include "nsStringFwd.h"
+#include "nsWrapperCache.h"
 
 class nsIDocShell;
+class nsISHistory;
+class nsIWeakReference;
+class nsPIDOMWindow;
 
 // Script "History" object
 class nsHistory MOZ_FINAL : public nsIDOMHistory, // Empty, needed for extension
@@ -49,12 +50,7 @@ public:
                     mozilla::ErrorResult& aRv);
 
 protected:
-  nsIDocShell *GetDocShell() const {
-    nsCOMPtr<nsPIDOMWindow> win(do_QueryReferent(mInnerWindow));
-    if (!win)
-      return nullptr;
-    return win->GetDocShell();
-  }
+  nsIDocShell* GetDocShell() const;
 
   void PushOrReplaceState(JSContext* aCx, JS::Handle<JS::Value> aData,
                           const nsAString& aTitle, const nsAString& aUrl,