Back out changeset 027c6cc12078 (bug 1249943) for making test_basic_pan.html permafail (timeout) on Linux, on a CLOSED TREE.

widget/android/AndroidContentController.cpp

@@ -9,7 +9,6 @@
 #include "base/message_loop.h"
 #include "mozilla/layers/APZCCallbackHelper.h"
 #include "mozilla/layers/APZCTreeManager.h"
-#include "nsIObserverService.h"
 #include "nsLayoutUtils.h"
 #include "nsWindow.h"
 
@@ -99,23 +98,5 @@ AndroidContentController::UpdateOverscrollOffset(const float aX,const  float aY)
   }
 }
 
-void
-AndroidContentController::NotifyAPZStateChange(const ScrollableLayerGuid& aGuid,
-                                               APZStateChange aChange,
-                                               int aArg)
-{
-  // This function may get invoked twice, if the first invocation is not on
-  // the main thread then the ChromeProcessController version of this function
-  // will redispatch to the main thread. We want to make sure that our handling
-  // only happens on the main thread.
-  ChromeProcessController::NotifyAPZStateChange(aGuid, aChange, aArg);
-  if (NS_IsMainThread() && aChange == layers::GeckoContentController::APZStateChange::TransformEnd) {
-    // This is used by tests to determine when the APZ is done doing whatever
-    // it's doing. XXX generify this as needed when writing additional tests.
-    nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
-    observerService->NotifyObservers(nullptr, "APZ:TransformEnd", nullptr);
-  }
-}
-
 } // namespace widget
 } // namespace mozilla