cc: De-special-case SurfaceLayer code

cc/layers/surface_layer.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_LAYERS_SURFACE_LAYER_H_
 #define CC_LAYERS_SURFACE_LAYER_H_
 
 #include "base/macros.h"
 #include "cc/cc_export.h"
 #include "cc/layers/layer.h"
@@ skipping 34 matching lines @@
     return fallback_surface_info_;
   }
 
  protected:
   explicit SurfaceLayer(scoped_refptr<SurfaceReferenceFactory> ref_factory);
   bool HasDrawableContent() const override;
 
  private:
   ~SurfaceLayer() override;
   void RemoveReference(base::Closure reference_returner);
-  void AddReferencedSurfaceId(const SurfaceInfo& surface_info);
-  void RemoveReferencedSurfaceId(const SurfaceInfo& surface_info);
 
   SurfaceInfo primary_surface_info_;
-  base::Closure primary_reference_returner_;
-
   SurfaceInfo fallback_surface_info_;
   base::Closure fallback_reference_returner_;
 
   scoped_refptr<SurfaceReferenceFactory> ref_factory_;
   bool stretch_content_to_fill_bounds_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceLayer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_SURFACE_LAYER_H_