Refactor OverlayStrategySandwich and OverlayStrategyCommon

cc/output/overlay_processor.h

Index: cc/output/overlay_processor.h
diff --git a/cc/output/overlay_processor.h b/cc/output/overlay_processor.h
index feba0481b299955800702685aa4906db41de7979..d4e1369e427f37f583522cfd759de7937065aa02 100644
--- a/cc/output/overlay_processor.h
+++ b/cc/output/overlay_processor.h
@@ -23,10 +23,9 @@ class CC_EXPORT OverlayProcessor {
     // Returns false if the strategy cannot be made to work with the
     // current set of render passes. Returns true if the strategy was successful
     // and adds any additional passes necessary to represent overlays to
-    // |render_passes_in_draw_order|.
-    virtual bool Attempt(RenderPassList* render_passes_in_draw_order,
-                         OverlayCandidateList* candidates,
-                         float device_scale_factor) = 0;
+    // |render_passes|.
+    virtual bool Attempt(RenderPassList* render_passes,
+                         OverlayCandidateList* candidates) = 0;
   };
   typedef ScopedPtrVector<Strategy> StrategyList;
 
@@ -35,8 +34,8 @@ class CC_EXPORT OverlayProcessor {
   // Virtual to allow testing different strategies.
   virtual void Initialize();
 
-  void ProcessForOverlays(RenderPassList* render_passes_in_draw_order,
-                          OverlayCandidateList* candidate_list);
+  void ProcessForOverlays(RenderPassList* render_passes,
+                          OverlayCandidateList* candidates);
 
  protected:
   StrategyList strategies_;