Revert of Replaced BackgroundAnimator with ShelfBackgroundAnimator.

ash/shelf/shelf_layout_manager.h

Index: ash/shelf/shelf_layout_manager.h
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index ebaa60a247074b7b44bf7a43f6ca248b55f044b2..ccfb464a9e797e32e2badadf8a842714413cca00 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -183,9 +183,6 @@
   // Is the shelf's alignment horizontal?
   bool IsHorizontalAlignment() const;
 
-  // Returns how the shelf background is painted.
-  ShelfBackgroundType GetShelfBackgroundType() const;
-
   // Set the height of the ChromeVox panel, which takes away space from the
   // available work area from the top of the screen.
   void SetChromeVoxPanelHeight(int height);
@@ -260,6 +257,9 @@
   // Updates the background of the shelf.
   void UpdateShelfBackground(BackgroundAnimatorChangeType type);
 
+  // Returns how the shelf background is painted.
+  ShelfBackgroundType GetShelfBackgroundType() const;
+
   // Updates the auto hide state immediately.
   void UpdateAutoHideStateNow();