Revert 110765 - Fix DownloadTests and change cros/aura to use shelf

chrome/browser/download/save_page_browsertest.cc

 // Copyright (c) 2011 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.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 91 matching lines @@
     Browser* popup = ActiveDownloadsUI::GetPopup();
     EXPECT_TRUE(popup);
     ActiveDownloadsUI* downloads_ui = static_cast<ActiveDownloadsUI*>(
         popup->GetSelectedTabContents()->web_ui());
     EXPECT_TRUE(downloads_ui);
     return downloads_ui->GetDownloads();
   }
 #endif
 
   void CheckDownloadUI(const FilePath& download_path) const {
-    // Expectations must be in sync with the implementation in
-    // Browser::OnStartDownload().
 #if defined(OS_CHROMEOS)
     const ActiveDownloadsUI::DownloadList& downloads = GetDownloads();
     EXPECT_EQ(downloads.size(), 1U);
 
     bool found = false;
     for (size_t i = 0; i < downloads.size(); ++i) {
       if (downloads[i]->full_path() == download_path) {
         found = true;
         break;
       }
     }
     EXPECT_TRUE(found);
-#elif !defined(USE_AURA)
+#else
     EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
-#else
-    // TODO(jamescook): Downloads UI for non-ChromeOS Aura, crbug.com/103488
-    NOTIMPLEMENTED();
 #endif
   }
 
   DownloadManager* GetDownloadManager() const {
     DownloadManager* download_manager =
         DownloadServiceFactory::GetForProfile(
             browser()->profile())->GetDownloadManager();
     EXPECT_TRUE(download_manager);
     return download_manager;
   }
@@ skipping 216 matching lines @@
 IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, ExplicitCancel) {
   GURL url = NavigateToMockURL("a");
   FilePath full_file_name, dir;
   GetDestinationPaths("a", &full_file_name, &dir);
   scoped_refptr<SavePackage> save_package(new SavePackage(GetCurrentTab(),
       SavePackage::SAVE_AS_ONLY_HTML, full_file_name, dir));
   save_package->Cancel(true);
 }
 
 }  // namespace