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

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
===================================================================
--- chrome/browser/ui/browser.cc	(revision 110765)
+++ chrome/browser/ui/browser.cc	(working copy)
@@ -184,9 +184,7 @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/ui/webui/active_downloads_ui.h"
-#endif
-
-#if !defined(OS_CHROMEOS) || defined(USE_AURA)
+#else
 #include "chrome/browser/download/download_shelf.h"
 #endif
 
@@ -1439,11 +1437,11 @@
 
   unsigned int features = FEATURE_INFOBAR | FEATURE_SIDEBAR;
 
-#if !defined(OS_CHROMEOS) || defined(USE_AURA)
+#if !defined(OS_CHROMEOS)
   // Chrome OS opens a FileBrowse pop up instead of using download shelf.
   // So FEATURE_DOWNLOADSHELF is only added for non-chromeos platforms.
   features |= FEATURE_DOWNLOADSHELF;
-#endif  // !defined(OS_CHROMEOS) || defined(USE_AURA)
+#endif  // !defined(OS_CHROMEOS)
 
   if (is_type_tabbed())
     features |= FEATURE_BOOKMARKBAR;
@@ -3726,7 +3724,7 @@
     return;
 
   if (DisplayOldDownloadsUI()) {
-#if defined(OS_CHROMEOS) && !defined(USE_AURA)
+#if defined(OS_CHROMEOS)
     // Don't show content browser for extension/theme downloads from gallery.
     ExtensionService* service = profile_->GetExtensionService();
     if (!ChromeDownloadManagerDelegate::IsExtensionDownload(download) ||
@@ -3736,7 +3734,7 @@
       // Open the Active Downloads ui for chromeos.
       ActiveDownloadsUI::OpenPopup(profile_);
     }
-#else
+#elif !defined(USE_AURA)
     // GetDownloadShelf creates the download shelf if it was not yet created.
     DownloadShelf* shelf = window()->GetDownloadShelf();
     shelf->AddDownload(new DownloadItemModel(download));
@@ -3754,9 +3752,6 @@
         ui::Animation::ShouldRenderRichAnimation()) {
       DownloadStartedAnimation::Show(shelf_tab);
     }
-#else
-    // TODO(jamescook): Downloads UI for non-ChromeOS Aura, crbug.com/103488
-    NOTIMPLEMENTED();
 #endif
   }