Fix DownloadTests and change cros/aura to use shelf

chrome/browser/ui/views/frame/browser_view_layout.cc

Index: chrome/browser/ui/views/frame/browser_view_layout.cc
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc
index 0537fe8597df73a287ba10c80ea6b8bf3fcd0416..85ab1aa42f1f036083e4c1bc8f481607de54a821 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.cc
+++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -22,7 +22,7 @@
 #include "ui/gfx/size.h"
 #include "views/controls/single_split_view.h"
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) || defined(USE_AURA)
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #endif
 
@@ -231,7 +231,7 @@ void BrowserViewLayout::ViewAdded(views::View* host, views::View* view) {
       infobar_container_ = view;
       break;
     case VIEW_ID_DOWNLOAD_SHELF:
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) || defined(USE_AURA)
       download_shelf_ = static_cast<DownloadShelfView*>(view);
 #else
       NOTREACHED();
@@ -514,7 +514,7 @@ int BrowserViewLayout::GetTopMarginForActiveContent() {
 }
 
 int BrowserViewLayout::LayoutDownloadShelf(int bottom) {
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) || defined(USE_AURA)
   // Re-layout the shelf either if it is visible or if it's close animation
   // is currently running.  ChromiumOS uses ActiveDownloadsUI instead of
   // DownloadShelf.