Move wallpaper progress bar on top of thumbnails (completely remove butter bar)

chrome/browser/resources/chromeos/wallpaper_manager/main.html

Index: chrome/browser/resources/chromeos/wallpaper_manager/main.html
diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/main.html b/chrome/browser/resources/chromeos/wallpaper_manager/main.html
index f4f2effa976fdace0875e66a445c44c3a401c801..2c03627ace7b762ea0534a817f0f5347705de757 100644
--- a/chrome/browser/resources/chromeos/wallpaper_manager/main.html
+++ b/chrome/browser/resources/chromeos/wallpaper_manager/main.html
@@ -29,7 +29,7 @@ found in the LICENSE file.
     <script src="../../../../../ui/webui/resources/js/cr/ui/list_selection_controller.js"></script>
     <script src="../../../../../ui/webui/resources/js/cr/ui/list.js"></script>
     <script src="../../../../../ui/webui/resources/js/cr/ui/grid.js"></script>
-    <script src="js/butter_bar.js"></script>
+    <script src="js/progress_manager.js"></script>
     <script src="js/wallpaper_images_grid.js"></script>
     <script src="js/wallpaper_manager.js"></script>
     <script src="js/main.js"></script>
@@ -44,11 +44,14 @@ found in the LICENSE file.
         <div id="bar"></div>
       </div>
       <div class="spacer"></div>
-      <img id="close" src="images/ui/close-white.png">
+      <div id="close"></div>
     </div>
     <div class="dialog-main">
       <div id="category-container">
         <grid id="wallpaper-grid" class="image-picker"></grid>
+        <div class="progress-bar" hidden>
+          <div class="progress-track"></div>
+        </div>
         <div class="bottom-bar">
           <img id="attribute-image" hidden>
           <div id="wallpaper-attribute" hidden>
@@ -80,19 +83,5 @@ found in the LICENSE file.
       </div>
     </div>
   </div>
-  <div id="butter-bar-container">
-    <div id="butter-bar">
-      <div class="content">
-        <div>
-          <span class="butter-message"></span>
-          <a class="learn-more" i18n-content="learnMore" target="_blank"></a>
-        </div>
-        <div class="progress-bar" hidden>
-          <div class="progress-track"></div>
-        </div>
-      </div>
-      <div class="actions" hidden></div>
-    </div>
-  </div>
 </body>
 </html>