Android: remove deprecated content API

Review URL: https://codereview.chromium.org/599103008

Cr-Commit-Position: refs/heads/master@{#297056}

content/browser/renderer_host/compositor_impl_android.h

@@ -61,7 +61,6 @@ class CONTENT_EXPORT CompositorImpl
  private:
   // Compositor implementation.
   virtual void SetRootLayer(scoped_refptr<cc::Layer> root) OVERRIDE;
-  virtual void SetWindowSurface(ANativeWindow* window) OVERRIDE;
   virtual void SetSurface(jobject surface) OVERRIDE;
   virtual void SetVisible(bool visible) OVERRIDE;
   virtual void setDeviceScaleFactor(float factor) OVERRIDE;
@@ -104,6 +103,8 @@ class CONTENT_EXPORT CompositorImpl
   virtual void SetNeedsAnimate() OVERRIDE;
   virtual ui::SystemUIResourceManager& GetSystemUIResourceManager() OVERRIDE;
 
+  void SetWindowSurface(ANativeWindow* window);
+
   enum CompositingTrigger {
     DO_NOT_COMPOSITE,
     COMPOSITE_IMMEDIATELY,

content/public/browser/android/compositor.h

@@ -55,10 +55,6 @@ class CONTENT_EXPORT Compositor {
   // having been made visible again.
   virtual void SetVisible(bool visible) = 0;
 
-  // Set the output surface handle which the compositor renders into.
-  // DEPRECATED: Use SetSurface() which takes a Java Surface object.
-  virtual void SetWindowSurface(ANativeWindow* window) = 0;
-
   // Set the output surface which the compositor renders into.
   virtual void SetSurface(jobject surface) = 0;